Mike Hearn
|
31f3bb28bb
|
Fix build
|
2016-09-09 11:47:40 +02:00 |
|
Mike Hearn
|
34890b7678
|
Merged in james-encumbrances (pull request #289)
Encumbrances implemented by reference to an index of an output state
|
2016-09-09 11:32:03 +02:00 |
|
Mike Hearn
|
53967e26ae
|
Minor type fix in the encumbrances doc section
|
2016-09-09 09:31:52 +00:00 |
|
Mike Hearn
|
5f048889f0
|
Merged in mike-tweak-erroror (pull request #343)
Minor: move ErrorOr into the core module and tweak its API a bit. Add a Path div operator.
|
2016-09-09 11:29:22 +02:00 |
|
jamescarlyle
|
b7e6c210d9
|
Merge with master
# Conflicts:
# docs/build/html/_sources/index.txt
# docs/build/html/_sources/protocol-state-machines.txt
# docs/build/html/_sources/tutorial-contract-clauses.txt
# docs/build/html/index.html
# docs/build/html/protocol-state-machines.html
# docs/build/html/searchindex.js
# docs/build/html/tutorial-contract-clauses.html
# docs/build/html/tutorial-contract.html
|
2016-09-09 09:43:14 +01:00 |
|
jamescarlyle
|
455a0ac9c9
|
Tidied document code example
|
2016-09-08 23:02:01 +01:00 |
|
jamescarlyle
|
e187c4d91d
|
Further tweaks based on feedback - simplified the embedded timelock contract
|
2016-09-08 22:49:24 +01:00 |
|
Matthew Nesbit
|
71f0325a39
|
Merged in mnesbit-cleanup-integration-tests-not-in-default-build (pull request #345)
Ensure integration tests not directly called from build or installDist.
|
2016-09-08 16:41:42 +01:00 |
|
Matthew Nesbit
|
9518c38f29
|
Ensure integration tests in modules are in separate configurations and not directly called from build or installDist.
|
2016-09-08 15:28:04 +01:00 |
|
Matthew Nesbit
|
4fb0148f96
|
Merged in mnesbit-cleanup-driver-use-standalone-node (pull request #340)
Use standalone Corda main class and configuration in the Driver, rather than a separate class.
|
2016-09-08 14:59:18 +01:00 |
|
Mike Hearn
|
af72978ace
|
Remove redundant import.
|
2016-09-08 14:41:17 +02:00 |
|
Matthew Nesbit
|
245d6ce21f
|
Use standalone Corda main class and configuration in the Driver, rather than a separate class.
Better check for Notary services
|
2016-09-08 12:44:12 +01:00 |
|
Andras Slemmer
|
abe9cfbd67
|
Merged in aslemmer-node-client-models (pull request #307)
Aslemmer node client models
|
2016-09-08 12:31:35 +01:00 |
|
Mike Hearn
|
34ee44b532
|
Minor: move ErrorOr into the core module and tweak its API a bit. Add a Path div operator.
|
2016-09-08 13:12:15 +02:00 |
|
Mike Hearn
|
d8d639f192
|
Merged in mike-small-tweaks (pull request #337)
A few small tweaks
|
2016-09-08 12:40:14 +02:00 |
|
Andras Slemmer
|
0412a70301
|
client: Rename TransactionCreateState -> GatheredTransactionData, fix compile error after rebase
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
e235375a89
|
client: Add stubs/todo for handling state snapshots
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
3acbda53e4
|
client: AmountBindings class->object
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
2869889769
|
client: Add lengthier explanation of Models
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
6b6c51b8d4
|
client: Elaborate on why we need two IDs in TransactionCreateStateModel
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
d5c4202162
|
client: Fix when (this) to use virtual dispatch instead
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
3a5247f016
|
client: Small tweaks
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
2ef59ff2ba
|
client: Small comment adjustment
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
7eb4f1fb33
|
client: Clarify keyHashCode var name, add unit tests for AggregatedList
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
435754a043
|
client: reactfx->rx
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
4c36072849
|
client: Document fx utilities
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
0c8f58b2ac
|
client: Document models
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
cb956e0979
|
client: Some refactor of Expect dsl, docs
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
bdb22e1b74
|
client: Add javafx utilities and basic WalletMonitor models
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
e36eef8935
|
Merged in aslemmer-node-client-mock (pull request #310)
Aslemmer node client mock
|
2016-09-08 11:24:22 +01:00 |
|
Andras Slemmer
|
a845cf6bdf
|
client: Fix compile after rebase
|
2016-09-08 11:05:53 +01:00 |
|
Andras Slemmer
|
e97cbec755
|
client: Fix compile error after rebase
|
2016-09-08 10:59:19 +01:00 |
|
Andras Slemmer
|
8b6b9977ec
|
client: ErrorOrs use nullable values and Exception
|
2016-09-08 10:59:19 +01:00 |
|
Andras Slemmer
|
69fecf94d1
|
client: Add varargs convenience sampleBernoulli
|
2016-09-08 10:59:19 +01:00 |
|
Andras Slemmer
|
6f8d92d368
|
client: Remove test-utils dep from compile
|
2016-09-08 10:59:19 +01:00 |
|
Andras Slemmer
|
2a7115318d
|
client: Fix compile error after rebase
|
2016-09-08 10:59:19 +01:00 |
|
Andras Slemmer
|
598809559d
|
client: Add Generator lib, and generators for client<->service events
|
2016-09-08 10:59:19 +01:00 |
|
Andras Slemmer
|
5a2d1e0979
|
Merged in aslemmer-fix-generated-exit-signing (pull request #342)
Aslemmer fix generated exit signing
|
2016-09-08 10:56:18 +01:00 |
|
Andras Slemmer
|
52d406a7a0
|
Merged in aslemmer-fix-tx-resolution-bug (pull request #341)
core: Fix tx resolution bug by topological sorting of downloaded transactions
|
2016-09-08 10:27:39 +01:00 |
|
Andras Slemmer
|
fcd477e332
|
core: Address topo sort style suggestions
|
2016-09-08 10:17:00 +01:00 |
|
Andras Slemmer
|
8e6198cf91
|
core: Make topological sort result deterministic
|
2016-09-08 10:15:59 +01:00 |
|
Andras Slemmer
|
5596ced5c3
|
core: Make topological sort more efficient
|
2016-09-08 10:04:18 +01:00 |
|
Andras Slemmer
|
d6f82637ad
|
core: Fix tx resolution bug by topological sorting of downloaded transactions
|
2016-09-07 18:34:20 +01:00 |
|
Andras Slemmer
|
b86beab328
|
contracts: Fix generateExit signers
|
2016-09-07 18:31:30 +01:00 |
|
Andras Slemmer
|
b676e764fe
|
Merge branch 'rnicoll-cash-exit' into aslemmer-fix-generated-exit-signing
|
2016-09-07 18:31:05 +01:00 |
|
Matthew Nesbit
|
287326b118
|
Merged in mnesbit-cleanup-simplify-node-config (pull request #339)
Simplify the FullNodeConfiguration now that an explicit identity for the NetworkMapService isn't a problem.
|
2016-09-07 16:13:55 +01:00 |
|
Matthew Nesbit
|
1f2a6d256e
|
Simplify the FullNodeConfiguration now that an explicit identity for the NetworkMapService isn't a problem.
Use consistent if style
Don't include NetworkMapAddress in config if hosting locally
|
2016-09-07 15:35:50 +01:00 |
|
sofusmortensen
|
c7b164897b
|
Universal: example parties renamed
|
2016-09-07 14:40:56 +02:00 |
|
sofusmortensen
|
1ceee48696
|
Universal: refactoring
|
2016-09-07 14:40:56 +02:00 |
|
Mike Hearn
|
7f08c80470
|
Merged in mike-tx-types-refactoring-september (pull request #334)
Small usability improvements to the core tx types API and add an additional check to NCP
|
2016-09-07 13:10:38 +02:00 |
|