ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-19 17:08:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,941 Commits 96 Branches 407 Tags
Commit Graph

11941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tudor Malene
9f8d6b4fdc
Merge pull request #861 from corda/feature/ENT-1932/move_MigrationExporter 
ENT-1932 Move MigrationExporter to the "node" module
 2018-05-21 15:25:59 +03:00
Shams Asari
5b213871ff
Merge pull request #862 from corda/os-merge-2907250 
O/S merge from 2907250
 2018-05-21 12:43:21 +01:00
Matthew Nesbit
355ff8e7a1
Merge pull request #847 from corda/mnesbit-bridge-protect-misconfiguration 
ENT-1597: Detect duplicate bridge operation and terminate JVM
 2018-05-21 11:30:29 +01:00
Shams Asari
210a0bc9a5 Merge branch 'master' into os-merge-2907250 2018-05-21 11:26:23 +01:00
Shams Asari
b2f41d82f9 Merge fixes 2018-05-21 11:25:13 +01:00
Matthew Nesbit
1cd72f1b0f
Merge pull request #852 from corda/mnesbit-configure-bridge-async-send-ack 
Set the confirmationWindowSize setting in the bridge Artemis link.
 2018-05-21 11:23:07 +01:00
Tudor Malene
8356316d2e ENT-1932 Move MigrationExporter to the "node" module 2018-05-21 10:44:07 +01:00
Shams Asari
152848730d Merge remote-tracking branch 'open/master' into os-merge-2907250 
# Conflicts:
#	build.gradle
#	client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
#	node-api/build.gradle
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/AllButBlacklisted.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/AttachmentsClassLoader.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/DefaultWhitelist.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/GeneratedAttachment.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/OrdinalIO.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/SerializationFormat.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/SerializationScheme.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/SerializeAsTokenContextImpl.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/UseCaseAwareness.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPDescriptorRegistry.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPPrimitiveSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializerFactories.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ArraySerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CollectionSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CorDappCustomSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CustomSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializationInput.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedGenericArrayType.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedType.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumEvolutionSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Envelope.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/FingerPrinter.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/MapSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializers.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Schema.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationOutput.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializerFactory.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SingletonSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SupportedTransforms.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformTypes.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformsSchema.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigDecimalSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigIntegerSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BitSetSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CertPathSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ClassSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ContractAttachmentSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CurrencySerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/DurationSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/EnumSetSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InputStreamSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InstantSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateTimeSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalTimeSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/MonthDaySerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetDateTimeSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetTimeSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OpaqueBytesSubSequenceSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PeriodSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PrivateKeySerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PublicKeySerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/SimpleStringSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ThrowableSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CRLSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CertificateSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearMonthSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZoneIdSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZonedDateTimeSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenter.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Exceptions.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/MetaCarpenter.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Schema.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/SchemaFields.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClassResolver.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClosureSerializer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/kryo/DefaultKryoCustomizer.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/kryo/KryoSerializationScheme.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/kryo/SerializeAsTokenSerializer.kt
#	serialization/src/test/java/net/corda/serialization/internal/ForbiddenLambdaSerializationTests.java
#	serialization/src/test/java/net/corda/serialization/internal/LambdaCheckpointSerializationTest.java
#	serialization/src/test/java/net/corda/serialization/internal/amqp/ErrorMessageTests.java
#	serialization/src/test/java/net/corda/serialization/internal/amqp/JavaGenericsTest.java
#	serialization/src/test/java/net/corda/serialization/internal/amqp/JavaPrivatePropertyTests.java
#	serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerialiseEnumTests.java
#	serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerializationOutputTests.java
#	serialization/src/test/java/net/corda/serialization/internal/amqp/ListsSerializationJavaTest.java
#	serialization/src/test/java/net/corda/serialization/internal/amqp/SetterConstructorTests.java
#	serialization/src/test/kotlin/net/corda/serialization/internal/AttachmentsClassLoaderTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/ContractAttachmentSerializerTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/CordaClassResolverTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/ListsSerializationTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/MapsSerializationTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/PrivateKeySerializationTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/SerializationTokenTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/SetsSerializationTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/CorDappSerializerTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeAndReturnEnvelopeTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeMapTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryOfEnumsTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeSimpleTypesTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedTypeTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolvabilityTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolveTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/ErrorMessagesTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializerGetterTesting.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/FingerPrinterTesting.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/GenericsTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/OverridePKSerializerTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/PrivatePropertyTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializationPropertyOrdering.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializeAndReturnSchemaTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/amqp/StaticInitialisationOfSerializedObjectTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTestUtils.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterWhitelistTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/CompositeMemberCompositeSchemaToClassCarpenterTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/EnumClassTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/InheritanceSchemaToClassCarpenterTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/MultiMemberCompositeSchemaToClassCarpenterTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/SingleMemberCompositeSchemaToClassCarpenterTests.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoStreamsTest.kt
#	serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoTests.kt
#	settings.gradle
 2018-05-21 10:31:57 +01:00
