Updated signature implementation and added initial transaction specifications.

Author: MrMatthewLayton

build.gradle

@@ -41,7 +41,7 @@ buildscript {
 }
 
 group 'io.onixlabs'
-version '2.1.2'
+version '3.0.0-rc1'
 
 subprojects {
     repositories {

gradle.properties

@@ -1,6 +1,6 @@
 name=onixlabs-corda-core
 group=io.onixlabs
-version=2.1.2
+version=3.0.0-rc1
 
 kotlin.incremental=false
 kotlin.code.style=official

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/contract/Extensions.SecureHash.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.core.contract
+
+import net.corda.core.crypto.SecureHash
+
+/**
+ * Sorts and reduces an [Iterable] of [SecureHash] into a single hash.
+ *
+ * @return Returns a single hash representing the sorted and reduced input hashes.
+ */
+fun Iterable<SecureHash>.sortAndReduce(): SecureHash {
+    return sorted().reduce { lhs, rhs -> lhs.concatenate(rhs) }
+}

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/contract/SignatureData.kt

@@ -22,6 +22,7 @@ import net.corda.core.crypto.sign
 import net.corda.core.node.ServiceHub
 import net.corda.core.node.services.KeyManagementService
 import net.corda.core.serialization.CordaSerializable
+import net.corda.core.utilities.toBase58String
 import net.corda.core.utilities.toBase64
 import java.security.PrivateKey
 import java.security.PublicKey
@@ -81,14 +82,26 @@ data class SignatureData(val content: ByteArray, val signature: DigitalSignature
         }
     }
 
+    /**
+     * Determines whether the signature data was signed by the specified key.
+     *
+     * @param publicKey The public key to verify against the signature.
+     * @return Returns true if the signature data was signed by the specified key; otherwise, false.
+     */
+    fun isValid(publicKey: PublicKey): Boolean {
+        return Crypto.isValid(publicKey, signature.bytes, content)
+    }
+
     /**
      * Verifies the signature data using the specified public key.
      *
      * @param publicKey The public key to verify against the signature.
      * @return Returns true if the public key was used to sign the data; otherwise, false.
      */
-    fun verify(publicKey: PublicKey): Boolean {
-        return Crypto.isValid(publicKey, signature.bytes, content)
+    fun verify(publicKey: PublicKey) {
+        if (!isValid(publicKey)) {
+            throw SignatureException("Signature was not signed by the specified key: ${publicKey.toBase58String()}")
+        }
     }
 
     /**

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/specifications/HasCommandSignatureOfType.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.core.specifications
+
+import net.corda.core.contracts.CommandData
+import java.security.PublicKey
+
+/**
+ * Represents a specification that determines whether a command has been signed by the specified signing key.
+ *
+ * @param signingKey The signing key for which the command should be signed.
+ * @param type The command type that should be signed.
+ */
+class HasCommandSignatureOfType(signingKey: PublicKey, type: Class<out CommandData>) :
+    TransactionFunctionSpecification({ signingKey in commandsOfType(type).flatMap { it.signers } })

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/specifications/HasInputsOfTypeTransactionSpecification.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.core.specifications
+
+import net.corda.core.contracts.ContractState
+
+/**
+ * Represents a specification that determines whether a transaction contains the specified input type.
+ *
+ * @param type The contract state type that must be used as an input in the transaction.
+ */
+class HasInputsOfTypeTransactionSpecification(type: Class<out ContractState>) :
+    TransactionFunctionSpecification({ inputsOfType(type).isNotEmpty() })

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/specifications/HasOutputsOfTypeTransactionSpecification.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.core.specifications
+
+import net.corda.core.contracts.ContractState
+
+/**
+ * Represents a specification that determines whether a transaction contains the specified output type.
+ *
+ * @param type The contract state type that must be used as an output in the transaction.
+ */
+class HasOutputsOfTypeTransactionSpecification(type: Class<out ContractState>) :
+    TransactionFunctionSpecification({ outputsOfType(type).isNotEmpty() })

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/specifications/HasReferencesOfTypeTransactionSpecification.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.core.specifications
+
+import net.corda.core.contracts.ContractState
+
+/**
+ * Represents a specification that determines whether a transaction contains the specified reference type.
+ *
+ * @param type The contract state type that must be used as an reference in the transaction.
+ */
+class HasReferencesOfTypeTransactionSpecification(type: Class<out ContractState>) :
+    TransactionFunctionSpecification({ referenceInputsOfType(type).isNotEmpty() })

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/specifications/HasSignatureTransactionSpecification.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.core.specifications
+
+import java.security.PublicKey
+
+/**
+ * Represents a specification that determines whether a transaction has been signed by the specified signing key.
+ *
+ * @param signingKey The signing key for which the transaction should be signed.
+ */
+class HasSignatureTransactionSpecification(signingKey: PublicKey) :
+    TransactionFunctionSpecification({ signingKey in commands.flatMap { it.signers } })

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/specifications/HasSingleInputOfTypeTransactionSpecification.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.core.specifications
+
+import net.corda.core.contracts.ContractState
+
+/**
+ * Represents a specification that determines whether a transaction contains the specified input type.
+ *
+ * @param type The contract state type that must be used as a single input in the transaction.
+ */
+class HasSingleInputOfTypeTransactionSpecification(type: Class<out ContractState>) :
+    TransactionFunctionSpecification({ inputsOfType(type).size == 1 })