Merge pull request #7 from onix-labs/feature-v2

feature-v2

Author: MrMatthewLayton

HEADER

@@ -1,15 +1,13 @@
-/**
- * Copyright 2020 Matthew Layton
- *
- * 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.
- */
+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.

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         junit_version = '5.3.1'
 
         onixlabs_group = 'io.onixlabs'
-        onixlabs_corda_core_release_version = '1.2.0'
+        onixlabs_corda_core_release_version = '2.0.0'
 
         cordapp_platform_version = 8
         cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'
@@ -26,8 +26,8 @@ buildscript {
         cordapp_signing_enabled = true
         cordapp_signing_alias = 'cordapp-signer'
         cordapp_signing_storetype = 'PKCS12'
-        cordapp_signing_keystore = getProperty('jar.sign.keystore')
-        cordapp_signing_password = getProperty('jar.sign.password')
+        cordapp_signing_keystore = findProperty('onixlabs.production.jarsign.keystore') ?: getProperty('onixlabs.development.jarsign.keystore')
+        cordapp_signing_password = findProperty('onixlabs.production.jarsign.password') ?: getProperty('onixlabs.development.jarsign.password')
     }
 
     repositories {
@@ -45,7 +45,7 @@ buildscript {
 }
 
 group 'io.onixlabs'
-version '2.0.0-rc2'
+version '2.0.0'
 
 subprojects {
     repositories {

doc/contract/.gitkeep

@@ -1,5 +1,9 @@
 name=onixlabs-corda-identity-framework
 group=io.onixlabs
 version=0.1
+
 kotlin.incremental=false
-kotlin.code.style=official
+kotlin.code.style=official
+
+onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
+onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3

doc/integration/ClaimCommandService.md

@@ -28,6 +28,7 @@ dependencies {
 
     // CorDapp Dependencies
     cordapp "$onixlabs_group:onixlabs-corda-core-contract:$onixlabs_corda_core_release_version"
+    cordapp "$onixlabs_group:onixlabs-corda-core-workflow:$onixlabs_corda_core_release_version"
 
     // Test Dependencies
     testRuntimeOnly "$junit_group:junit-jupiter-engine:$junit_version"

doc/workflow/.gitkeep

@@ -1,11 +1,11 @@
-/**
- * Copyright 2020 Matthew Layton
+/*
+ * 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
+ *    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,

gradle.properties

@@ -1,11 +1,11 @@
-/**
- * Copyright 2020 Matthew Layton
+/*
+ * 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
+ *    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,

lib/onixlabs.development.jks

@@ -1,11 +1,11 @@
-/**
- * Copyright 2020 Matthew Layton
+/*
+ * 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
+ *    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,
@@ -55,8 +55,8 @@ open class Attestation<T : ContractState>(
 
     init {
         check(metadata.size <= 10) { "The number of metadata entries cannot exceed 10." }
-        check(metadata.keys.all { it.length <= 256 }) { "The maximum key length for a metadata entry is 256." }
-        check(metadata.values.all { it.length <= 1024 }) { "The maximum value length for a metadata entry is 1024." }
+        check(metadata.keys.all { it.length <= 256 }) { "The maximum length for a metadata key is 256." }
+        check(metadata.values.all { it.length <= 1024 }) { "The maximum length for a metadata value is 1024." }
     }
 
     override val hash: SecureHash
@@ -95,13 +95,14 @@ open class Attestation<T : ContractState>(
             externalId = linearId.externalId,
             attestor = attestor,
             pointerStateRef = pointer.stateRef.toString(),
-            pointerStateClass = pointer.stateClass.canonicalName,
-            pointerStateLinearId = pointer.stateLinearId?.id,
+            pointerStateType = pointer.stateType.canonicalName,
+            pointerStateLinearId = pointer.getLinearId()?.id,
+            pointerStateExternalId = pointer.getLinearId()?.externalId,
             pointerHash = pointer.hash.toString(),
             status = status,
             previousStateRef = previousStateRef?.toString(),
             hash = hash.toString(),
-            attestationClass = javaClass.canonicalName
+            attestationType = javaClass.canonicalName
         )
         else -> throw IllegalArgumentException("Unrecognised schema: $schema.")
     }
@@ -123,6 +124,7 @@ open class Attestation<T : ContractState>(
      */
     override fun equals(other: Any?): Boolean {
         return this === other || (other is Attestation<*>
+                && other.javaClass == javaClass
                 && other.attestor == attestor
                 && other.attestees == attestees
                 && other.pointer == pointer
@@ -156,10 +158,11 @@ open class Attestation<T : ContractState>(
      * @param other The attestation to compare with the current attestation.
      * @return Returns true if the immutable properties have not changed; otherwise, false.
      */
+    @Suppress("UNCHECKED_CAST")
     internal fun internalImmutableEquals(other: Attestation<*>): Boolean {
         return attestor == other.attestor
                 && linearId == other.linearId
-                && pointer.immutableEquals(other.pointer)
+                && pointer.immutableEquals((other as Attestation<T>).pointer)
                 && immutableEquals(other)
     }
 

lib/onixlabs.development.pkcs12

@@ -1,11 +1,11 @@
-/**
- * Copyright 2020 Matthew Layton
+/*
+ * 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
+ *    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,