ce99f354cb
Rename com.r3corda -> net.corda
2016-11-10 17:14:24 +01:00
af8859ebf1
Merged in parkri-protocol-error-handling-fix (pull request #447 )
...
Fix handling of node shutdown so protocols don't blow up when they encounter the messaging layer already shutdown. Protocols will also stop resuming once shutdown has commenced.
2016-11-08 18:15:35 +00:00
fe6bf0e6ea
Implement controlled stop of StateMachineManager.
2016-11-08 17:53:43 +00:00
103817ec57
Add signing of transaction merkle root hash.
2016-11-08 17:41:32 +00:00
686b53f768
Fix Cordapp docs which don't use the right gradle syntax. Minor tweaks in AbstractNode
2016-11-08 15:40:44 +01:00
51e86e7cd3
node: Small cleanup
2016-11-08 11:20:10 +00:00
1c39780c22
Handle the timeout exception, which can happen if the scheduler overruns (e.g. during debugging, but also potentiallyu with slow callbacks).
2016-11-07 09:56:38 +00:00
71965b0792
Add serialization workaround for HashMaps inside states. Fix tests.
2016-11-04 17:21:11 +00:00
bd89da458b
Added nice extension methods for Path, which are more readable than the static methods from Files
2016-11-04 15:36:14 +00:00
8882b77b1b
Fixed quasar scanning.
2016-11-04 13:35:25 +00:00
7e198e7cf3
Renamed contracts project to finance to better reflect the purpose of the project.
2016-11-04 13:35:25 +00:00
143e3a063f
Pending redelivery table name prefix added in line with other tables.
...
No longer delete all pending messages from the database and move into memory before putting back into the database again, which is vulnerable to failure. Now we delete individual pending messages on successful redelivery.
2016-11-04 10:22:14 +00:00
7f8608c981
Changing UI layout
2016-11-03 11:39:24 +00:00
6d39b71bf9
Simple RPC access control, with a demo control on the cash RPCs
2016-11-03 10:46:25 +00:00
1d25d23b73
Merge from master
2016-11-02 14:20:51 +00:00
012dc9ec10
Merge branch 'master' into colljos-vault-code-clean-up-refactor
2016-11-02 11:20:21 +00:00
a38b363e9d
Fixed subtle bug in Cash Spending when processing for same Issuer with multiple refs.
2016-11-02 11:15:09 +00:00
ad81ecf2f9
Merged in clint-todocleanup (pull request #432 )
...
Removed unused files, cleaned up build scripts.
2016-11-02 11:06:10 +00:00
847257c250
Merged in parkri-speed-up-integration-tests (pull request #434 )
...
Speed up JDBCHashMapTestSuite by 3min on my laptop by avoiding Exposed table existence checks each time a map/table is created by re-using the map/sets across tests (after clear()-ing to reset their state).
2016-11-02 11:02:54 +00:00
b188bfda52
Speed up JDBCHashMapTestSuite by 3min on my laptop by avoiding Exposed table existence checks each time a map/table is created by re-using the map/sets across tests (after clear()-ing to reset their state).
2016-11-02 10:08:38 +00:00
f26813c1ab
Merged in rnicoll-cache-key-collision (pull request #425 )
...
Error if multiple nodes match a key
2016-11-01 18:14:23 +00:00
7e3c00c1ff
Merged in colljos-pluginservicehub (pull request #427 )
...
Added PluginServiceHub for use by Corda plugin service extensions.
2016-11-01 17:12:52 +00:00
f415c497d9
Minor changes to address PR feedback and comments
2016-11-01 16:47:50 +00:00
e449ba93c4
Minor fix following rebase to incoporate Ross changes to CashState definition.
2016-11-01 16:29:21 +00:00
b4ee47bd33
Error if multiple nodes match a key
...
InMemoryNetworkMapCache.getNodeByPublicKey() previously returned null if multiple nodes matched
a given public key (for example if the same node is registered more than once with different
names). This is incorrect behaviour, as there is a match.
2016-11-01 16:27:54 +00:00
e6a0f18436
Add diagnostics for web server and API plugin instantiation
2016-11-01 16:22:49 +00:00
253a70f55e
Fixed bug in generateSpending whereby Issuer Ref was not being checked.
2016-11-01 16:12:19 +00:00
1e6cca4d5d
Removed dead installDist configurations and moved Jolokia access to the correct resources dir.
2016-11-01 16:09:13 +00:00
613a86c5d9
Remove deposit and issuanceDef fields
...
Remove deposit field from the FungibleAsset interface, and moved it into a fixed reference to
amount.token.issuer.
Remove issuanceDef field and replace it with amount.token.
2016-11-01 14:49:57 +00:00
74dc0b7154
Exposed Vault Transaction Note functionality via RPC.
2016-11-01 12:46:41 +00:00
d9f0a161e4
Addressed comments in PR review.
2016-11-01 12:05:48 +00:00
c5500caf98
Minor changes to address PR feedback and comments
2016-11-01 11:39:11 +00:00
308d7c1df7
Added PluginServiceHub for use by Corda plugin service extensions.
2016-10-31 17:15:06 +00:00
96007cd777
Changed transaction notes type DB from 'blob' to 'text'
2016-10-31 15:07:34 +00:00
5898a15579
Upgrade H2 to 1.4 to fix curious file corruption issue encountered by Patrick.
2016-10-28 17:39:10 +01:00
c3533bac7d
Improved error reporting.
2016-10-28 13:46:43 +01:00
fdbd67db5c
Added some more error logging to Node.
2016-10-28 13:46:43 +01:00
2ce310050e
Revert incorrect merge commit.
2016-10-28 10:28:15 +01:00
b46de0b964
Merge remote-tracking branch 'origin/colljos-vault-transaction-notes' into colljos-vault-transaction-notes
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/node/services/Services.kt
# core/src/main/kotlin/com/r3corda/core/testing/InMemoryVaultService.kt
# node/src/main/kotlin/com/r3corda/node/services/vault/NodeVaultService.kt
2016-10-28 09:59:58 +01:00
369214a747
Additional method on VaultService to add notes to a transaction
...
Additional method on VaultService to retrieve notes for a transaction
2016-10-28 09:57:33 +01:00
504ec42720
Additional method on VaultService to retrieve notes for a transaction
2016-10-27 16:35:26 +01:00
f2e98ffba5
Merge branches 'colljos-vault-transaction-notes' and 'master' of https://bitbucket.org/R3-CEV/r3prototyping into colljos-vault-transaction-notes
2016-10-27 14:59:37 +01:00
74e89181da
Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt
# node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt
Fixed conflict.
2016-10-27 12:57:37 +01:00
7d080c39df
Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt
# node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt
Fixed failing CommercialPaper test
(caused by re-use of same database transaction context for vault across two different transaction participants)
2016-10-27 12:56:08 +01:00
8f1329b03f
Merged in clint-capletnode (pull request #413 )
...
Moved the Corda Caplet to Node to clear out root src dir.
2016-10-25 09:37:32 +00:00
e5db17b029
Rewrote comment to improve readability.
2016-10-25 10:01:52 +01:00
af902ee4df
Removed redundant whitespace.
2016-10-24 18:36:19 +01:00
c18ed4b402
ProtocolLogicFactory now initiated before it is used.
2016-10-24 17:56:16 +01:00
f92f7d8d56
NodeSchedulerService no longer takes a default protocol logic ref factory (because otherwise no protocols are whitelisted) and instead now uses the one constructed in the node.
2016-10-24 17:56:16 +01:00
546f3e2bbf
Removed dead plugin reference.
2016-10-24 17:56:16 +01:00
