ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-24 04:56:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,679 Commits 103 Branches 407 Tags
Commit Graph

13679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joel Dudley
9fcf15e825
Fixes headers to correctly render in side-bar. (#4165) 2018-11-05 14:11:40 +00:00
Roger Willis
80591bc6fd
StatePointer (#4074) 
* Introducing linear pointer.

* Added design document.
Added StatePointer interface.
Updated design document.
Updated StatePointer implementation.
Added doc section for state pointer.

* Updated design document.
Added API for StatePointer.

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update docs/source/design/linear-pointer/design.md

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update docs/source/design/linear-pointer/design.md

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Resolve pointers
Added test to check pointers are resolved.
Updated docs and kdocs.
Reverted changes to api-current.txt
Revert "Reverted changes to api-current.txt"
This reverts commit dc1cece91a595a4e772f63917b830c7e1fd0586d.
Fix CI bug.
Made StatePointers type safe.
Resolving StatePointers is now optionally recursive
Addressed review comments.

Fixed compile error.

Addressed review comments.

Fixed bug in state pointer search.
Improved efficiency of state pointer search.

Removed whitespace.

TxBuilder logs warning when no service hub is supplied for resolving pointers as opposed to throwing an exception.

* Addressed review comments.
 2018-11-05 10:33:26 +00:00
Christian Sailer
3260d9f2c4
CORDA-1489 Exposure of node internals in mock network (#4130) 
* Introduce public subset of config to tweak config via mock net work without exposing internal node config.

* Removal of functions exposing (internal) NodeConfiguration from the public test API

* Code review fixes

* Blank lines removed

* Documented mock network API change in upgrade notes.

* Updated documentation and API doc.

* More documentation/API doc
 2018-11-05 09:29:05 +00:00
szymonsztuka
241c045bb9
Added back Liquibase script for FungibleState (#1526) 
Added back Liquibase script for FungibleState column change to nullable/ commit dd60ae2 with modification to run for H2 database only. For standalone databases the column `vault_fungible_states .issuer_ref `was always nullable, however using H2 db from OS it could be not null (as it was created from JPA annotations) .
 2018-11-03 10:36:20 +00:00
Viktor Kolomeyko
ffa1adb5d4
Merge pull request #1536 from corda/feature/vkolomeyko/OS-Ent-merge 
OS->Ent merge
 2018-11-02 18:10:24 +00:00
Viktor Kolomeyko
f6ac49aba3 Merge remote-tracking branch 'open/master' into feature/vkolomeyko/OS-Ent-merge 2018-11-02 16:29:21 +00:00
Viktor Kolomeyko
513305ee7d
ENT-2669: SocksProxy rename into Proxy (#1533) 
* ENT-2669: Rename SocksProxyVersion into ProxyVersion

* ENT-2669: Rename SocksProxyConfig into ProxyConfig

Update documentation and make code changes such that old style configs are still parsed.

* ENT-2669: Changelog update
 2018-11-02 16:07:41 +00:00
Andrius Dagys
460cf3480f ENT-1858: Minor fix for a uniqueness provider test 2018-11-02 16:06:55 +00:00
Christian Sailer
07719489e4
ENT-2682 Fix cordapp layout for notaryhealthcheck (#1528) 
* Move state and command to contract.

* Rollback compiler.xml
 2018-11-02 15:39:14 +00:00
Michele Sollecito
6fb2996fd6
[ENT-2678]: PluginRegistrationTest.test plugin registration is failing (fix) (#1535) 2018-11-02 14:01:14 +00:00
Michele Sollecito
ae8f26bd42
Merge pull request #1534 from corda/merges/02_11_2018_13_15 
[ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153)
 2018-11-02 13:31:34 +00:00
Michele Sollecito
6408b845b6 [ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153) 
(cherry picked from commit 24e9ceac484f3ed42a929a095010aed1d168db70)
 2018-11-02 13:18:36 +00:00
Andrius Dagys
c0c997f6ce
Merge pull request #1532 from corda/andrius/merge-11-02 
Andrius/merge 11 02
 2018-11-02 13:13:11 +00:00
Venelin Stoykov
094eb266a8 [CORDA-2174] Fix demo node startup (#4151) 
- Make issuableCurrencies config optional

- Allow additionalCordapps to override cordappsForAllNodes

In driver DSL when passing additionalCordapps to startNode and
one of the CordApps is also in cordappsForAllNodes will lead to confilc.
This commit is resolving the conflict by using the CordApp provided
by additionalCordapps
 2018-11-02 11:44:18 +00:00
Michele Sollecito
24e9ceac48
[ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153) 2018-11-02 11:36:28 +00:00
Andrius Dagys
b9ff958011 ENT-1858: All non-bft notary services are now async 2018-11-02 11:12:46 +00:00
Viktor Kolomeyko
b1502c98f8
ENT-2681: Ensure we can parse old style bridge configs. (#1529) 
* ENT-2681: Ensure we can parse old style bridge configs.

* ENT-2681: Minor change

* ENT-2681: Minor change
 2018-11-02 10:45:52 +00:00
Andrius Dagys
539fac0d57 Merge remote-tracking branch 'open/master' into andrius/merge-11-02 2018-11-02 09:08:03 +00:00
Tudor Malene
8814a087ed
Merge pull request #1530 from corda/tudor-os-merge-1-11 
Tudor os merge 1 11
 2018-11-02 08:56:36 +00:00
Andrius Dagys
66116e8d20
ENT-1858: Notary cleanup (#4134) 
* Migrated all non-BFT notary implementations to use async commits.

* Mock network: await for async operation completion. When calling runNetwork()
it keeps "pumping" messages between participants until no more messages are generated.
The problem comes in when a flow suspends on an async operation: the mock network
thinks the flow finished the work for the current step, and since no more messages
are generated, completes the runNetwork() function. The message that the flow
generates once it resumes after async operation completion never gets processed.
This change makes runNetwork() wait until all flow async operations finish,
and only then check whether no more messages can be transferred.
 2018-11-01 19:03:43 +00:00
Tudor Malene
56158caa8b Fix merge 2018-11-01 17:59:39 +00:00
Tudor Malene
6c58a28038 Fix merge 2018-11-01 17:04:52 +00:00
tudor.malene@gmail.com
d97d64d954 Merge remote-tracking branch 'open/master' into tudor-os-merge-1-11 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
#	core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
#	docs/source/index.rst
#	node/src/integration-test/kotlin/net/corda/node/flows/FlowOverrideTests.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
 2018-11-01 16:58:28 +00:00
Tudor Malene
4e0a956e20
CORDA-2083 Deserialize component groups lazily (#4122) 
CORDA-2083 Deserialize component groups lazily
 2018-11-01 16:54:31 +00:00
Cais Manai
b0771d6f2b Fixing a single typo (#4152) 
changing "areshared" to "are shared"
 2018-11-01 16:53:47 +00:00
Joel Dudley
b444701d7e
Formatting issue (#4150) 2018-11-01 16:47:50 +00:00
Joel Dudley
722fa31fb6
Documents waitForLedgerCommit. Clean-up. (#4144) 2018-11-01 15:23:47 +00:00
Shams Asari
f2b36ea10f Fix mailing list link to point to corda-dev 2018-11-01 16:04:12 +01:00
Anthony Keenan
7ca1dd5848
Fix issue where verbosity wasn't working on subcommands (#4147) 2018-11-01 11:34:14 +00:00
Patrick Kuo
5d1362bca6
[ENT-2624] Disable switch for SNI functionality (#1487) 
* [ENT-2624] Disable switch for SNI functionality

* * Add SNI switch to driver
* Make BridgeRestartTest test for both enableSNI = true and false
 2018-11-01 11:15:24 +00:00
szymonsztuka
eaea6546fe
Merge pull request #1524 from corda/merges/os-mere-2018-10-31 
OS -> ENT merge, resolved conflicts: README.md,  docs/source/api-persistence.rst, docs/source/node-database.rst.
 2018-11-01 10:31:59 +00:00
szymonsztuka
777026eb79
Undo test deletion which got lost in commit 391c6bf66fc31f2609f787298ef1ce77ffe7fb73. (#4145) 2018-11-01 10:29:59 +00:00
szymonsztuka
fcea655bf1
Align with ENT repo - explicit node names in the FlowOverrideTests integration test. (#4146) 2018-11-01 09:59:47 +00:00
Michele Sollecito
b883ef6321
Merge pull request #1525 from corda/ENT-2678 
[ENT-2678] Disable PluginRegistrationTest until we fix it.
 2018-11-01 09:57:02 +00:00
Florian Friemel
449463241b
Disable PluginRegistrationTest until we fix it. 2018-11-01 09:52:03 +00:00
James Carlyle
88782f7544
Merge pull request #4143 from corda/james-corda-network-1 
James corda network 1
 2018-10-31 21:17:53 +00:00
jamescarlyle
2cdcbc8ead Updated with governance-guidelines and minor edits to other governance documents. 2018-10-31 19:58:21 +00:00
szymonsztuka
353c96375d Merge remote-tracking branch 'remotes/open/master' into merges/os-mere-2018-10-31 
# Conflicts:
#	README.md
#	docs/source/api-persistence.rst
#	docs/source/node-database.rst
 2018-10-31 18:08:59 +00:00
szymonsztuka
7cb9e174a9
Documentation for CORDA-1915 Build system for jarsigner (#4006) 
Documenting new cordapp and conformation plugins capabilities to sign CorDapp JAR, enabled by corda-gradle-plugins releases 4.0.32 and 4.0.33.
 2018-10-31 16:20:11 +00:00
szymonsztuka
437a053037
Minor docs update - Persistence API and node database (#4061) 
Note about database considerations regarding Cordapp compatibility between OS and ENT.
Remove database configuration "schema" as this is not implemented in OS, it was already mentioned as ignored for SQL server.
 2018-10-31 14:39:22 +00:00
Anthony Keenan
8ddd8d383d
Remove unused test class (#4139) 2018-10-31 12:58:57 +00:00
Joel Dudley
f159629e36
Update README.md 2018-10-31 11:12:31 +00:00
Joel Dudley
fa87054b82
Update README.md 2018-10-31 11:09:02 +00:00
James Carlyle
62399d04c7 Removed personal tone ('we'/'R3') from docs, in keeping with rest of documentation. 2018-10-31 09:17:21 +00:00
Richard Gendal Brown
abf47a7c01
Merge pull request #4141 from corda/gendal-patch-1 
CORDA-2170 Add Apache 2 license badge
 2018-10-31 08:53:35 +00:00
jamescarlyle
3d5994c375 Revert "Add files via upload" 
This reverts commit 82d9f9846faf5a943499a17d9941cd37eb784008.
 2018-10-30 23:02:10 +00:00
James Carlyle
3a20e3f208 Updated with governance-guidelines and minor edits to other governance documents. 2018-10-30 19:27:40 +00:00
Joel Dudley
7eca7515d6
Clarifies that only one serialisation mechanism is required. Clarifies dependencies required for Client RPC. (#4135) 
* Makes it clear that only one serialisation mechanism is required. Clarifies dependencies required for Client RPC.

* Addresses review feedback.
 2018-10-30 18:06:01 +00:00
Richard Gendal Brown
a1da0b4a63
Add Apache 2 license badge 2018-10-30 17:53:54 +00:00
Stefano Franz
ab1deaac99
CORDA-1953 Display error when unable to open connection to Docker (#4136) 
* Display error when unable to open connection to Docker

* review comments
 2018-10-30 17:14:47 +00:00