ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 05:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
1,158 Commits 91 Branches 405 Tags 354 MiB
1a9cdf992f
Commit Graph

1158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Hearn
1a9cdf992f Fix an issue in the IRS contract where it was expecting two different kinds of fix command simultaneously for apparently no good reason. The unit tests didn't spot that because the unit test wasn't actually verifying the constructed transactions: fix that too. 
Uncovered during the tx types refactoring work.
 2016-07-27 14:38:21 +02:00
Mike Hearn
62e91000e9 Minor: some minor tweaks to IRSUtils types 2016-07-27 14:37:32 +02:00
Mike Hearn
889b74ca9b Minor: apply some inspector and reformatting cleanups to IRS.kt 2016-07-27 11:17:00 +02:00
Matthew Nesbit
38f4711a80 Merged in mnesbit-sprint-5-tidyup (pull request #229) 
Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler.
 2016-07-25 17:58:27 +01:00
Matthew Nesbit
c08d53d030 Merge remote-tracking branch 'origin/mnesbit-sprint-5-tidyup' into mnesbit-sprint-5-tidyup 
# Conflicts:
#	node/src/main/kotlin/com/r3corda/node/internal/APIServerImpl.kt
 2016-07-25 16:37:38 +01:00
Matthew Nesbit
0d68523f5c Validate protocol type and args via whitelist ahead of class loading. Also, push this work into another method on the Factory. 2016-07-25 16:35:45 +01:00
Matthew Nesbit
0542f7c509 Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler. 2016-07-25 13:46:40 +01:00
Mike Hearn
119813a36d Minor: document the SMM.changes observable. 2016-07-22 15:50:21 +02:00
Ross Nicoll
2c139ae40c Merged in rnicoll-state-machine-id (pull request #234) 
Add Fiber ID to state machine change events
 2016-07-20 13:23:02 +01:00
Ross Nicoll
f866c4689e Merged in rnicoll-cash-generate-exit (pull request #233) 
Add Cash.generateExit() function
 2016-07-20 13:21:29 +01:00
Ross Nicoll
f25e19ed5e Add Cash.generateExit() function 2016-07-20 13:20:43 +01:00
Ross Nicoll
f72d8ed9fb Add Fiber ID to state machine change events 
Where state machine change events are to be serialized for relay to external systems, serializing the entire
protocol is excessive. Instead being able to identify changes based on the ID of the fiber is a lot simpler
for these use-cases.
 2016-07-19 14:58:54 +01:00
Ross Nicoll
ab7ddaa264 Merged in rnicoll-in-memory-networking (pull request #232) 
Correct processing of unhandled messages
 2016-07-19 14:20:29 +01:00
Ross Nicoll
c92d51a0b6 Correct processing of unhandled messages 
Unhandled messages in the in memory messaging network can disrupt runNetwork(), as they
result in getNextQueue() returning null, irrespective of whether there is further work
which could be done. This modifies the flow to loop through the remaining transfers on
the queue before giving up, rather than stopping after the first.
 2016-07-19 14:19:57 +01:00
Andrius Dagys
c442cd01a7 Merged in andrius-cleanup-tweaks (pull request #208) 
Remove the "verify correct notary has signed" check from TwoParty protocols
 2016-07-18 10:40:25 +01:00
Mike Hearn
1715941dce Regen docsite 2016-07-14 10:55:35 +02:00
Ross Nicoll
1ec1642080 Merged in rnicoll-clauses-commercial-paper (pull request #227) 
Rebuild commercial paper contracts using clauses
 2016-07-13 17:04:30 +01:00
Ross Nicoll
c32af56b41 Rebuild commercial paper contracts using clauses 2016-07-13 16:55:18 +01:00
Ross Nicoll
0ab4d90bf1 Merged in rnicoll-clauses-irs2 (pull request #222) 
Rebuild IRS contract using clauses
 2016-07-13 16:29:10 +01:00
Ross Nicoll
e03dd19979 Rebuild IRS contract using clauses 2016-07-13 16:15:01 +01:00
Ross Nicoll
49b58d8a43 Split IRS verification into individual functions 2016-07-13 13:19:51 +01:00
Ross Nicoll
3257640e7f Merged in rnicoll-clauses-assets (pull request #220) 
Rebuild asset contracts using clauses
 2016-07-13 13:09:14 +01:00
Ross Nicoll
cba3aab96e Rebuild asset contracts using clauses 2016-07-13 13:08:23 +01:00
Ross Nicoll
ea051d57be Move clauses into main 2016-07-13 11:48:51 +01:00
Matthew Nesbit
d022b0be7b Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler. 2016-07-13 11:44:13 +01:00
Matthew Nesbit
95a9f4d10b Merged in mnesbit-sprint-5-tidyup (pull request #226) 
Mnesbit sprint 5 tidyup
 2016-07-13 11:36:37 +01:00
Matthew Nesbit
bc26e08189 Merge branch 'mnesbit-sprint-5-tidyup' of https://bitbucket.org/R3-CEV/r3prototyping into mnesbit-sprint-5-tidyup 2016-07-13 11:32:10 +01:00
Matthew Nesbit
d07db80461 Repair broken RateFixDemo code and script 2016-07-13 11:28:54 +01:00
Matthew Nesbit
9d18234383 Consistently use an sl4j logger with timestamp, rather than console println within the node. Note that the current protocol events published via the ProgressTracker are sent to the console without a timestamp. 2016-07-13 11:28:52 +01:00
Mike Hearn
ead19c619a Merged in mike-cp-issuance-fix (pull request #224) 
Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract.
 2016-07-13 11:13:23 +02:00
Ross Nicoll
229b0ce0bc Merged in rnicoll-cleanup (pull request #228) 
Cleanup
 2016-07-13 09:56:52 +01:00
Ross Nicoll
15bc48b49b Minor: Add note about refactoring TwoPartyTradeProtocol 2016-07-12 18:42:36 +01:00
Ross Nicoll
254592dc54 Move protocols into correct package 2016-07-12 18:42:00 +01:00
Ross Nicoll
27241fb10a Rebuild documentation 2016-07-12 17:52:52 +01:00
Ross Nicoll
a914b12a11 Merged in rnicoll-clause-docs (pull request #219) 
Add documentation on contract clauses
 2016-07-12 17:49:02 +01:00
Ross Nicoll
1943b3633f Add documentation on contract clauses 2016-07-12 17:47:51 +01:00
Matthew Nesbit
6862042244 Repair broken RateFixDemo code and script 2016-07-12 16:11:08 +01:00
Matthew Nesbit
8f0671f828 Consistently use an sl4j logger with timestamp, rather than console println within the node. Note that the current protocol events published via the ProgressTracker are sent to the console without a timestamp. 2016-07-12 16:11:07 +01:00
Andras Slemmer
54042db7bc Merged in demo-cliargs-description (pull request #216) 
Demo cliargs description
 2016-07-12 15:54:12 +01:00
Andras Slemmer
53725af318 irsdemo: Add spaces in closure 2016-07-12 15:42:28 +01:00
Andras Slemmer
38af91dc48 irsdemo: add --help 2016-07-12 15:42:28 +01:00
Andras Slemmer
6da1a702bf irsdemo: Give descriptions of cli arguments 2016-07-12 15:42:28 +01:00
Andras Slemmer
144f88e0d0 irsdemo: Print more helpful error message when no role is specified (was NPE) 2016-07-12 15:42:28 +01:00
Andras Slemmer
4b962eeb1f irsdemo: Remove unused --fake-trade-with-address 2016-07-12 15:42:28 +01:00
Mike Hearn
f6789c93dd Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract. 
This confusion was introduced by a previous refactoring.
 2016-07-12 16:01:50 +02:00
Ross Nicoll
910d1932c9 Merged in rnicoll-commercial-paper-cleanup (pull request #223) 
Tweak conditions on JavaCommercialPaper to match CommercialPaper
 2016-07-12 14:51:08 +01:00
Ross Nicoll
e09710e421 Update contract tutorial example to match JavaCommercialPaper 2016-07-12 14:48:50 +01:00
Ross Nicoll
52be94866a Use requireThat in JavaCommercialPaper 
Replaces verification logic in JavaCommercialPaper, which previously manually
throw IllegalStateException, with calls to requireThat().
 2016-07-12 14:24:50 +01:00
Ross Nicoll
79e3ce23f8 Tweak conditions on JavaCommercialPaper to match CommercialPaper 2016-07-12 14:24:50 +01:00
Matthew Nesbit
12d5f01086 Merged in mnesbit-sprint-5-tidyup (pull request #221) 
Mnesbit sprint 5 tidyup
 2016-07-12 13:48:02 +01:00