ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-12 13:45:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,957 Commits 96 Branches 407 Tags
Commit Graph

118 Commits

Author SHA1 Message Date
tudor.malene@gmail.com
2ca11d7996 Merge remote-tracking branch 'open/master' into tudor-merge-21-05-18 
# Conflicts:
#	.idea/compiler.xml
#	client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
#	client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
#	docs/source/generating-a-node.rst
#	finance/src/main/kotlin/net/corda/finance/contracts/asset/CommodityContract.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/kotlin/net/corda/node/services/config/SslOptions.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/RPCMessagingClient.kt
#	node/src/main/kotlin/net/corda/node/services/rpc/NodeLoginModule.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
 2018-05-21 13:49:59 +01:00
Tudor Malene
455221629b
CORDA-1343 Make the RPCClient ssl constructors public. Clean up broke… (#3039) 
* CORDA-1343 Make the RPCClient ssl constructors public. Clean up broker authentication logic

* CORDA-1343 small fix

* CORDA-1343 cleanup

* CORDA-1343 fixed api changes script

* CORDA-1343 fixed merge

* CORDA-1343 removed unused property

* CORDA-1343 add separate p2p and rpc node users

* CORDA-1343 remove test configuration

* CORDA-1343 fix tests

* CORDA-1343 address core review comments

* CORDA-1343 some documentation and adding createWithSsl method for a haAddressPool

* CORDA-1343 clean up the CordaRPCClient interface

* CORDA-1343 add internal shell test

* CORDA-1343 address code review comments

* CORDA-1343 split the internalShell user from the System Rpc user

* CORDA-1343 fix test

* CORDA-1343 Add warning when certificateChainCheckPolicies is being configured

* CORDA-1343 Address code review changes

* CORDA-1343 fix merge

* CORDA-1343 added test, docs, clarify comments

* CORDA-1343 clean up docs

* CORDA-1343 fix api

* CORDA-1343 fix merge

* CORDA-1343 fix merge

* CORDA-1343 fix merge

* CORDA-1343 fix merge
 2018-05-21 13:05:08 +03:00
Katelyn Baker
71c2566cb5 API - Update current api baseline from open/master 2018-05-18 10:10:53 +01:00
Katelyn Baker
74c5cffd38 Merge remote-tracking branch 'open/master' into kat-merge-20180517 2018-05-17 15:04:51 +01:00
josecoll
a797c693fb Sync api-current.txt file. 
Add missing JvmStatic annotation.
 2018-05-17 10:59:49 +01:00
Anthony Keenan
8ee9c5d5fc
CORDA-1280 Update api-current from v3.2 and use most recent version of api-scanner (#3153) 
* Update api current from v3

* Update Cordapp Context as per CORDA-556

* Update Exception base classes as per CORDA-1334: port enterprise statemachine (#2964)

* Move notary service related classes and interfaces in core to internal (#2827)

* CordaRPCClient changes from CORDA-1099: Orchestrated clean shutdown from Shell (#2831)

* [CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2892)

* CORDA-973 Refactoring for serialization compression support (#2466)

* [CORDA-941]: Add NetworkParameters contract implementation whitelist. (#2580)

* Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) (#3102)

* Existing internal exposures which need removing - see CORDA-1489

* revert to gradle plugins version of api-scanner
 2018-05-17 10:09:12 +01:00
Mike Hearn
46eda8edd9 Merge commit '3f2e653f0' into mike-merge-413f476a3 2018-05-15 19:00:05 +02:00
josecoll
3f2e653f01
Update references to point to new repo and remove other redundant references. (#3151) 2018-05-15 17:09:50 +01:00
bpaunescu
b4a402de36 Merge remote-tracking branch 'open/master' into bogdan-merge-10-05-18 2018-05-10 09:47:54 +01:00
Shams Asari
3bb95c3ed1
Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) (#3102) 
Also deprecated all the public members that shouldn't have leaked into the public API.
 2018-05-09 21:42:55 +01:00
Katelyn Baker
96ab22f1da Merge remote-tracking branch 'open/master' into kat-merge-20180508 2018-05-09 11:00:07 +01:00
Chris Rankin
dc66c961cb
Add missing @Deprecated annotations to fix API Stability check. (#3091) 2018-05-08 18:06:47 +01:00
Katelyn Baker
51d6a937f7 Revert "OS -> ENT merge - Update apicurrent with deprecated methods" 
This reverts commit 8561b05f9901f5b397c6665ed4e0636244e9fe89.
 2018-05-08 13:57:09 +01:00
Katelyn Baker
8561b05f99 OS -> ENT merge - Update apicurrent with deprecated methods 2018-05-08 13:40:38 +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
szymonsztuka
b25892e45b resolved conflicts 2018-05-01 21:32:11 +01:00
Andrius Dagys
efd203e5f3
ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly (#3004) 
* ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly.

Currently the time window is checked before states are being passed to a uniqueness provider. If the time window is
invalid, the transaction will be rejected even if it has already been notarised, which violated idempotency.

For this reason the time window verification was moved alongside state conflict checks.

* Update API - this only affects custom notary interfaces
 2018-04-27 15:02:09 +01:00
szymonsztuka
df5d45a4a6
Enable integration tests to run doorman against remote database (part of ENT-1447) (#776) 
Change integration tests in remote database mode infrastracture to allow passing parameterised dataSource configuration to doorman. Add doorman tables to SQL clearup scripts.
 2018-04-27 09:57:16 +01:00
Anthony Keenan
f5483d1deb
ENT-1577 - Remove exposure of internal classes via test api (#516) 
* Remove exposures of internal classes via testing api

* Remove deleted api from api-current

* Fix merge conflict

* Remove internal usage from api-current.txt
 2018-04-25 11:59:20 +01:00
Andras Slemmer
67f5bcc38e Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8 2018-04-24 11:01:21 +01:00
Andras Slemmer
5b4fd6fe64 Address comments 2018-04-23 15:36:16 +01:00
Andras Slemmer
19dad6da96 Add back deprecated functions 2018-04-23 15:36:16 +01:00
josecoll
15c015e0d6 Merge branch 'master' into colljos-merge-230418 2018-04-23 12:12:16 +01:00
Chris Rankin
342ecc4eed
CORDA-1265: Upgrade to Kotlin language/API 1.2 (#2871) 
* Upgrade to Kotlin language/API 1.2
* Kotlin 1.2 annotates private Companion instances as "@Deprecated".
 2018-04-20 15:03:07 +01:00
Katelyn Baker
5bb9514582 Merge remote-tracking branch 'open/master' into kat-merge-180412 2018-04-12 20:34:28 +01:00
Shams Asari
02913b284e
CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. (#2954) 
Instead the current whitelist is read in from the existing network parameters file.
 2018-04-12 17:03:06 +01:00
sollecitom
89ecfb96c5 Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11 2018-03-29 13:12:00 +01:00
Michele Sollecito
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2892) 2018-03-29 13:01:41 +01:00
Katelyn Baker
bc3605e8da Merge remote-tracking branch 'open/master' into kat-merge-28-03-18 2018-03-28 09:47:49 +01:00
Michele Sollecito
36f02ff4b4 [CORDA-1267]: Making Corda's JPA classes non-final and Serializable. (#2882) 
* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.
 2018-03-28 08:40:28 +01:00
Chris Rankin
b500371b4e Merge commit 'a4242b5805df362ac562d758f48ea11da18df89b' into chrisr3-os-merge 2018-03-19 20:22:55 +00:00
Chris Rankin
a4242b5805
CORDA-1224: Remove @JvmStatic annotations. (#2847) 2018-03-19 20:11:50 +00:00
sollecitom
8a561cddbf Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41 
# Conflicts:
#	client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
 2018-03-19 15:17:49 +00:00
Michele Sollecito
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell (#2831) 2018-03-19 14:20:10 +00:00
Andras Slemmer
bb2643cf2e Add hard restart test 
Remove default async db flush

Add in-memory P2P deduplication until we commit the ID persisting tx

Add some explaining comments

Make scheduled state kickoffs atomic with flow starts
 2018-03-16 15:43:20 +00: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
bpaunescu
0b12c5f602 Merge remote-tracking branch 'open/master' into bogdan-merge-14 2018-03-14 15:01:27 +00:00
Chris Rankin
1407f01600
Upgrade to corda-gradle-plugins 4.0.8 (#2815) 
* Add missing @DoNotImplement annotations.
* Upgrade to corda-gradle-plugins 4.0.8
 2018-03-14 12:47:38 +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
Andrius Dagys
a3bf4577f3 CORDA-696 - Ensure deterministic transaction id calculation for contra… (#2676) 
The problem with the previous implementation is that the transaction would be deserialized with the schema specified
in the serialized form, but the calculation of the id would involve re-serializing properties using a local serialization context
which might produce a different result.
 2018-03-09 14:39:31 +00:00
szymonsztuka
3733e7d715 Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792 
# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaAuthenticationPlugin.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaSSHAuthInfo.kt
#	node/src/main/kotlin/net/corda/node/shell/RPCOpsWithContext.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	settings.gradle
#	testing/test-common/src/main/kotlin/net/corda/testing/common/internal/UnsafeCertificatesFactory.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
#	tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
#	tools/shell/src/main/kotlin/net/corda/tools/shell/FlowWatchPrintingSubscriber.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShellCommand.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/utlities/ANSIProgressRenderer.kt
#	tools/shell/src/main/resources/net/corda/tools/shell/base/login.groovy
#	tools/shell/src/test/kotlin/net/corda/tools/shell/CustomTypeJsonParsingTests.kt
#	tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt
 2018-03-07 16:49:00 +00:00
Anthony Keenan
84e930d52a
[CORDA-991] - Update committed api from v3 release branch (#2734) 
* Update from v3

* Remove CordaInternal attribute as this is removed by v4 api-scanner plugin

* Make SerializationContext @DoNotImplement

* Addition of CordappConfig to contstructor of CordappContext

* Alteration of getOffset/getSize properties in ByteSequence, OpaqueBytes & OpaqueBytesSubSequence

* Make network parameters on MockServices final
 2018-03-07 16:13:16 +00:00
Chris Rankin
2cf00ea671 Merge commit 'f6825033' into chrisr3-os-merge 2018-03-06 20:15:35 +00:00
Chris Rankin
f682503396
Sort field annotations in public API and remove unnecessary @JvmField. (#2752) 2018-03-06 18:12:04 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. (#519) 2018-03-06 17:29:21 +00:00
Chris Rankin
596edcc2ae Merge commit '29ccd4d' into os-merge-050318 2018-03-05 23:21:35 +00:00
Chris Rankin
2462188b9b [CORDA-1162] Write API class/interface/method annotations in ascending order. 2018-03-05 23:03:59 +00:00