Skip to content

Commit f157533

Browse files
MrMatthewLaytonMrMatthewLayton
committed
Updated to use onixlabs-corda-core 2.0.0 and onixlabs-corda-identity-framework 2.0.0 in preparation for v2 features.
1 parent 2c8da85 commit f157533

File tree

36 files changed

+170
-1280
lines changed

36 files changed

+170
-1280
lines changed

‎build.gradle‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ buildscript {
1414
junit_version = '5.3.1'
1515

1616
onixlabs_group = 'io.onixlabs'
17-
onixlabs_corda_core_release_version = '1.2.0'
18-
onixlabs_corda_idfx_release_version = '2.0.0-rc2'
17+
onixlabs_corda_core_release_version = '2.0.0'
18+
onixlabs_corda_idfx_release_version = '2.0.0'
1919

2020
cordapp_platform_version = 8
2121
cordapp_contract_name = 'ONIXLabs Corda BNMS Contract'
@@ -46,7 +46,7 @@ buildscript {
4646
}
4747

4848
group 'io.onixlabs'
49-
version '1.0.0'
49+
version '2.0.0-rc1'
5050

5151
subprojects {
5252
repositories {
@@ -57,14 +57,6 @@ subprojects {
5757
maven { url "$corda_artifactory_url/corda-releases" }
5858
maven { url "$corda_artifactory_url/corda-dependencies" }
5959
maven { url "https://repo.gradle.org/gradle/libs-releases" }
60-
maven {
61-
name = "GitHubPackagesCIF"
62-
url = uri("https://maven.pkg.github.com/onix-labs/onixlabs-corda-identity-framework-beta")
63-
credentials {
64-
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USERNAME")
65-
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
66-
}
67-
}
6860
}
6961

7062
configurations {

‎onixlabs-corda-bnms-contract/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ dependencies {
2828

2929
// CorDapp Dependencies
3030
cordapp "$onixlabs_group:onixlabs-corda-core-contract:$onixlabs_corda_core_release_version"
31+
cordapp "$onixlabs_group:onixlabs-corda-core-workflow:$onixlabs_corda_core_release_version"
3132
cordapp "$onixlabs_group:onixlabs-corda-identity-framework-contract:$onixlabs_corda_idfx_release_version"
3233

3334
// Test Dependencies

‎onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/membership/Extensions.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.onixlabs.corda.bnms.contract.membership
1818

1919
import io.onixlabs.corda.identityframework.contract.AttestationStatus
20-
import io.onixlabs.corda.identityframework.contract.toAttestationPointer
20+
import io.onixlabs.corda.identityframework.contract.toStaticAttestationPointer
2121
import net.corda.core.contracts.StateAndRef
2222
import net.corda.core.contracts.UniqueIdentifier
2323
import net.corda.core.identity.AbstractParty
@@ -54,7 +54,7 @@ fun StateAndRef<MembershipAttestation>.amend(
5454
membership: StateAndRef<Membership>,
5555
status: AttestationStatus,
5656
metadata: Map<String, String> = this.state.data.metadata
57-
) = this.state.data.amend(ref, status, membership.toAttestationPointer(), metadata)
57+
) = this.state.data.amend(ref, status, membership.toStaticAttestationPointer(), metadata)
5858

5959
fun StateAndRef<MembershipAttestation>.accept(
6060
metadata: Map<String, String> = this.state.data.metadata

‎onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/membership/MembershipAttestation.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import io.onixlabs.corda.bnms.contract.membership.MembershipAttestationSchema.Me
2323
import io.onixlabs.corda.identityframework.contract.Attestation
2424
import io.onixlabs.corda.identityframework.contract.AttestationPointer
2525
import io.onixlabs.corda.identityframework.contract.AttestationStatus
26-
import io.onixlabs.corda.identityframework.contract.toAttestationPointer
26+
import io.onixlabs.corda.identityframework.contract.toStaticAttestationPointer
2727
import net.corda.core.contracts.BelongsToContract
2828
import net.corda.core.contracts.StateAndRef
2929
import net.corda.core.contracts.StateRef
@@ -63,7 +63,7 @@ class MembershipAttestation internal constructor(
6363
membership.state.data.network,
6464
attestor,
6565
setOf(membership.state.data.holder),
66-
membership.toAttestationPointer(),
66+
membership.toStaticAttestationPointer(),
6767
status,
6868
metadata,
6969
linearId,
@@ -103,9 +103,8 @@ class MembershipAttestation internal constructor(
103103
networkValue = network.value,
104104
networkOperator = network.operator,
105105
networkHash = network.hash.toString(),
106-
pointerStateRef = pointer.stateRef.toString(),
107-
pointerStateClass = pointer.stateClass.canonicalName,
108-
pointerStateLinearId = pointer.stateLinearId!!.id,
106+
pointer = pointer.statePointer.toString(),
107+
pointerStateType = pointer.stateType.canonicalName,
109108
pointerHash = pointer.hash.toString(),
110109
status = status,
111110
previousStateRef = previousStateRef?.toString(),

‎onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/membership/MembershipAttestationSchema.kt‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,11 @@ object MembershipAttestationSchema {
5555
@Column(name = "network_hash", nullable = false)
5656
val networkHash: String = "",
5757

58-
@Column(name = "pointer_state_ref", nullable = false)
59-
val pointerStateRef: String = "",
58+
@Column(name = "pointer", nullable = false)
59+
val pointer: String = "",
6060

61-
@Column(name = "pointer_state_class", nullable = false)
62-
val pointerStateClass: String = "",
63-
64-
@Column(name = "pointer_state_linear_id", nullable = false)
65-
val pointerStateLinearId: UUID = UUID.randomUUID(),
61+
@Column(name = "pointer_state_type", nullable = false)
62+
val pointerStateType: String = "",
6663

6764
@Column(name = "pointer_hash", nullable = false)
6865
val pointerHash: String = "",

‎onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/relationship/Extensions.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.onixlabs.corda.bnms.contract.relationship
1818

1919
import io.onixlabs.corda.identityframework.contract.AttestationStatus
20-
import io.onixlabs.corda.identityframework.contract.toAttestationPointer
20+
import io.onixlabs.corda.identityframework.contract.toStaticAttestationPointer
2121
import net.corda.core.contracts.StateAndRef
2222
import net.corda.core.contracts.UniqueIdentifier
2323
import net.corda.core.identity.AbstractParty
@@ -54,7 +54,7 @@ fun StateAndRef<RelationshipAttestation>.amend(
5454
relationship: StateAndRef<Relationship>,
5555
status: AttestationStatus,
5656
metadata: Map<String, String> = this.state.data.metadata
57-
) = this.state.data.amend(ref, status, relationship.toAttestationPointer(), metadata)
57+
) = this.state.data.amend(ref, status, relationship.toStaticAttestationPointer(), metadata)
5858

5959
fun StateAndRef<RelationshipAttestation>.accept(
6060
metadata: Map<String, String> = this.state.data.metadata

‎onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/relationship/RelationshipAttestation.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import io.onixlabs.corda.bnms.contract.relationship.RelationshipAttestationSchem
2323
import io.onixlabs.corda.identityframework.contract.Attestation
2424
import io.onixlabs.corda.identityframework.contract.AttestationPointer
2525
import io.onixlabs.corda.identityframework.contract.AttestationStatus
26-
import io.onixlabs.corda.identityframework.contract.toAttestationPointer
26+
import io.onixlabs.corda.identityframework.contract.toStaticAttestationPointer
2727
import net.corda.core.contracts.BelongsToContract
2828
import net.corda.core.contracts.StateAndRef
2929
import net.corda.core.contracts.StateRef
@@ -63,7 +63,7 @@ class RelationshipAttestation internal constructor(
6363
relationship.state.data.network,
6464
attestor,
6565
relationship.state.data.participants.toSet(),
66-
relationship.toAttestationPointer(),
66+
relationship.toStaticAttestationPointer(),
6767
status,
6868
metadata,
6969
linearId,
@@ -96,9 +96,8 @@ class RelationshipAttestation internal constructor(
9696
networkValue = network.value,
9797
networkOperator = network.operator,
9898
networkHash = network.hash.toString(),
99-
pointerStateRef = pointer.stateRef.toString(),
100-
pointerStateClass = pointer.stateClass.canonicalName,
101-
pointerStateLinearId = pointer.stateLinearId!!.id,
99+
pointer = pointer.statePointer.toString(),
100+
pointerStateType = pointer.stateType.canonicalName,
102101
pointerHash = pointer.hash.toString(),
103102
status = status,
104103
previousStateRef = previousStateRef?.toString(),

‎onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/relationship/RelationshipAttestationSchema.kt‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,11 @@ object RelationshipAttestationSchema {
5252
@Column(name = "network_hash", nullable = false)
5353
val networkHash: String = "",
5454

55-
@Column(name = "pointer_state_ref", nullable = false)
56-
val pointerStateRef: String = "",
55+
@Column(name = "pointer", nullable = false)
56+
val pointer: String = "",
5757

58-
@Column(name = "pointer_state_class", nullable = false)
59-
val pointerStateClass: String = "",
60-
61-
@Column(name = "pointer_state_linear_id", nullable = false)
62-
val pointerStateLinearId: UUID = UUID.randomUUID(),
58+
@Column(name = "pointer_state_type", nullable = false)
59+
val pointerStateType: String = "",
6360

6461
@Column(name = "pointer_hash", nullable = false)
6562
val pointerHash: String = "",

‎onixlabs-corda-bnms-contract/src/main/resources/migration/membership-attestation-schema.changelog-master.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
55
<include file="migration/membership-attestation-schema.changelog-v1.xml"/>
6+
<include file="migration/membership-attestation-schema.changelog-v2.xml"/>
67
</databaseChangeLog>

‎onixlabs-corda-bnms-contract/src/main/resources/migration/membership-attestation-schema.changelog-v2.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
5+
<changeSet author="ONIXLabs" id="update-v2-membership_attestation_states">
6+
<dropColumn tableName="membership_attestation_states"
7+
columnName="pointer_state_linear_id"/>
8+
<renameColumn tableName="membership_attestation_states"
9+
oldColumnName="pointer_state_ref"
10+
newColumnName="pointer"/>
11+
<renameColumn tableName="membership_attestation_states"
12+
oldColumnName="pointer_state_class"
13+
newColumnName="pointer_state_type"/>
14+
</changeSet>
15+
</databaseChangeLog>

0 commit comments

Comments
 (0)