Commit Graph

7493 Commits

Author SHA1 Message Date
db131eb2c0 Remove @Suppress now we use standard Kotlin Int 2016-07-07 14:03:08 +01:00
ad3e9be1c8 Add a version number to gradle and allow "gradle install" to install the core module to the local Maven repository. 2016-07-07 13:59:55 +01:00
0157018901 Make ServiceLoader results for CordaPlugins a protected property on the AbstractNode 2016-07-07 13:55:15 +01:00
b498928f75 Remove the "verify correct notary has signed" check. This is no longed necessary as the required notary key is added to the "signers" list during transaction construction. We have general validation rules that check the correct notary was included in the signers list, and that we have signatures for all "signers". 2016-07-07 13:22:30 +01:00
6c55034178 Merge branch 'mnesbit-cor-249-serviceloader-for-web-apis' of https://bitbucket.org/R3-CEV/r3prototyping into mnesbit-cor-249-serviceloader-for-web-apis
# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/node/CordaPluginRegistry.kt
#	core/src/main/kotlin/com/r3corda/core/node/ServiceHub.kt
#	node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/com/r3corda/node/services/api/ServiceHubInternal.kt
#	src/main/kotlin/com/r3corda/demos/IRSDemo.kt
#	src/main/kotlin/com/r3corda/demos/api/InterestRateSwapAPI.kt
#	src/main/kotlin/com/r3corda/demos/protocols/ExitServerProtocol.kt
2016-07-07 12:20:51 +01:00
92aeb74c19 Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler. 2016-07-07 12:17:06 +01:00
8dc6f760bb Add missing import 2016-07-07 12:08:53 +01:00
bdb34ab26a Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler.
Fix whitespace

Change ProtocolLogicRefFactory to use Map<String, Set<String>> as whitelist definition
2016-07-07 12:03:24 +01:00
bbc5c2e981 Merged in mike-july-dependency-upgrades (pull request #200)
Upgrade dependencies, July edition.
2016-07-06 16:25:52 +01:00
ffa32f21cd Merged in mike-small-fixes (pull request #205)
Small fixes
2016-07-06 16:25:27 +01:00
2e3f689fd3 Minor: fix PublicKey.toShortString after the switch to ed25519 2016-07-06 16:04:10 +01:00
9e849378cf Minor: add some assertions in the WalletFiller code after a test was observed to fail due to a negative amount. 2016-07-06 14:02:40 +01:00
f6e7ffdd31 Fix a race condition in the MockNode class that only shows up when used in thread-per-node mode. Witnessed in the unit tests. 2016-07-06 14:02:40 +01:00
6fb7e59b91 Upgrade dependencies, July edition. 2016-07-06 13:56:22 +01:00
c38f99419f Merged in unified-test-dsl (pull request #203)
Unified test dsl
2016-07-06 13:30:59 +01:00
0cf54d1c1f test dsl: Comment full stops 2016-07-06 13:25:08 +01:00
26d8973746 test dsl: Add TODO on type synonyms 2016-07-06 13:25:08 +01:00
f177b1ffaa test dsl: LastLineShouldTestForVerifiesOrFails->EnforceVerifyOrFail 2016-07-06 13:25:08 +01:00
e31b769fef test dsl: Dsl->DSL, add top-level transaction primitive, add ledger-embedded signAll, other cosmetics 2016-07-06 13:25:08 +01:00
e3d6f51049 contracts, core, node: Port TransactionForTest tests to new DSL 2016-07-06 13:25:08 +01:00
a27f195b4f core: Add LastLineShouldBeVerifiesOrFails, fix attachment primitive, Java interop 2016-07-06 13:25:08 +01:00
bdda3d239a contracts: Port Java CashTests to new DSL 2016-07-06 13:25:08 +01:00
7634331f68 contracts: Port CashTests to new dsl 2016-07-06 13:25:08 +01:00
f4a6a43aa6 contracts, core: Port CommercialPaperTests, IRSTests, ObligationTests, TransactioGroupTests 2016-07-06 13:25:08 +01:00
cb47e00feb core: Add convenience input(), remove TransactionGroupDSL 2016-07-06 13:25:08 +01:00
cde315aca9 contracts, node: Port CommercialPaperTests, TwoPartyTradeProtocolTests and GroupToGraphConversion to use new dsl 2016-07-06 13:25:08 +01:00
9b36df607e core: Remove binding of State type in test dsl 2016-07-06 13:25:08 +01:00
4a89be8785 build: Run integtests after regular ones 2016-07-06 13:25:08 +01:00
bf4272b64a core: transaction/ledger DSL interfaces and implementation for tests 2016-07-06 13:25:08 +01:00
99fe3dfe75 Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler. 2016-07-06 13:23:41 +01:00
5c0e7fbbf2 Moved topic parameter from send/receive methods to a ProtocolLogic property 2016-07-05 15:12:25 +01:00
4356cef1cd Regen docsite release-M1.0 2016-06-30 14:49:28 +02:00
f2185089b7 Merged in rnicoll-cash-asset (pull request #197)
Rename com.r3cord.contracts.cash package to ...asset
2016-06-30 13:38:25 +01:00
2121824662 Rename com.r3cord.contracts.cash package to ...asset 2016-06-30 13:31:59 +01:00
a30a6cb389 Merged in rnicoll-obligation-cash-asset (pull request #195)
Replace references to cash, with (fungible) asset
2016-06-30 12:47:49 +01:00
6dad7efa22 Replace references to cash, with (fungible) asset 2016-06-30 12:47:18 +01:00
a02263937c send and sendAndReceive use Party for the destination 2016-06-30 12:04:39 +01:00
aef111114f Merged in mike-m1-docs-refresh (pull request #196)
Refresh docs for M1 release.
2016-06-30 13:01:07 +02:00
15a135f648 Merged master into mike-m1-docs-refresh 2016-06-30 13:00:34 +02:00
63cc3a04ce Review feedback 2016-06-30 12:59:19 +02:00
b30e431766 Update release notes regarding use of TransactionBuilder 2016-06-30 11:46:26 +01:00
9e174d3e3a irsdemo: Fix api address in Date role 2016-06-30 11:30:05 +01:00
55675ef799 Refresh docs for M1 release. 2016-06-30 12:23:27 +02:00
4213da31b2 Merged in cor-133-events-modelling (pull request #132)
Scheduled activities / events support
2016-06-30 09:11:37 +01:00
5271882dcd Event scheduling and docs for event scheduling 2016-06-30 08:51:52 +01:00
b3af0ce218 Merged in rnicoll-upgrade-infrastructure (pull request #193)
Infrastructure ahead of contract upgrade support
2016-06-29 17:26:44 +01:00
11eff398a0 Minor: Typo (classfiles -> class files) 2016-06-29 17:16:47 +01:00
c767638127 Move DummyContract.State into its own file
DummyContract.State isn't actually used by the DummyContract any more, so shouldn't
be part of that contract class.
2016-06-29 17:16:46 +01:00
779034691e Add AbstractTransactionSubstitutionProtocol
Abstracts the NotaryChangeProtocol to be extensible for other use-cases.
2016-06-29 17:16:46 +01:00
dd9a653ab4 TransactionBuilder: added a comment explaining the default notary parameter purpose 2016-06-29 16:32:29 +01:00