Matthew Nesbit
f7fb54dc8a Detect duplicate bridge operation and terminate JVM to prevent re-ordering flow messages and causing odd behaviour. 2018-05-21 10:04:25 +01:00
Rick Parker
6b26d7d1a2
ENT-1476 Upgrade enterprise to de-contended EdDSA lib version (#843) 2018-05-21 10:01:06 +01:00
Thomas Schroeter
2907250468
Mark HA notary design as deprecated (#3171) 
This design is superseded by the CFT notary design.

* Mark HA notary design as deprecated
* Remove outdated HA notary service design
 2018-05-21 09:57:29 +01:00
Matthew Nesbit
93245ac07d Set the confirmationWindowSize setting in the bridge Artemis link. To reduce spam logging and improve performance. 
Fixup doc pictures to match CRL config change
 2018-05-21 09:52:04 +01:00
Matthew Nesbit
b07d5b3f26
Merge pull request #853 from corda/kat-merge-20180517 
OS -> Ent merge
 2018-05-21 09:48:39 +01:00
Viktor Kolomeyko
9ec7e7f4c8
ENT-1396: First stub on Node HA testing facility. (#856) 
* ENT-1396: Skeleton of HA testing project

* ENT-1396: Tidy-up arguments parsing and introduce ScenarioRunner.

* ENT-1396: More changes for ScenarioRunner.

* ENT-1396: Further changes.

* ENT-1396: Further changes.

* ENT-1396: Improve logging.

* ENT-1396: Add TODO comments to indicate what is going to be done in the future.
 2018-05-21 09:36:14 +01:00
Tomas Tauber
3a9fa50799 Added the additional Corda utility code with FSM-like transition contract checking 2018-05-21 10:28:27 +02:00
Katelyn Baker
956f798a74 Fix Socks Proxy Tests 2018-05-19 12:44:03 +01:00
Stefano Franz
f381c7598b
Merge pull request #859 from roastario/fix_windows_gradle_build 
fix build issue on windows
 2018-05-19 10:41:00 +01:00
Thomas Schroeter
acefe4261c Bootstrap HA and BFT notaries 2018-05-18 18:33:49 +01:00
Stefano Franz
b2bc411321 fix build issue on windows 2018-05-18 18:08:42 +01:00
Shams Asari
eecb210a35
Clarifying the ident width in the code style guide (#3190) 2018-05-18 17:28:40 +01:00
Viktor Kolomeyko
fa090eb865
CORDA-1506: Cash selection logic fails when selection with a change from more that 2 different issuer groups (#3187) 
* Expose a flaw in cash selection logic

* Minimal test exposing the bug.

* Remaining unspent cash overwrites the cash of the first issuer, not the current issuer - the problem emerged when at least three different groups were selected, for 2 different issuers the last one in selection process was always the first remaining one.

* Addressing PR comments + more precise test name

* Addressing PR comments.
 2018-05-18 17:16:41 +01:00
Katelyn Baker
c84bb7ebe0 More Fixes to cleanup after GitHub 2018-05-18 17:03:28 +01:00
szymonsztuka
013eb33d7c
ENT-1574 Progress tracker distinguishes steps which were not processed (#3173) 
* Progress Tracker doesn't mark as "green tick" a step which hasn't been set in the flow. Steps behind the current step, which were not processed ('an optional step') are now marked distingishly as green crossed sign for shell and as minus sign for ssh.

* Finality Flow sets the current step to NOTARISING only if the actual notarization is performed.
 2018-05-18 16:39:55 +01:00
Katelyn Baker
8925ca8954 Fix GitHub's attempt at conflict resolution 2018-05-18 15:42:42 +01:00
szymonsztuka
d33f31614c
Test doorman with selected dbs only for ENT-1447 - setup fix. (#854) 2018-05-18 15:20:03 +01:00
Katelyn Baker
3778f029df
Merge branch 'master' into kat-merge-20180517 2018-05-18 14:42:05 +01:00
Stefano Franz
79f18abe60
Merge pull request #458 from corda/stories/ENT-1152/bootstrapper 
Standalone packaging using two-stage loader (experimental) [ENT-1152]
 2018-05-18 14:37:35 +01:00
Michal Kit
71aeb6c339
Improving revocation reason selection (#845) 
* Improving revocation reason selection

* Addressing review comments - round 2
 2018-05-18 14:29:57 +01:00
Katelyn Baker
8c9773fc13 Merge build fix - add AMQP to RPC Proxy Web 2018-05-18 14:27:38 +01:00
Chris Rankin
a38250c100
Declare serialisation default interface methods as Java8-style defaults. (#3086) 2018-05-18 12:31:01 +01:00
Patrick
f8070b0811 fix test 2018-05-18 12:02:00 +01:00
Michal Kit
da6957e6d1
Fixes for the CRL feature after the first round of testing (#837) 
* Fixes for the CRL feature after the first round of testing

* Addressing review comments

* Synchronising changes with OS

* Addressing review comments - round 2
 2018-05-18 11:17:43 +01:00
Katelyn Baker
4ed3d779b0 merge build fix 2018-05-18 11:16:45 +01:00
Viktor Kolomeyko
215e54f1ab
ENT-1902: If we are already in the JavaFX thread - perform direct invocation without postponing it. (#3177) 
Or else if we are operating in JavaFX thread the sequence of invocations will change.
 2018-05-18 11:09:02 +01:00
Stanly Johnson
ae5bacb4b4 Network bootstrapper check for duplicate node names (#3182) 2018-05-18 10:31:24 +01:00
Katelyn Baker
71c2566cb5 API - Update current api baseline from open/master 2018-05-18 10:10:53 +01:00
Katelyn Baker
1cfc9c6e0c Post merge cleanup for Max Mem Size 2018-05-18 09:54:56 +01:00
Katelyn Baker
d91f063cbe Define Custom NetMan AMQP Scheme 
Removes dependency on node and AMQPServerSerializationscheme
 2018-05-17 21:19:05 +01:00
Andrius Dagys
1c575b5364
Tool for prototyping and load testing notary implementations (#823) 2018-05-17 20:02:19 +01:00
Andrius Dagys
24b43117dc Increase the number of log files retained per day 
Currently the node will keep up to 10 compressed log files during rollover, and discard old ones. This limit seems too low for production use and might lead to valuable log data loss.
 2018-05-17 19:55:58 +01:00
Shams Asari
824adca6c0
CORDA-1238: Updated JacksonSupport to serialise pojos annotated with @CordaSerializable with the same properties as the AMQP serialisation framework. (#3162) 
This fixes an issue for pojos with getters that aren't c'tor-based properties. Jackson serialises these out but is then unable to deserialise the pojo back.
 2018-05-17 18:34:12 +01:00
Katelyn Baker
819200ee3e Create bridge serialization scheme to remove newly added dep on node 2018-05-17 17:17:22 +01:00
Katelyn Baker
4a05828e20 OS Merge cleanup 2018-05-17 16:50:17 +01:00
Stefano Franz
07d89c79be add dependency on node jar task to get corda-node on classpath 
fix example-node.conf for current master
 2018-05-17 16:35:46 +01:00
igor nitto
7d71233a35 Rebased on master (tested manually against simm-valuation-demo) 2018-05-17 16:35:46 +01:00
IgorNitto
5ea82039d7 Some initial PR comments 2018-05-17 16:35:06 +01:00
IgorNitto
d85b17c042 fixes 2018-05-17 16:35:06 +01:00
IgorNitto
18cc1bbb0c Some Gradle refactoring 2018-05-17 16:35:06 +01:00
IgorNitto
bc3facaed9 Two-stage initialization approach for packaging 2018-05-17 16:34:24 +01:00
szymonsztuka
18393f27dd
Test doorman with selected dbs only for now (SQL Server and Azure SQL) - for ENT-1447. (#833) 
Test doorman with selected dbs (SQL Server and Azure SQL) only in integration test in database mode since not all databases are supported now.
 2018-05-17 16:27:02 +01:00