Commit Graph

79 Commits

Author SHA1 Message Date
stefano
2a165205c6 do attestation sync always 2022-03-24 09:41:35 +00:00
adam.houston
f838a969d3 Renamed EnclaveClient to CordaEnclaveClient to avoid clashing with Conclave 2022-03-22 17:24:25 +00:00
adam.houston
b36a06b588 Send current transaction encrypted 2022-03-21 16:53:12 +00:00
Stefano Franz
4efc439e7b
refactor enclave interface to provide invocationID for all calls (#7122)
Co-authored-by: stefano <stefano@DESKTOP-VCFJH4G>
2022-03-21 11:42:18 +00:00
adam.houston
95adf626f9 Updated EnclaveClient interface 2022-03-18 10:53:26 +00:00
adam.houston
95b80b37b7 Enclave tests working 2022-03-15 11:53:38 +00:00
adam.houston
a26a7fcdfe Initial merge 2022-03-14 11:54:12 +00:00
adam.houston
91c28f1872 Merge branch 'cbdc/conclave-corda-int' into cbdc/poc-encrypt-backchain-merge 2022-03-10 15:51:32 +00:00
lemjclarke
93aba9360a Add verification 2022-03-10 15:18:58 +00:00
adam.houston
525dc6022b Merge branch 'cbdc/conclave-corda-int' into cbdc/poc-encrypt-backchain-merge
# Conflicts:
#	core/src/main/kotlin/net/corda/core/transactions/EncryptedTransaction.kt
#	settings.gradle
2022-03-10 14:11:01 +00:00
lemjclarke
768d38782e Add verification 2022-03-10 08:43:53 +00:00
lemjclarke
880f7ae4ce Add dummy enclave and test 2022-03-08 17:15:43 +00:00
lemjclarke
a9eedd92fd Replace wire transaction with signed transaction 2022-03-08 17:15:04 +00:00
lemjclarke
14c38a6fce Fix build dependencies 2022-03-08 17:14:37 +00:00
lemjclarke
7822888ad7 Add encryption transaction data model 2022-03-07 15:46:07 +00:00
vanjatomic
8959cced66 Refactor and merge corda branches 2022-03-02 10:37:44 +00:00
adam.houston
684033f99a merge with origin 2022-02-25 17:35:42 +00:00
lemjclarke
b4946db9ef Add transaction verification 2022-02-25 15:27:38 +00:00
lemjclarke
633be8d631 Add transaction serialization dependencies 2022-02-25 15:13:04 +00:00
lemjclarke
166bc6b3f3 Add skeleton enclave
Note: the "repo" directory from the conclave 1.2.1 SDK must be copied into the root directory of this project manually
2022-02-25 14:26:17 +00:00
adam.houston
455b191974 Example of encrypted backchain - WIP for investigation purposes 2022-02-25 14:26:17 +00:00
Waldemar Zurowski
34f59b6a83 NOTICK: Changes for GA release of Corda OS 4.8.5 2022-02-25 14:26:13 +00:00
Waldemar Zurowski
d890e9df29 Updates for 4.8.4 version 2022-02-25 14:24:17 +00:00
Ritu Gupta
36d6c9dd8b NOTICK: Bump version to CE4.8.3 for GA 2022-02-25 14:24:16 +00:00
Ritu Gupta
43b997f74d NOTICK: Bump version to 4.8.3-RC01 2022-02-25 14:24:13 +00:00
adam.houston
16a4c92677 Store verification signatures - TODO: store as TransactionSignature 2022-02-24 17:17:13 +00:00
nargas-ritu
f4a022ddce NOTICK: New branch for Corda OS 4.9 2022-01-04 12:33:03 +00:00
Ramzi El-Yafi
ec92801904
Port of notary query API from ENT (#6837) 2020-12-18 09:59:12 +00:00
nargas-ritu
5a13e48ea8 NOTICK: Changes done for creating new branch for 4.8 2020-11-23 14:37:14 +00:00
Ramzi El-Yafi
e2efbaea35
AG-341 Notary backpressure mechanism improvements (#6762)
Notary backpressure mechanism improvements
2020-10-08 09:12:45 +01:00
Christian Sailer
4b84182ab0
NOTICK Make the projects under common not depend on anything Corda. (#6675) 2020-09-03 10:45:35 +01:00
Ross Nicoll
b3a98763ea
CORDA-3944 Clean up ExceptionsErrorCodeFunctionsTest (#6568)
* Increase timeout to provide more of an error margin, after seeing a test failure in Jenkins.
* Move shared strings to constants.
* Extract chain building code into recursive function.
2020-08-05 08:56:41 +01:00
Ryan Fowler
2ca10464b7
CORDA-3845: Update BC, log4j, slf4j (#6464)
* CORDA-3845: Update BC to 1.64

* CORDA-3845: Upgraded log4j to 2.13.3

* We can remove the use of Manifests from the logging package so that when _it_ logs it doesn't error on the fact the stream was already closed by the default Java logger.

* Some more tidy up

* Remove the logging package as a plugin

* latest BC version

* Remove old test

* fix up

* Fix some rebased changes to log file handling

* Fix some rebased changes to log file handling

* Update slf4j too

Co-authored-by: Adel El-Beik <adel.el-beik@r3.com>
2020-07-23 16:37:29 +01:00
LankyDan
e8b17ff7b9 Merge branch 'release/os/4.5' into dan/os-4.5-to-4.6-merge-2020-06-18
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
2020-06-18 15:50:46 +01:00
James Higgs
24b0240d82
EG-2654 - Ensure stack traces are printed to the logs in error reporting (#6345)
* EG-2654 Ensure stack trace is printed to the logs in error reporting

* EG-2654 - Add a test case for exception logging
2020-06-17 14:32:12 +01:00
Schife
c47c586955 Merge branches 'release/os/4.5' and 'release/os/4.6' of https://github.com/corda/corda into raz/os45to46
 Conflicts:
	Jenkinsfile
2020-06-12 17:28:40 +01:00
James Higgs
2c253d806d
EG-2684 Ensure original message is logged with old-style error codes (#6340)
* [EG-2684] Ensure original message is logged with old-style error codes

* [EG-2684] Address detekt issues
2020-06-12 16:52:01 +01:00
Schife
fb184839f4 Merge branch 'release/os/4.5' of https://github.com/corda/corda into razvan-os-4.5-to-4.6-merge 2020-06-05 07:55:48 +01:00
James Higgs
ac9f6fca16
[EG-2148] Small tweak to an error message (#6263) 2020-06-02 13:52:34 +01:00
Rick Parker
9f2bd1dcae
Merge pull request #6295 from corda/feature/checkpoint_table_improvements
CORDA-3432 Feature/checkpoint table improvements
2020-06-01 11:31:13 +01:00
nikinagy
301fc9f928 Merge branch 'release/os/4.5' into nnagy-os-4.5-os-4.6-20200520 2020-05-20 10:38:45 +01:00
williamvigorr3
eb52de1b40
CORDA-3490 Add option to start node without starting checkpointed flows (#6136)
Added command-line option: `--pause-all-flows` to the Node to control this.
This mode causes all checkpoints to be set to status PAUSED when the
state machine starts up (in StartMode.Safe mode). 

Changed the state machine so that PAUSED checkpoints are loaded into
memory (the checkpoint is deserialised but the flow state is left serialised)
but not started.

Messages from peers are queued whilst the flow is paused and processed
once the flow is resumed.
2020-05-19 16:27:41 +01:00
James Higgs
fc2bb2ed4e
EG-2116 - Add aliases for version attribute errors (#6260) 2020-05-19 11:53:29 +01:00
Adel El-Beik
b9b0ca58e3 Merge remote-tracking branch 'origin/release/os/4.5' into adel/merge-from-4.5 2020-05-15 10:23:17 +01:00
James Higgs
06467d04b1
EG-1980 - Remove stale docs links from OS (#6251)
Remove hardcoded docs references, push docs link to gradle
2020-05-14 12:57:59 +01:00
nikinagy
52e3030d60 Merge branch 'release/os/4.5' into nnagy-os-4.5-os-4.6-20200512 2020-05-12 10:26:43 +01:00
James Higgs
ddc49babed
EG-441 - Update properties files after docs review (#6223)
* Update properties files after docs review
* Cosmetic changes to properties files
2020-05-11 16:10:38 +01:00
nargas-ritu
ba69ab6842 Bump OS release version 4.6 2020-05-04 12:07:27 +01:00
James Higgs
1956bdb5d4 [MERGE] Fix detekt issues 2020-04-29 11:57:37 +01:00
James Higgs
adbe030a2c Merge branch 'release/os/4.5' into jamesh/error-reporting-sync-29-04-20
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2020-04-29 11:47:14 +01:00