Commit Graph

9475 Commits

Author SHA1 Message Date
adam.houston
ac36d48f77 Fix build issue by removing DeleteForDJVM from SgxSupport 2022-03-14 12:20:27 +00:00
adam.houston
d532aa0e06 Remove Conclave Dependency 2022-03-14 11:57:14 +00:00
adam.houston
a26a7fcdfe Initial merge 2022-03-14 11:54:12 +00:00
adam.houston
f4b20fe699 Encrypted transactions now stored in their own table 2022-03-11 10:26:52 +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
adam.houston
001f00ef6d Merge branch 'cbdc/conclave-corda-int' of github.com:corda/corda into cbdc/conclave-corda-int 2022-03-10 15:50:33 +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
adam.houston
581bb692d8 Merge branch 'cbdc/conclave-corda-int' of github.com:corda/corda into cbdc/conclave-corda-int 2022-03-10 14:06:48 +00:00
lemjclarke
768d38782e Add verification 2022-03-10 08:43:53 +00:00
adam.houston
bdb9b2c590 Merge branch 'cbdc/conclave-corda-int' into cbdc/poc-encrypt-backchain-merge 2022-03-09 10:43:00 +00:00
pclaura
12f512057f Vanja's fix for Kotlin reflection in GraalVM 2022-03-08 17:21:24 +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
pclaura
03215baa39 Vanja's fix for Kotlin reflection in GraalVM 2022-03-08 16:14:24 +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
vanjatomic
5815713668 Merge remote-tracking branch 'origin/cbdc/conclave-corda-int' into cbdc/poc-encrypt-backchain 2022-03-01 11:18:25 +00:00
adam.houston
684033f99a merge with origin 2022-02-25 17:35:42 +00:00
adam.houston
9e46423465 Collect Signatures now works with encryption 2022-02-25 16:59:57 +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
05fab1dabd Improve test output 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
Will Hester
ce296de946 Upgrading log4j version to latest patch of zero day exploit (#6983) 2022-02-25 14:25:05 +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
pclaura
8fa7efd867 Serialization changes required for Conclave integration 2022-02-24 10:59:58 +00:00
adam.houston
7c45e74689 Improve test output 2022-02-23 09:28:51 +00:00
vanjatomic
046c441cbe Required changes for running tx.verify in conclave 2022-02-21 09:31:24 +00:00
adam.houston
d21cefc4bf Merge cbdc/conclave-corda-int (also includes Corda 4.9 commits) 2022-02-18 16:35:34 +00:00
adam.houston
a165c69d3a Example of encrypted backchain - WIP for investigation purposes 2022-02-18 16:24:37 +00:00
vanjatomic
d30b354b19 Corda serialization changes required for conclave integration 2022-02-11 14:13:08 +00:00
Ronan Browne
0b8c46e1b2
ENT-6495: bump java base version (#7056)
* ENT-6609: update base version in line with supported java versions

* NOTICK: update java version
2022-02-08 16:22:02 +00:00
Adel El-Beik
76366398fe
ENT-6584: Move sending of events to finally block. This makes sure it… (#4383) (#7057)
* ENT-6584: Move sending of events to finally block. This makes sure it gets executed in event of an exception.
2022-02-08 10:32:12 +00:00
Ramzi El-Yafi
30786fb681
CORDA-4195 Fix attachment demo notarisation (#7050) 2022-01-31 10:23:14 +00:00
Chris Rankin
758a69f904
Validate LedgerTransaction deserialised from AttachmentsClassLoader. (#7049) (#7052) 2022-01-31 09:40:01 +00:00
Adel El-Beik
7752fc8c9d
CORDA-4189: Removed existing vendor test (#7048) 2022-01-27 13:49:08 +00:00
Ronan Browne
ce211000cd
ENT-6426: update docker tagging (#7047)
* ENT-6426: update docker tahhing inline with our policies

old
corda/corda-zulu-java1.8-4.8.5:latest

new
corda/corda:4.8.5-zulu-1.8

based on pattern
{repo}:{version}-{base-Image}

* ENT-6426: update docker tahhing inline with our policies

old
corda/corda-zulu-java1.8-4.8.5:latest

new
corda/corda:4.8.5-zulu-openjdk8

based on pattern
{repo}:{version}-{base-Image}

Remove some redundant code

* ENT-6426 update corda repo tagging

* ENT-6426 update corda repo tagging

* ENt-6426 update corda tagging in line with feedback
2022-01-26 13:32:18 +00:00
Adel El-Beik
9444c9b637
ENT-6567: Bump platform version to 11 (#7043)
* ENT-6567: Bump platform version to 11

* ENT-6567: Bump platform version to 11
2022-01-26 11:37:22 +00:00
Adel El-Beik
b93ce6ed59
ENT-6550: Updated quasar version. (#7045) 2022-01-26 11:34:10 +00:00
Adel El-Beik
fb624a2b06
CORDA-4189: Now compare against Corda Community Edition as well. (#7046)
* CORDA-4189: Now compare against Corda Community Edition as well.

* CORDA-4189: Removed unused imports.
2022-01-26 11:33:23 +00:00
Kyriakos Tharrouniatis
a02f2e9f6a
ENT-6414 reattachFlowWithClientId throws NullPointerException if user specifies non-existent client ID (#7044) 2022-01-25 14:42:45 +00:00
Ramzi El-Yafi
e40cd22c4f
Merge pull request #7042 from corda/ramzi/os-48-49-merge
NOTICK Merge OS 4.8 -> OS 4.9 21/01/22
2022-01-24 09:51:27 +00:00
LWogan
f0b7d0a2c8 Merge remote-tracking branch 'origin/release/os/4.9' into ramzi/os-48-49-merge 2022-01-21 15:15:21 +00:00