Joel Dudley
443afb3515
Rethrows a clearer error message when a test tx in a test ledger does not create a valid tx.
2018-01-22 16:08:26 +00:00
Viktor Kolomeyko
743f514fd9
High Level Design decisions for Business Network ( #369 )
...
* ENT-1331: Placeholder for design decisions previously discussed.
* ENT-1331: Describe TLS approach.
* ENT-1331: Describe Membership approach.
* ENT-1331: Describe Node vs. CordApp membership approaches.
* ENT-1331: Including remarks/corrections from @josecoll
* ENT-1331: Including remarks/corrections from @josecoll, part 2
2018-01-22 15:33:04 +00:00
josecoll
00a7172e4b
Resolve conflict after merge from master.
2018-01-22 14:39:29 +00:00
josecoll
4bff002b41
Merge branch 'master' into colljos-schema-split-for-notaries
2018-01-22 14:36:27 +00:00
josecoll
c8e55ae086
Backported fix. ( #2399 )
2018-01-22 14:32:04 +00:00
Austin Moothart
642b298d23
AWS marketplace getting started docs
2018-01-22 14:27:35 +00:00
Michal Kit
e1098dee4b
Adding public key constraint ( #319 )
...
* ENT-1356 Adding public key constraint
* Addressing review comments
* Removing SERIALIZABLE from transaction
* Adding stashed changes
* Removing SERIALIZABLE from node info storage
* Addressing review comments
* Addressing possible certificate inconsitency (design gap) + clearing whole database for new liquibase changeset
* Addressing review comments
2018-01-22 14:10:33 +00:00
Christian Sailer
8d5611853a
CORDA-929 Attachment caching ( #2372 )
...
* ENT-1403 Cache node attachments (and attachment content)
* ENT-1403 Make cache sizes configurable
* Update documentation with new config parameters
* Test that non-existence of attachments is not cached
* Remove unneeded defaults in interface
* It turned out we need the defaults on the interface in quite a few tests
* Codereview: typos, size in MB rather than bytes, charset in tests, move concurrencyLevel to a constant
* Codereview: Make the internal config value bytes again, but config file in MB
* Fix example config unit test
2018-01-22 13:41:06 +00:00
Michal Kit
4a3379ac8a
CORDA-937 adding node key pair to utility/testing methods ( #2405 )
2018-01-22 13:06:22 +00:00
Michal Kit
cee975c1c1
Reverting schema changes and following the liquibase change tracking … ( #385 )
...
* Reverting schema changes and following the liquibase change tracking flow
* Addressing review comments
* Adding other tables cleanup
* Renaming the changeset file
2018-01-22 12:11:31 +00:00
Andrzej Cichocki
dfe581bac6
Merge pull request #384 from corda/andr3ej-os-merges
...
OS merges
2018-01-22 11:52:47 +00:00
Andrzej Cichocki
1fc646cfa8
CORDA-716 Move test-utils and node-driver to stable API section in docs ( #2335 )
...
* Move test-utils and node-driver to stable section.
* Move FlowStackSnapshotFactory to testing.services package & update docs
* Move SerializationTestHelpers to testing.core package
* Move TestConstants.kt to core namespace
* Move Expect.kt to core namespace
* Move CoreTestUtils to core.TestUtils - rename class and update imports
* Added some clarification to documents after re-reading them
* Added static imports
* Removing unused import
* Fix merge conflict
* Fixing merge conflict
2018-01-22 11:28:41 +00:00
Andrzej Cichocki
d00438b86f
Fix MockNetwork non-daemon thread leak. ( #2397 )
2018-01-22 11:00:40 +00:00
Patrick Kuo
43604ed212
Handle rejected jira issues in doorman ( #371 )
...
* handle reject status from jira - WIP
* fix up after rebase
* address PR issue and fix build error after rebase
2018-01-22 10:45:25 +00:00
Ross Nicoll
3094e44115
Dump exception to System.err ( #213 )
2018-01-19 22:21:43 +00:00
szymonsztuka
f59560bb06
Database schema changes. ( #2389 )
...
Changes compatible with R3.Corda (ENT-794):
1) Added Hibernate corda-wrapper-binary two to to columns.
2) Shorten names of tables in dummy schemas used in tests.
3) Undo removal of compound index of VaultTxnNote (b423fea
2018-01-19 17:09:02 +00:00
Mike Hearn
ac7637e2b4
Revert "CORDA-599 RPCSecurityManager is no longer lateinit ( #2347 )"
...
This reverts commit 75e74e67a1
2018-01-19 17:52:59 +01:00
Andrzej Cichocki
a889a5bef1
Revert jolokiaVersion code.
2018-01-19 16:50:19 +00:00
Andrzej Cichocki
6ddf684846
Fix compile errors.
2018-01-19 15:12:33 +00:00
Andrzej Cichocki
bd342a690c
Merge commit 'bbcafca959b2d468a6f4f9bb847a1bbb7bfc9fdc' into andr3ej-os-merges
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
2018-01-19 13:46:27 +00:00
Joel Dudley
cfc5c6709a
Fixes formatting.
2018-01-19 13:43:17 +00:00
Andrzej Cichocki
7ac1cbd379
Merge commit 'e699dad076fc1d81b8bd9529747e2922728ce2e0' into andr3ej-os-merges
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
2018-01-19 13:40:16 +00:00
Andrzej Cichocki
16c3250669
Merge commit 'a3fd653affb01a660b2be31314866d8d1f1715de' into andr3ej-os-merges
...
# Conflicts:
# docs/source/serialization.rst
2018-01-19 13:10:08 +00:00
Joel Dudley
87b00fde7d
Better instructions for building against master.
2018-01-19 11:47:19 +00:00
Anthony Keenan
35f89e03ea
Abstract InMemoryMessaging behind an interface so as not expose net.corda.nodeapi.internal.persistence.CordaPersistence in public API ( #2390 )
2018-01-19 10:57:08 +00:00
cburlinchon
de4c062529
Node restarted with shutdown executor ( #2391 )
...
* Test for node restart
* Executor gets shutdown on stop, make sure we have one on start
* Reset shutdown otherwise AbstractNode.stop never gets called
2018-01-19 10:19:12 +00:00
Matthew Nesbit
5dc15b8032
Merge pull request #381 from corda/andr3ej-matthew-os-merge
...
Matthew OS merge
2018-01-19 08:52:57 +00:00
Shams Asari
2f8836c8ad
Some long overdue cleaning up of some of the doorman code. ( #362 )
2018-01-18 23:08:02 +00:00
Joel Dudley
7427d63bbc
Prevents checkSignatures from failing if tx also contains unrecognised sigs.
2018-01-18 18:08:22 +00:00
Andrzej Cichocki
f3c5ae2ff6
Merge commit '6edf95506bb2bd96ebffade9b9dd82d468cd4252' into enterprise
...
# Conflicts:
# docs/source/changelog.rst
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
2018-01-18 16:48:05 +00:00
Thomas Schroeter
e9f0c8eca8
Merge pull request #361 from corda/thomas-mysql-reconnect
...
Retry obtaining DB connection
2018-01-18 16:38:47 +00:00
Katarzyna Streich
133cf13674
Remove primary key constraint on host and port ( #336 )
...
* Remove primary key constraint on DBHostAndPort
* Update migration file
2018-01-18 16:24:06 +00:00
Katarzyna Streich
af081a7170
Remove primary key constraint on DBHostAndPort ( #2318 )
...
Remove primary key constraint on DBHostAndPort
Return always first node if more are matching by address.
2018-01-18 16:23:41 +00:00
josecoll
a148835787
Added migrationResource for Notary schemas, and split out original liquibase node-services changelogs into node-core and node-notary
2018-01-18 15:21:55 +00:00
Katelyn Baker
9575381733
Merge pull request #378 from corda/clint/compilerxml-fixupdate
...
Added -parameters as an additional command line options to revert it …
2018-01-18 15:03:15 +00:00
Andrzej Cichocki
a099f30e61
Merge pull request #377 from corda/andr3ej-entbot
...
Merge my conflicting changes from OS
2018-01-18 12:59:41 +00:00
Clinton Alexander
ccae3acf7e
Added -parameters as an additional command line options to revert it being removed during a merge.
2018-01-18 12:31:56 +00:00
Katarzyna Streich
f2f803ecd5
HSM signing of network parameters ( #363 )
...
Add HSM signing of network parameters
2018-01-18 12:05:18 +00:00
Andrzej Cichocki
42e1a38c6b
Merge commit 'ea57639a378fa45f0aef6930bc4450d0bbfaa5f4' into andr3ej-entbot
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-01-18 11:15:14 +00:00
Michal Kit
af21f6065d
Fixing missing certificate ( #373 )
...
* Fixing missing certificate
* Addressing review comments
2018-01-18 11:15:11 +00:00
Joel Dudley
4d4f12d598
Reworks upgrade notes to improve structure and style.
2018-01-18 11:10:52 +00:00
Christian Sailer
7bd2210d2f
Merge pull request #374 from corda/christians/ENT-985-merge
...
ENT-985 NetworkMapCaching
2018-01-18 11:09:02 +00:00
Joel Dudley
038c4eb615
Removes cli vs ide from quickstart. Adds link to new utilities page.
2018-01-18 11:04:07 +00:00
Viktor Kolomeyko
299d9bef77
Minor: numbering update.
2018-01-18 11:03:41 +00:00
Katelyn Baker
9df35ae5d3
Merge pull request #2383 from corda/kat/feature/deterministicSerilaizer
...
CORDA-914 - Deterministic property ordering for AMQP serialization
2018-01-18 10:29:57 +00:00
Andrzej Cichocki
bbcafca959
Retire DatabaseTransactionManager. ( #2385 )
2018-01-18 10:11:34 +00:00
josecoll
e699dad076
CORDA-917 Bootstrap nodes without Notary schemas (by default) ( #2376 )
...
* Default jolokia version with optional override in CorDapp project gradle file.
* Bootstrap a node without Notary schemas by default.
* Revert unrelated Jolokia code change.
* Revert unrelated Jolokia code change.
* Addressed PR review feedback.
2018-01-18 10:10:06 +00:00
Christian Sailer
d9fb2ae4a8
Merge commit 'fca0afe5913d880628b9f94c459a04fb785b6c17' into christians/ENT-985-merge
2018-01-18 09:56:46 +00:00
Katelyn Baker
619f333541
Merge pull request #2350 from corda/kat/docFix
...
Serialization documentation update
2018-01-17 22:14:43 +00:00
David Lee
6733e74fcd
Merge pull request #142 from corda/dl-design-admin-ui
...
Approved by Mike H
2018-01-17 17:56:08 +00:00
