ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-02 01:08:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cbdc/conclave-corda-int' into cbdc/poc-encrypt-backchain

Browse Source
This commit is contained in:
vanjatomic 2022-03-01 11:18:25 +00:00
commit 5815713668
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/kotlin/net/corda/core/contracts/Structures.kt
View File

@ -239,7 +239,9 @@ interface MoveCommand : CommandData {
/** A [Command] where the signing parties have been looked up if they have a well known/recognised institutional key. */
@KeepForDJVM
@CordaSerializable
data class CommandWithParties<out T : CommandData>(
data class CommandWithParties<out T : CommandData>
@ConstructorForDeserialization
constructor(
val signers: List<PublicKey>,
/** If any public keys were recognised, the looked up institutions are available here */
@Deprecated("Should not be used in contract verification code as it is non-deterministic, will be disabled for some future target platform version onwards and will take effect only for CorDapps targeting those versions.")

5
core/src/main/kotlin/net/corda/core/crypto/TransactionSignature.kt
View File

@ -1,6 +1,7 @@
package net.corda.core.crypto
import net.corda.core.KeepForDJVM
import net.corda.core.serialization.ConstructorForDeserialization
import net.corda.core.serialization.CordaSerializable
import java.security.InvalidKeyException
import java.security.PublicKey
@ -17,7 +18,9 @@ import java.util.*
*/
@CordaSerializable
@KeepForDJVM
class TransactionSignature(bytes: ByteArray, val by: PublicKey, val signatureMetadata: SignatureMetadata, val partialMerkleTree: PartialMerkleTree?) : DigitalSignature(bytes) {
class TransactionSignature
@ConstructorForDeserialization
constructor(bytes: ByteArray, val by: PublicKey, val signatureMetadata: SignatureMetadata, val partialMerkleTree: PartialMerkleTree?) : DigitalSignature(bytes) {
/**
* Construct a [TransactionSignature] with [partialMerkleTree] set to null.
* This is the recommended constructor when signing over a single transaction.

7
core/src/main/kotlin/net/corda/core/transactions/SignedTransaction.kt
View File

@ -13,6 +13,7 @@ import net.corda.core.internal.VisibleForTesting
import net.corda.core.node.NetworkParameters
import net.corda.core.node.ServiceHub
import net.corda.core.node.ServicesForResolution
import net.corda.core.serialization.ConstructorForDeserialization
import net.corda.core.serialization.CordaSerializable
import net.corda.core.serialization.SerializedBytes
import net.corda.core.serialization.deserialize
@ -43,9 +44,9 @@ import java.util.function.Predicate
// DOCSTART 1
@KeepForDJVM
@CordaSerializable
data class SignedTransaction(val txBits: SerializedBytes<CoreTransaction>,
override val sigs: List<TransactionSignature>
) : TransactionWithSignatures {
data class SignedTransaction
@ConstructorForDeserialization
constructor(val txBits: SerializedBytes<CoreTransaction>, override val sigs: List<TransactionSignature>) : TransactionWithSignatures {
// DOCEND 1
constructor(ctx: CoreTransaction, sigs: List<TransactionSignature>) : this(ctx.serialize(), sigs) {
cachedTransaction = ctx