112 Commits

Author	SHA1	Message	Date
Shams Asari	11e2bef240	ENT-2473: Removed copyright headers (#1364)	2018-09-03 16:38:52 +01:00
Christian Sailer	43f7b8477e	Merge commit 'bc330bd9890d41904bbeea6e579f5fc4438872b6' into christians/merge-ENT-2414	2018-08-28 12:26:57 +01:00
Clinton	3594ccd89b	CORDA-1924: Remove references to Cordform definition and cordform-common (#3842)	2018-08-24 16:29:14 +01:00
szymonsztuka	a63c9526ca	Merge OS	2018-08-01 14:13:39 +01:00
szymonsztuka	c23167f08e	ENT-2188 fix H2 insecure default configuration (#3692) ... Set the "h2.allowedClasses" system property, require database password when exposing H2 server on non-localhost address, samples start H2 server by default (reintroduces the behaviour before h2Settings.address configuration option was added)	2018-08-01 11:50:42 +01:00
Katelyn Baker	bb7d33380f	Merge remote-tracking branch 'open/master' into kat-merge-27072018 ... Conflicts: core/src/main/kotlin/net/corda/core/internal/notary/NotaryServiceFlow.kt core/src/main/kotlin/net/corda/core/internal/notary/TrustedAuthorityNotaryService.kt docs/source/blob-inspector.rst docs/source/release-notes.rst docs/source/upgrade-notes.rst node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt	2018-07-27 16:09:26 +01:00
Roger Willis	8207ac3222	CORDA-1332 Reference input states (#3525) ... * * First commit for reference input states feature. * Added docs. * Added additional test. * Fixed whitespace. * Rebased to master. * Updated Raft and persistent notary implementations. * Updated changelog. * Updated topo sort to handle reference states. * Stubbed out with referenced states flow. * Added WithReferencedStatesFlow. * Added Tests for WithReferencedStatesFlow. * Added ReferenceState type. * Rebased to latest version of master. * Added better comments. * Updated unit test. * Added comment to explain a little hack. * Fixed broken contract upgrade RPC test. * Added minimum platform version check. * Updated mock network so that notary nodes inherit the platform version set by the network's minimum platform version. * References states can now only be used when minimum platform version >= 4. * Created a new file to hold async operations as "WaitForStatesToUpdate" is broadly reusable. * Refactored WithReferenceStatesFlow * Updated javadoc for WaitForStatesToUpdate aysnc operation. * Added network parameters property to InternalMockNetwork. * Added min platform version capability to mock services. * Removed erroneous chars from file. * Made async operation internal and now call it from FlowLogic. * Moved some transaction checking code around. * Removed serializable annotation from referenced state and ref. * Added reference states design doc. * Added missing KDocs. * Updated with reference states flow to handle consecutive update races. * Made platform version info an inheritable thread local. * Fixed various typos. * Updated docs. * Fixed race. * Removed min platform version checks as API needs more thought. * Added deprecation to method and supressed warnings. * Renamed WaitForStatesToUpdate to WaitForStateConsumption. * Fixed race in WaitForStateConsumption. * Addressed PR comments and updated comments / KDocs. * Reverse vault bugfixes. * * Vault bug fixes. * * Fixed broken test. * Moved WaitForStateConsumption to internal package.	2018-07-25 14:06:56 +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
Thomas Schroeter	acefe4261c	Bootstrap HA and BFT notaries	2018-05-18 18:33:49 +01:00
Thomas Schroeter	23a0a66128	Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd	2018-05-16 15:30:46 +01:00
Thomas Schroeter	3d50e73271	Add configuration notary.serviceLegalName for clustered notaries	2018-05-16 15:19:14 +01:00
sollecitom	9a69a36904	Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21 ... # Conflicts: # .idea/compiler.xml # constants.properties # experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt # experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt # experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt # node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt # node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt # node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt # node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt # node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt # node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt # node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt # samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt # samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt # samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt # testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt # webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt	2018-05-14 15:56:43 +01:00
Michele Sollecito	d027b5b8f2	[CORDA-1472]: Crackdown on warnings. (#3136)	2018-05-14 21:15:52 +07:00
Tudor Malene	543491c7df	CORDA-1461 improve devMode (#3100) ... * CORDA-1461 improve devMode * CORDA-1461 set devMode=true for driver * CORDA-1461 fix tests and improve UI * CORDA-1461 Address code review changes * CORDA-1461 Missing developer emoji * CORDA-1461 use latest cordform that sets devMode=true * CORDA-1461 fix test and add driver overrides for notary * CORDA-1461 fix tests, fix api-scanner version * CORDA-1461 fix api * CORDA-1461 formatting * CORDA-1461 comment style	2018-05-11 17:48:02 +01:00
Andrius Dagys	855f89b61e	Merge remote-tracking branch 'open/master' into andrius/os-merge	2018-05-03 13:37:39 +01:00
Andrius Dagys	3bf1e803d9	Move notary service related classes and interfaces in core to interna… (#2827) ... * Move notary service related classes and interfaces in core to internal, since we won't be able to stabilise the APIs for writing custom notary services any time soon (the docs already mention it). I left out the wire protocol related classes so we don't accidentally break it.	2018-05-02 12:21:38 +01:00
Chris Rankin	e135cf062c	Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge	2018-04-24 18:09:41 +01:00
Chris Rankin	8e507d0b88	CORDA-1263: Replace deprecated kotlin-stdlib-jre8 with kotlin-stdlib-jdk8. (#2992)	2018-04-24 14:03:41 +01:00
Andrius Dagys	0d1e9694ae	Merge remote-tracking branch 'open/master' into andrius-merge-1503	2018-03-15 15:07:55 +00:00
Andrius Dagys	e31d2b0cad	CORDA-1208: Notary service should persist the notarisation request si… (#2823) ... * CORDA-1208: Notary service should persist the notarisation request signature along with the committed input states. This required modifying the uniqueness provider interface to accept the signature in addition to input states. Until now the committed state log used to be stored as a map of (state reference -> (tranasction id, consuming party)). Adding the serialized signature would mean inflating each state entry by around 700 bytes, which would be grossly inefficient. Instead, two tables are now used: one for storing (state referece -> transaction id) map, and another for storing the notarisation request details (transaction id, consuming party, date, signature). * Update api - all of these changes are only related to custom notaries	2018-03-15 13:29:42 +00:00
Andrius Dagys	98ba212e00	Merge remote-tracking branch 'open/master' into andrius-merge-03-09	2018-03-09 16:09:59 +00:00
Andrius Dagys	2d31247da2	CORDA-1171: When a double-spend occurs, do not send the consuming transaction id and requesting party back to the client - this might lead to privacy leak. Only the transaction id hash is now returned.	2018-03-09 16:00:52 +00:00
Michele Sollecito	da1afd9c55	Introduced copyright in all source files. (#519)	2018-03-06 17:29:21 +00:00
Andrius Dagys	cc8e38922e	Merge remote-tracking branch 'open/master' into andrius-merge-02-26	2018-02-26 11:55:17 +00:00
Andrius Dagys	0edfef2409	CORDA-696 - Create separate transaction types for contract upgrade transactions (#2589) ... * CORDA-986 and CORDA-985 CompositeKey and Signature verification performance fixes (#2467) * CORDA-696: Create separate transaction types for contract upgrade transactions. Add rationale around upgrade transactions Move contract upgrade transaction resolution logic into internal until it's stabilised. Throw a better exception when contract attachment not found Default legacy contract constraint to always accepting - needs to be changed to whitelist constraint before merging Introduce a new upgraded contract interface that allows specifying the legacy constraint. Remove StateLoader, make all tx resolution functions take in ServicesForResolution Contract upgrade transactions can handle whitelist by zone constraints When creating a contract upgrade transaction, make sure the attachment of the old cordapp gets attached when using hash constraints. Attachment lookup for a given contract class name only scans currently loaded cordapps, and we don't load old versions of cordapps. CORDA-696: Update upgrade docs	2018-02-26 11:29:25 +00:00
Andras Slemmer	25263c20c7	Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb	2018-02-20 15:52:09 +00:00
Andrius Dagys	5b93abdc57	CORDA-1010: Send a request signature in addition to a transaction to the notary (#2527) ... CORDA-1010: Notary flow - clients now send a signature over a notarisation request in addition to the transaction. This will be logged by the notary to be able to prove that a particular party has requested the consumption of a particular state.	2018-02-16 16:14:06 +00:00
Clinton	174ed3c64b	CORDA-556: Added Cordapp Config and a sample (#2469) ... * Added per-cordapp configuration * Added new API for Cordformation cordapp declarations to support per-cordapp configuration * Added a cordapp configuration sample	2018-02-14 14:49:59 +00:00
Matthew Nesbit	054c44d4bc	Merge from OS to ENT including Bridge manager work	2018-01-26 16:55:43 +00:00
Shams Asari	336aeb96e5	Merge fixes	2018-01-26 13:45:03 +00:00
Andrius Dagys	e357a88181	Deprecate TimeWindowChecker, make TimeWindowInvalid report exact current time and transaction time window (#2280) ... * Make notary service return the current time and the transaction time window along with the TimeWindowInvalid error. Deprecate TimeWindowChecker. Add a static method for validating transaction time window to reduce code duplication.	2018-01-26 09:32:11 +00:00
Shams Asari	4b86362391	Merge remote-tracking branch 'open/master' into shams-os-merge-250118 ... # Conflicts: # client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt # client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt # core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java # docs/source/changelog.rst # docs/source/corda-configuration-file.rst # docs/source/upgrade-notes.rst # finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt # finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt # gradle/wrapper/gradle-wrapper.properties # node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt # node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt # node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt # node/src/integration-test/kotlin/net/corda/node/BootTests.kt # node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt # node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt # node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt # node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt # node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt # node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt # node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt # node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt # node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt # node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt # node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt # node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt # node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # node/src/main/resources/reference.conf # node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java # node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt # node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt # node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt # node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt # samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt # samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt # samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt # samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt # testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt # testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt # testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt # tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt # verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt # webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt	2018-01-25 17:51:13 +00:00
Michele Sollecito	9783f11ba8	Exposed RPC SSL settings through Cordformation (#2419)	2018-01-25 14:32:58 +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
josecoll	eb9a51af75	Merge branch 'master' into colljos-merge-release3-dp-master	2018-01-16 14:28:07 +00:00
Anthony Keenan	1367cd4adb	CORDA-912 Stop exposing internal node user, create user in testing infrastructu… (#2361) ... * Stop exposing internal node user, create user in testing infrastructure instead * Update kdocs	2018-01-15 19:30:33 +00:00
Andrius Dagys	fb1d3087de	Raft notaries can share a single key pair for the service identity (in contrast to a shared composite public key, and individual signing key pairs). This allows adjusting the cluster size on the fly.	2018-01-13 16:36:41 +00:00
josecoll	729aa65e7f	Merge from R3 Corda 3.0 Dev Preview release branch to master	2018-01-13 11:00:01 +00:00
Andrius Dagys	63e1bdaa94	Revert "Raft notaries can share a single key pair for the service identity (i… (#2269)" ... This reverts commit 3e00676851a86dd1adaebec5ad8b8784035b58d6.	2018-01-09 12:20:25 +00:00
Andrius Dagys	3e00676851	Raft notaries can share a single key pair for the service identity (i… (#2269) ... * Raft notaries can share a single key pair for the service identity (in contrast to a shared composite public key, and individual signing key pairs). This allows adjusting the cluster size on the fly.	2018-01-09 08:17:59 +00:00
Shams Asari	4a2f157118	Validating the entire cert path in node registration, rather just checking the root cert. (#2298) ... Also reduced duplicate code when creating the node CA cert path for testing, and renamed IdentityGenerator to DevIdentityGenerator.	2017-12-29 14:38:30 +00:00
Shams Asari	39d25958e2	Fixed identity generation of single node notaries as used by the driver and MockNetwork. (#2296) ... The identity cert generated used to be of type SERVICE_IDENTITY when it should have been a LEGAL_IDENTITY.	2017-12-28 15:32:09 +00:00
Shams Asari	e1e715ee81	Removed all remaining special treatment of the X500 common name. ... With network parameters the CN is no longer needed to identify notaries. This frees it up to be used in the node's name alongside the other attributes. Also, the identity generation logic has been simplified, removing the need to have magic string values for storing distributed identities in the keystore. Now there are just two alias prefixes: "identity" as it was previously, and "distributed-notary".	2017-12-18 21:39:11 +00:00
Katelyn Baker	8dfe377ae1	Corda-862 - Fix notary demo for AMQP	2017-12-15 10:13:18 +00:00
Andrzej Cichocki	c3b9955344	CORDA-716 Fix split packages in testing (#2232)	2017-12-12 19:37:01 +00:00
Andrzej Cichocki	905c8252a6	CORDA-654 Remaining key constants (#2226)	2017-12-12 18:03:06 +00:00
Shams Asari	6a1aa59e3e	Merge branch 'master' into shams-merge-master-041217 ... # Conflicts: # node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt # samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/BankOfCordaCordform.kt # testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/NotarySpec.kt # verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt	2017-12-04 13:39:32 +00:00
Shams Asari	5264072752	Renamed n.c.nodeapi.config to n.c.nodeapi.internal.config as that config code is not public API. For the same reason, also moved User into the same internal package.	2017-12-03 17:20:30 +00:00
Katarzyna Streich	6958cbbc44	Fix demobench as part of network parameters work (#2148) ... * Fix demobench - network parameters Demobench uses ServiceIdentityGenerator to pregenerate notary identity for network parameters.	2017-12-01 16:14:03 +00:00
Shams Asari	2f0bc249ad	Merge fixes and getting tests to pass	2017-11-30 11:59:39 +00:00