Commit Graph

7493 Commits

Author SHA1 Message Date
f02e6580f3 Merged in multiple-notary-support (pull request #114)
Multiple notary support - data model changes & protocol
2016-06-17 15:26:11 +01:00
30ca340b6e Refactored NotaryChangeProtocol and tests: moved the proposal verification step into the protocol.
Added another proposal verification step in the NotaryChangeProtocol.
Added the cause exception message to the 'notary change refused' error.
2016-06-17 15:05:35 +01:00
0a5b7ace35 Made TransactionBuilder abstract. Every transaction type now needs to implement and provide its own Builder. This is required since for specific types we need to run different logic when adding new items to the transaction. For example, when adding a new input state to a transaction of type NotaryChange we need to add all of the states participants to the signers list. 2016-06-17 15:05:35 +01:00
9958b5c603 Added 'signers' property to the transaction data models. Signers holds the list of all public keys that need to be signed for (command keys and additional ones such as notary).
Removed Notary & ChangeNotary commands, keys to be signed for are added to the signers list during transaction build phase.
2016-06-17 15:05:35 +01:00
70495a021e Introduce TransactionState, which wraps ContractState and holds the notary pointer.
Remove notary from ContractState.
Introduce TransactionType, which specifies custom validation logic for a transaction.
2016-06-17 15:05:35 +01:00
3b1e020082 Extended the data model so that every state has to define a set of 'participants' - parties that are able to consume that state in a valid transaction.
Added protocol for changing the notary for a state, which requires signatures from all participants
2016-06-17 15:05:35 +01:00
a813e9a088 Merged in rnicoll-trader-demo-cash-issuer (pull request #165)
Switch trader demo to expect self-signed cash
2016-06-17 15:04:45 +01:00
a029e303a6 Switch trader demo to expect self-signed cash 2016-06-17 14:36:21 +01:00
0c325c31a2 Revert "Merged in use-urandom-2 (pull request #159)"
This reverts commit 1a1ed3b9e6, reversing
changes made to 09e2e49d44.
2016-06-17 14:12:19 +01:00
1a1ed3b9e6 Merged in use-urandom-2 (pull request #159)
Use /dev/urandom try no.2
2016-06-17 13:36:23 +01:00
09e2e49d44 Merged in enforce-transaction-check-in-tests (pull request #160)
Enforce transaction check in tests
2016-06-17 13:35:40 +01:00
f9d1c54195 core: Add comments explaining the never-to-be-removed deprecated functions 2016-06-17 13:27:35 +01:00
1f171a1ece Revert "core: Removed unused deprecated test functions"
This reverts commit 1c09ff86ed6803fcda6c76b6f5e323621c4b0e06.
2016-06-17 13:27:35 +01:00
eaf37e2e7a core: make comment javadoc style 2016-06-17 13:27:35 +01:00
9ec1ec786f contracts: remove TODO 2016-06-17 13:27:35 +01:00
a72bab0fb7 contracts: make test compile 2016-06-17 13:27:35 +01:00
643d3bab2b core: force transaction tests to check for accept/fail 2016-06-17 13:27:35 +01:00
f0d74d0859 core: Removed unused deprecated test functions 2016-06-17 13:27:35 +01:00
ea7f9177d4 core: make newSecureRandom() a one-liner 2016-06-17 13:07:25 +01:00
ba96282591 node: use newSecureRandom() instead of SecureRandom.getInstanceStrong() 2016-06-17 13:07:25 +01:00
481d2f7151 core: use newSecureRandom() instead of SecureRandom.getInstanceStrong() 2016-06-17 13:07:25 +01:00
906c100c29 contracts: use newSecureRandom() instead of SecureRandom.getInstanceStrong() 2016-06-17 13:07:25 +01:00
6229e39b42 core: Add newSecureRandom() that uses a non-blocking SecureRandom provider 2016-06-17 13:07:25 +01:00
60d175da02 Merged add-needed-build-variables into master 2016-06-17 11:04:40 +01:00
96d8d4b9d5 build: add comments on added lines 2016-06-17 11:02:43 +01:00
c2f5580293 Merged in add-needed-build-variables (pull request #162)
build: add back applicationDefaultJvmArgs, mainClassName variables
2016-06-17 10:51:38 +01:00
2c6ed9223e build: add back applicationDefaultJvmArgs, mainClassName variables 2016-06-17 10:49:43 +01:00
f06487aa4c Merged in sort-of-incremental-quasarScan (pull request #154)
Sort of incremental quasarscan
2016-06-17 10:38:39 +01:00
683bb5c50b git: add buildSrc/build/ to .gitignore 2016-06-17 10:37:00 +01:00
8b2211ee0f build: compile config depends on quasar, add comment on local .jar dep 2016-06-17 10:33:13 +01:00
6f70affc6f build: Remove no-op line 2016-06-17 10:32:09 +01:00
7f3458803c Protocols can use the serviceHub lazily in their constructors 2016-06-17 10:30:25 +01:00
dc5da8e1ad build: use QuasarPlugin instead of copypasta 2016-06-17 10:16:46 +01:00
ded9cdbcb0 build: add buildSrc/, QuasarPlugin 2016-06-17 10:15:30 +01:00
cb1b274d5c Merged in switch-to-ed25519 (pull request #131)
Switch to ed25519
2016-06-17 10:11:06 +01:00
2663a6390e core: Kryo extension methods for reading/writing ByteArrays prefixed with their sizes 2016-06-16 17:03:44 +01:00
5b4c4f167d core: .equals() -> == 2016-06-16 17:03:44 +01:00
a8ce69ccb9 docs: add release note on curve switch 2016-06-16 17:03:44 +01:00
2b4ebd4f09 core: use optimizedPositive for size serialization 2016-06-16 17:03:44 +01:00
cd91c6a0e7 core: add serialization test for keypairs 2016-06-16 17:03:44 +01:00
af3d87803d core: serialize bytearray sizes instead of relying on static sizes 2016-06-16 17:03:44 +01:00
376b73b823 core: switch to static size bytearray serialization of keypairs 2016-06-16 17:03:44 +01:00
22567d11b5 core: implement custom serializers for ed25519 keypairs 2016-06-16 17:03:44 +01:00
1fe283c113 core: switch to ed25519 2016-06-16 17:03:44 +01:00
9930e8d5c7 core: add net.i2p.crypto:eddsa dependency 2016-06-16 17:03:44 +01:00
512e304bf1 Merged in remove-commented-out-resolve-tx-proto (pull request #156)
Remove commented out ResolveTransactionsProtocol call as it is not required
2016-06-16 16:19:03 +01:00
b689f2a139 Merged in rnicoll-amount-issuer (pull request #126)
Add issuer to cash amounts
2016-06-16 15:47:56 +01:00
ad72f3e48f Add issuer to cash amounts
Add issuer of a cash when referring to amounts of cash (except for the very few cases where
the issuer is not important, such as when referring to aggregated totals across a set of
issuers). Replaces CommonCashState with TokenDefinition, as a more accurate reflection of
what the class represents.
2016-06-16 15:05:49 +01:00
d6a79b7bae Minor: Pass reference into fillWithSomeTestCash()
Reference is now a parameter to fillWithSomeTestCash() so that the caller can be
clear on the reference to use.
2016-06-16 15:04:33 +01:00
eae3efdf02 Minor: Edit reference after copying amount
Edit reference after copying amount in cash tests, so that when the amount includes
a reference, the copying doesn't replace the changed reference.
2016-06-16 15:04:33 +01:00