diff --git a/.gradle/7.4.2/executionHistory/executionHistory.bin b/.gradle/7.4.2/executionHistory/executionHistory.bin index a681172..1a3a859 100644 Binary files a/.gradle/7.4.2/executionHistory/executionHistory.bin and b/.gradle/7.4.2/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.4.2/executionHistory/executionHistory.lock b/.gradle/7.4.2/executionHistory/executionHistory.lock index c0f5d6c..712e0d5 100644 Binary files a/.gradle/7.4.2/executionHistory/executionHistory.lock and b/.gradle/7.4.2/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4.2/fileHashes/fileHashes.bin b/.gradle/7.4.2/fileHashes/fileHashes.bin index 10a530a..8849103 100644 Binary files a/.gradle/7.4.2/fileHashes/fileHashes.bin and b/.gradle/7.4.2/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.4.2/fileHashes/fileHashes.lock b/.gradle/7.4.2/fileHashes/fileHashes.lock index 8701e25..aa0e2ac 100644 Binary files a/.gradle/7.4.2/fileHashes/fileHashes.lock and b/.gradle/7.4.2/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.4.2/fileHashes/resourceHashesCache.bin b/.gradle/7.4.2/fileHashes/resourceHashesCache.bin index 4ce1e87..aa2172a 100644 Binary files a/.gradle/7.4.2/fileHashes/resourceHashesCache.bin and b/.gradle/7.4.2/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f3d4f39..4041eb9 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index d8532c6..c665490 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e79c5f..5821b2f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/buildSrc/.gradle/7.4.2/executionHistory/executionHistory.lock b/buildSrc/.gradle/7.4.2/executionHistory/executionHistory.lock index dd314f7..4d54796 100644 Binary files a/buildSrc/.gradle/7.4.2/executionHistory/executionHistory.lock and b/buildSrc/.gradle/7.4.2/executionHistory/executionHistory.lock differ diff --git a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1834e45..5d66297 100644 Binary files a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/buildSrc/.gradle/file-system.probe b/buildSrc/.gradle/file-system.probe index 713724a..42de6ed 100644 Binary files a/buildSrc/.gradle/file-system.probe and b/buildSrc/.gradle/file-system.probe differ diff --git a/contracts/build/classes/java/main/com/r3/developers/csdetemplate/utxoexample/states/ChatState.class b/contracts/build/classes/java/main/com/r3/developers/csdetemplate/utxoexample/states/ChatState.class index 8799caa..7d9139f 100644 Binary files a/contracts/build/classes/java/main/com/r3/developers/csdetemplate/utxoexample/states/ChatState.class and b/contracts/build/classes/java/main/com/r3/developers/csdetemplate/utxoexample/states/ChatState.class differ diff --git a/contracts/build/libs/contracts-1.0-SNAPSHOT-package.cpb b/contracts/build/libs/contracts-1.0-SNAPSHOT-package.cpb index 0423ad7..14d5439 100644 Binary files a/contracts/build/libs/contracts-1.0-SNAPSHOT-package.cpb and b/contracts/build/libs/contracts-1.0-SNAPSHOT-package.cpb differ diff --git a/contracts/build/libs/contracts-1.0-SNAPSHOT.jar b/contracts/build/libs/contracts-1.0-SNAPSHOT.jar index 4e733b2..498f6ac 100644 Binary files a/contracts/build/libs/contracts-1.0-SNAPSHOT.jar and b/contracts/build/libs/contracts-1.0-SNAPSHOT.jar differ diff --git a/contracts/build/tmp/compileJava/previous-compilation-data.bin b/contracts/build/tmp/compileJava/previous-compilation-data.bin index 35298d4..6eb34e0 100644 Binary files a/contracts/build/tmp/compileJava/previous-compilation-data.bin and b/contracts/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/contracts/build/tmp/jar/bnd11098783830778304429.bnd b/contracts/build/tmp/jar/bnd11098783830778304429.bnd new file mode 100644 index 0000000..5ea5eda --- /dev/null +++ b/contracts/build/tmp/jar/bnd11098783830778304429.bnd @@ -0,0 +1,34 @@ +Cordapp-Contract-Name=ContractsModuleNameHere +Corda-CPK-Cordapp-Licence=Unknown +Bundle-License=Unknown +Sealed=true +Corda-CPK-Format=2.0 +Cordapp-Contract-Licence=Unknown +Cordapp-Contract-Version=1 +Bundle-Name=ContractsModuleNameHere +Bundle-Vendor=VendorNameHere +Min-Platform-Version=999 +Target-Platform-Version=999 +Bundle-SymbolicName=com.r3.developers.csdetemplate.contracts +Cordapp-Contract-Vendor=VendorNameHere +Corda-CPK-Cordapp-Vendor=VendorNameHere +Corda-CPK-Cordapp-Name=com.r3.developers.csdetemplate.contracts +Corda-CheckpointCustomSerializer-Classes=${classes;IMPLEMENTS;net.corda.v5.serialization.CheckpointCustomSerializer;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-JsonSerializer-Classes=${classes;IMPLEMENTS;net.corda.v5.application.marshalling.json.JsonSerializer;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-JsonDeserializer-Classes=${classes;IMPLEMENTS;net.corda.v5.application.marshalling.json.JsonDeserializer;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-Token-Observer-Classes=${classes;IMPLEMENTS;net.corda.v5.ledger.utxo.observer.UtxoLedgerTokenStateObserver;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-CPK-Cordapp-Version=${Bundle-Version} +Corda-Flow-Classes=${classes;IMPLEMENTS;net.corda.v5.application.flows.Flow;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-SerializationCustomSerializer-Classes=${classes;IMPLEMENTS;net.corda.v5.serialization.SerializationCustomSerializer;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-RPCStartableFlow-Classes=${classes;IMPLEMENTS;net.corda.v5.application.flows.RPCStartableFlow;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-NotaryPluginProvider-Classes=${classes;IMPLEMENTS;net.corda.v5.ledger.notary.plugin.api.PluggableNotaryClientFlowProvider;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Import-Package=org.hibernate.annotations;resolution\:\=dynamic;version\=\!,org.hibernate.proxy;resolution\:\=dynamic;version\=\!,net.corda.v5.*\:o;version\='${range;[\=,+);${@}}',* +Corda-Subflow-Classes=${classes;IMPLEMENTS;net.corda.v5.application.flows.Subflow;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-DigestAlgorithmFactory-Classes=${classes;IMPLEMENTS;net.corda.v5.crypto.extensions.DigestAlgorithmFactory;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-Entity-Classes=${classes;ANNOTATED;javax.persistence.Entity;ANNOTATED;net.corda.v5.base.annotations.CordaSerializable;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-StateAndRefPostProcessor-Classes=${classes;IMPLEMENTS;net.corda.v5.ledger.services.vault.StateAndRefPostProcessor;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +-noextraheaders=true +Corda-CustomQueryPostProcessor-Classes=${classes;IMPLEMENTS;net.corda.v5.application.persistence.query.CustomQueryPostProcessor;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-InitiatedFlow-Classes=${classes;IMPLEMENTS;net.corda.v5.application.flows.ResponderFlow;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +-exportcontents=com.r3.developers.csdetemplate.utxoexample.contracts,com.r3.developers.csdetemplate.utxoexample.states +Corda-Contract-Classes=${classes;IMPLEMENTS;net.corda.v5.ledger.contracts.Contract;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} diff --git a/contracts/build/tmp/jar/contracts-1.0-SNAPSHOT.jar b/contracts/build/tmp/jar/contracts-1.0-SNAPSHOT.jar index faa40c1..a5dcc8a 100644 Binary files a/contracts/build/tmp/jar/contracts-1.0-SNAPSHOT.jar and b/contracts/build/tmp/jar/contracts-1.0-SNAPSHOT.jar differ diff --git a/contracts/src/main/java/com/r3/developers/csdetemplate/utxoexample/states/ChatState.java b/contracts/src/main/java/com/r3/developers/csdetemplate/utxoexample/states/ChatState.java index ce7c639..64af258 100644 --- a/contracts/src/main/java/com/r3/developers/csdetemplate/utxoexample/states/ChatState.java +++ b/contracts/src/main/java/com/r3/developers/csdetemplate/utxoexample/states/ChatState.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; import java.security.PublicKey; import java.util.*; -@CordaSerializable +//@CordaSerializable @BelongsToContract(ChatContract.class) public class ChatState implements ContractState { @@ -21,8 +21,8 @@ public class ChatState implements ContractState { private String message; public List participants; - public ChatState() { // todo why do we need this? - } +// public ChatState() { // todo why do we need this? +// } // Allows serialisation and to use a specified UUID. @ConstructorForDeserialization @@ -53,59 +53,35 @@ public class ChatState implements ContractState { public UUID getId() { return id; } - -// public void setId(UUID id) { -// this.id = id; -// } - public String getChatName() { return chatName; } - -// public void setChatName(String chatName) { -// this.chatName = chatName; -// } - public MemberX500Name getMessageFrom() { return messageFrom; } - -// public void setMessageFrom(MemberX500Name messageFrom) { -// this.messageFrom = messageFrom; -// } - public String getMessage() { return message; } - -// public void setMessage(String message) { -// this.message = message; -// } - - @NotNull - @Override +// @NotNull +// @Override public List getParticipants() { return participants; } -// public void setParticipants(List participants) { -// this.participants = participants; -// } - public ChatState updateMessage(MemberX500Name name, String message) { return new ChatState(id, chatName, name, message, participants); } - - // todo: why is this overridden - @Override - public String toString() { - return ChatState.class.getName() + - "(id=" + id + - ", chatName=" + chatName + - ", messageFrom=" + messageFrom + - ", message=" + message + - ", participants=" + participants + - ")"; - } +// +// // todo: why is this overridden +// @Override +// public String toString() { +// return ChatState.class.getName() + +// "(id=" + id + +// ", chatName=" + chatName + +// ", messageFrom=" + messageFrom + +// ", message=" + message + +// ", participants=" + participants + +// ")"; +// } } \ No newline at end of file diff --git a/workflows/build/libs/workflows-1.0-SNAPSHOT-package.cpb b/workflows/build/libs/workflows-1.0-SNAPSHOT-package.cpb index 96229a0..1ad5385 100644 Binary files a/workflows/build/libs/workflows-1.0-SNAPSHOT-package.cpb and b/workflows/build/libs/workflows-1.0-SNAPSHOT-package.cpb differ diff --git a/workflows/build/libs/workflows-1.0-SNAPSHOT.jar b/workflows/build/libs/workflows-1.0-SNAPSHOT.jar index 32197fa..b33ce2a 100644 Binary files a/workflows/build/libs/workflows-1.0-SNAPSHOT.jar and b/workflows/build/libs/workflows-1.0-SNAPSHOT.jar differ diff --git a/workflows/build/reports/tests/test/classes/com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlowTest.html b/workflows/build/reports/tests/test/classes/com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlowTest.html index 78db752..9e91d6d 100644 --- a/workflows/build/reports/tests/test/classes/com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlowTest.html +++ b/workflows/build/reports/tests/test/classes/com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlowTest.html @@ -123,7 +123,7 @@ Generated by -Gradle 7.4.2 at 27 Jan 2023, 16:24:37

+Gradle 7.4.2 at 27 Jan 2023, 16:36:05

diff --git a/workflows/build/reports/tests/test/index.html b/workflows/build/reports/tests/test/index.html index fa4a900..1fac852 100644 --- a/workflows/build/reports/tests/test/index.html +++ b/workflows/build/reports/tests/test/index.html @@ -126,7 +126,7 @@ Generated by -Gradle 7.4.2 at 27 Jan 2023, 16:24:37

+Gradle 7.4.2 at 27 Jan 2023, 16:36:05

diff --git a/workflows/build/reports/tests/test/packages/com.r3.developers.csdetemplate.flowexample.workflows.html b/workflows/build/reports/tests/test/packages/com.r3.developers.csdetemplate.flowexample.workflows.html index 5748079..84881aa 100644 --- a/workflows/build/reports/tests/test/packages/com.r3.developers.csdetemplate.flowexample.workflows.html +++ b/workflows/build/reports/tests/test/packages/com.r3.developers.csdetemplate.flowexample.workflows.html @@ -96,7 +96,7 @@ Generated by -Gradle 7.4.2 at 27 Jan 2023, 16:24:37

+Gradle 7.4.2 at 27 Jan 2023, 16:36:05

diff --git a/workflows/build/test-results/test/TEST-com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlowTest.xml b/workflows/build/test-results/test/TEST-com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlowTest.xml index f87ce48..93d0062 100644 --- a/workflows/build/test-results/test/TEST-com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlowTest.xml +++ b/workflows/build/test-results/test/TEST-com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlowTest.xml @@ -1,5 +1,5 @@ - + diff --git a/workflows/build/test-results/test/binary/results.bin b/workflows/build/test-results/test/binary/results.bin index 6dedeb4..1b923c8 100644 Binary files a/workflows/build/test-results/test/binary/results.bin and b/workflows/build/test-results/test/binary/results.bin differ diff --git a/workflows/build/tmp/compileJava/previous-compilation-data.bin b/workflows/build/tmp/compileJava/previous-compilation-data.bin index 309ba24..b763b5e 100644 Binary files a/workflows/build/tmp/compileJava/previous-compilation-data.bin and b/workflows/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/workflows/build/tmp/jar/bnd14166197867012160675.bnd b/workflows/build/tmp/jar/bnd14166197867012160675.bnd new file mode 100644 index 0000000..9a15914 --- /dev/null +++ b/workflows/build/tmp/jar/bnd14166197867012160675.bnd @@ -0,0 +1,34 @@ +Corda-CPK-Cordapp-Licence=Unknown +Bundle-License=Unknown +Sealed=true +Cordapp-Workflow-Licence=Unknown +Corda-CPK-Format=2.0 +Cordapp-Workflow-Vendor=VendorNameHere +Bundle-Name=WorkflowsModuleNameHere +Bundle-Vendor=VendorNameHere +Min-Platform-Version=999 +Target-Platform-Version=999 +Bundle-SymbolicName=com.r3.developers.csdetemplate.workflows +Corda-CPK-Cordapp-Vendor=VendorNameHere +Corda-CPK-Cordapp-Name=com.r3.developers.csdetemplate.workflows +Cordapp-Workflow-Name=WorkflowsModuleNameHere +Cordapp-Workflow-Version=1 +Corda-CheckpointCustomSerializer-Classes=${classes;IMPLEMENTS;net.corda.v5.serialization.CheckpointCustomSerializer;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-JsonSerializer-Classes=${classes;IMPLEMENTS;net.corda.v5.application.marshalling.json.JsonSerializer;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-JsonDeserializer-Classes=${classes;IMPLEMENTS;net.corda.v5.application.marshalling.json.JsonDeserializer;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-Token-Observer-Classes=${classes;IMPLEMENTS;net.corda.v5.ledger.utxo.observer.UtxoLedgerTokenStateObserver;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-CPK-Cordapp-Version=${Bundle-Version} +Corda-Flow-Classes=${classes;IMPLEMENTS;net.corda.v5.application.flows.Flow;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-SerializationCustomSerializer-Classes=${classes;IMPLEMENTS;net.corda.v5.serialization.SerializationCustomSerializer;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-RPCStartableFlow-Classes=${classes;IMPLEMENTS;net.corda.v5.application.flows.RPCStartableFlow;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-NotaryPluginProvider-Classes=${classes;IMPLEMENTS;net.corda.v5.ledger.notary.plugin.api.PluggableNotaryClientFlowProvider;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Import-Package=org.hibernate.annotations;resolution\:\=dynamic;version\=\!,org.hibernate.proxy;resolution\:\=dynamic;version\=\!,net.corda.v5.*\:o;version\='${range;[\=,+);${@}}',* +Corda-Subflow-Classes=${classes;IMPLEMENTS;net.corda.v5.application.flows.Subflow;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-DigestAlgorithmFactory-Classes=${classes;IMPLEMENTS;net.corda.v5.crypto.extensions.DigestAlgorithmFactory;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-Entity-Classes=${classes;ANNOTATED;javax.persistence.Entity;ANNOTATED;net.corda.v5.base.annotations.CordaSerializable;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-StateAndRefPostProcessor-Classes=${classes;IMPLEMENTS;net.corda.v5.ledger.services.vault.StateAndRefPostProcessor;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +-noextraheaders=true +Corda-CustomQueryPostProcessor-Classes=${classes;IMPLEMENTS;net.corda.v5.application.persistence.query.CustomQueryPostProcessor;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +Corda-InitiatedFlow-Classes=${classes;IMPLEMENTS;net.corda.v5.application.flows.ResponderFlow;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*} +-exportcontents=com.r3.developers.csdetemplate.flowexample.workflows,com.r3.developers.csdetemplate.utilities,com.r3.developers.csdetemplate.utxoexample.workflows +Corda-Contract-Classes=${classes;IMPLEMENTS;net.corda.v5.ledger.contracts.Contract;CONCRETE;PUBLIC;STATIC;NAMED;\!*.[\\d]+*}