Skip to content

Commit ec8549f

Browse files
MrMatthewLaytonMrMatthewLayton
committed
Updated to Corda 4.8 and ONIXLabs Corda Core 2.1.0
1 parent c2e53bb commit ec8549f

File tree

26 files changed

+285
-284
lines changed

26 files changed

+285
-284
lines changed

‎build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55

66
corda_artifactory_url = 'https://software.r3.com/artifactory'
77
corda_group = 'net.corda'
8-
corda_release_version = '4.6'
8+
corda_release_version = '4.8'
99

1010
corda_gradle_plugin_group = 'net.corda.plugins'
1111
corda_gradle_plugin_version = '5.0.4'
@@ -14,9 +14,9 @@ buildscript {
1414
junit_version = '5.3.1'
1515

1616
onixlabs_group = 'io.onixlabs'
17-
onixlabs_corda_core_release_version = '2.0.0'
17+
onixlabs_corda_core_release_version = '2.1.0'
1818

19-
cordapp_platform_version = 8
19+
cordapp_platform_version = 10
2020
cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'
2121
cordapp_workflow_name = 'ONIXLabs Corda Identity Framework Workflow'
2222
cordapp_vendor_name = 'ONIXLabs'
@@ -44,7 +44,7 @@ buildscript {
4444
}
4545

4646
group 'io.onixlabs'
47-
version '2.0.0'
47+
version '2.1.0'
4848

4949
subprojects {
5050
repositories {

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name=onixlabs-corda-identity-framework
22
group=io.onixlabs
3-
version=2.0.0
3+
version=2.1.0
44

55
kotlin.incremental=false
66
kotlin.code.style=official

‎onixlabs-corda-identity-framework-contract/src/test/kotlin/io/onixlabs/corda/identityframework/contract/ContractTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ abstract class ContractTest {
4242
@BeforeEach
4343
private fun setup() {
4444
val networkParameters = testNetworkParameters(
45-
minimumPlatformVersion = 8,
45+
minimumPlatformVersion = 10,
4646
notaries = listOf(NotaryInfo(NOTARY.party, true))
4747
)
4848
_services = MockServices(cordapps, IDENTITY_A, networkParameters, IDENTITY_B, IDENTITY_C)

‎onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/IntegrationTest.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,16 @@ abstract class IntegrationTest : AutoCloseable {
5151
isDebug = true,
5252
startNodesInProcess = true,
5353
waitForAllNodesToFinish = false,
54+
networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
5455
cordappsForAllNodes = cordappsForPackages(
56+
"io.onixlabs.corda.core.workflow",
5557
"io.onixlabs.corda.identityframework.contract",
5658
"io.onixlabs.corda.identityframework.workflow"
5759
),
5860
portAllocation = object : PortAllocation() {
5961
private var start = 10000
6062
override fun nextPort(): Int = start++
61-
},
62-
networkParameters = testNetworkParameters(
63-
minimumPlatformVersion = 7
64-
)
63+
}
6564
)
6665

6766
driver(parameters) {

‎onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/AmendAttestationFlow.kt

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
package io.onixlabs.corda.identityframework.workflow
1818

1919
import co.paralleluniverse.fibers.Suspendable
20-
import io.onixlabs.corda.core.workflow.checkSufficientSessions
21-
import io.onixlabs.corda.core.workflow.currentStep
22-
import io.onixlabs.corda.core.workflow.initiateFlows
20+
import io.onixlabs.corda.core.workflow.*
2321
import io.onixlabs.corda.identityframework.contract.Attestation
2422
import net.corda.core.contracts.StateAndRef
2523
import net.corda.core.flows.*
2624
import net.corda.core.identity.Party
2725
import net.corda.core.transactions.SignedTransaction
2826
import net.corda.core.utilities.ProgressTracker
27+
import net.corda.core.utilities.ProgressTracker.Step
2928

3029
/**
3130
* Represents the flow for amending an attestation.
@@ -44,24 +43,32 @@ class AmendAttestationFlow(
4443

4544
companion object {
4645
@JvmStatic
47-
fun tracker() = ProgressTracker(INITIALIZING, GENERATING, VERIFYING, SIGNING, FINALIZING)
46+
fun tracker() = ProgressTracker(
47+
InitializeFlowStep,
48+
BuildTransactionStep,
49+
VerifyTransactionStep,
50+
SignTransactionStep,
51+
SendStatesToRecordStep,
52+
FinalizeTransactionStep
53+
)
4854

4955
private const val FLOW_VERSION_1 = 1
5056
}
5157

5258
@Suspendable
5359
override fun call(): SignedTransaction {
54-
currentStep(INITIALIZING)
60+
currentStep(InitializeFlowStep)
5561
checkSufficientSessions(sessions, oldAttestation.state.data, newAttestation)
5662
checkHasAttestedStateBeenWitnessed(newAttestation)
5763
checkAttestationExists(newAttestation)
5864

59-
val transaction = transaction(oldAttestation.state.notary) {
65+
val transaction = buildTransaction(oldAttestation.state.notary) {
6066
addAmendedAttestation(oldAttestation, newAttestation)
6167
}
6268

63-
val signedTransaction = verifyAndSign(transaction, newAttestation.attestor.owningKey)
64-
return finalize(signedTransaction, sessions)
69+
verifyTransaction(transaction)
70+
val signedTransaction = signTransaction(transaction)
71+
return finalizeTransaction(signedTransaction, sessions)
6572
}
6673

6774
/**
@@ -81,23 +88,23 @@ class AmendAttestationFlow(
8188
) : FlowLogic<SignedTransaction>() {
8289

8390
private companion object {
84-
object AMENDING : ProgressTracker.Step("Amending attestation.") {
91+
object AmendAttestationStep : Step("Amending attestation.") {
8592
override fun childProgressTracker() = tracker()
8693
}
8794
}
8895

89-
override val progressTracker = ProgressTracker(AMENDING)
96+
override val progressTracker = ProgressTracker(AmendAttestationStep)
9097

9198
@Suspendable
9299
override fun call(): SignedTransaction {
93-
currentStep(AMENDING)
100+
currentStep(AmendAttestationStep)
94101
val sessions = initiateFlows(observers, oldAttestation.state.data, newAttestation)
95102
return subFlow(
96103
AmendAttestationFlow(
97104
oldAttestation,
98105
newAttestation,
99106
sessions,
100-
AMENDING.childProgressTracker()
107+
AmendAttestationStep.childProgressTracker()
101108
)
102109
)
103110
}

‎onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/AmendAttestationFlowHandler.kt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@
1717
package io.onixlabs.corda.identityframework.workflow
1818

1919
import co.paralleluniverse.fibers.Suspendable
20+
import io.onixlabs.corda.core.workflow.ReceiveStatesToRecordStep
21+
import io.onixlabs.corda.core.workflow.RecordFinalizedTransactionStep
2022
import io.onixlabs.corda.core.workflow.currentStep
23+
import io.onixlabs.corda.core.workflow.finalizeTransactionHandler
2124
import io.onixlabs.corda.identityframework.workflow.AmendAttestationFlow.Initiator
2225
import net.corda.core.crypto.SecureHash
2326
import net.corda.core.flows.FlowLogic
2427
import net.corda.core.flows.FlowSession
2528
import net.corda.core.flows.InitiatedBy
26-
import net.corda.core.flows.ReceiveFinalityFlow
2729
import net.corda.core.node.StatesToRecord
2830
import net.corda.core.transactions.SignedTransaction
2931
import net.corda.core.utilities.ProgressTracker
32+
import net.corda.core.utilities.ProgressTracker.Step
3033

3134
/**
3235
* Represents the flow handler for amending attestations.
@@ -45,13 +48,12 @@ class AmendAttestationFlowHandler(
4548

4649
companion object {
4750
@JvmStatic
48-
fun tracker() = ProgressTracker(RECORDING)
51+
fun tracker() = ProgressTracker(ReceiveStatesToRecordStep, RecordFinalizedTransactionStep)
4952
}
5053

5154
@Suspendable
5255
override fun call(): SignedTransaction {
53-
currentStep(RECORDING)
54-
return subFlow(ReceiveFinalityFlow(session, expectedTransactionId, statesToRecord))
56+
return finalizeTransactionHandler(session, expectedTransactionId, statesToRecord)
5557
}
5658

5759
/**
@@ -63,17 +65,22 @@ class AmendAttestationFlowHandler(
6365
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6466

6567
private companion object {
66-
object OBSERVING : ProgressTracker.Step("Observing amended attestation.") {
68+
object ObserveAmendedAttestationStep : Step("Observing amended attestation.") {
6769
override fun childProgressTracker(): ProgressTracker = tracker()
6870
}
6971
}
7072

71-
override val progressTracker = ProgressTracker(OBSERVING)
73+
override val progressTracker = ProgressTracker(ObserveAmendedAttestationStep)
7274

7375
@Suspendable
7476
override fun call(): SignedTransaction {
75-
currentStep(OBSERVING)
76-
return subFlow(AmendAttestationFlowHandler(session, progressTracker = OBSERVING.childProgressTracker()))
77+
currentStep(ObserveAmendedAttestationStep)
78+
return subFlow(
79+
AmendAttestationFlowHandler(
80+
session,
81+
progressTracker = ObserveAmendedAttestationStep.childProgressTracker()
82+
)
83+
)
7784
}
7885
}
7986
}

‎onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/AmendClaimFlow.kt

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
package io.onixlabs.corda.identityframework.workflow
1818

1919
import co.paralleluniverse.fibers.Suspendable
20-
import io.onixlabs.corda.core.workflow.checkSufficientSessions
21-
import io.onixlabs.corda.core.workflow.currentStep
22-
import io.onixlabs.corda.core.workflow.initiateFlows
20+
import io.onixlabs.corda.core.workflow.*
2321
import io.onixlabs.corda.identityframework.contract.CordaClaim
2422
import net.corda.core.contracts.StateAndRef
2523
import net.corda.core.flows.*
2624
import net.corda.core.identity.Party
2725
import net.corda.core.transactions.SignedTransaction
2826
import net.corda.core.utilities.ProgressTracker
27+
import net.corda.core.utilities.ProgressTracker.Step
2928

3029
/**
3130
* Represents the flow for amending a claim.
@@ -44,23 +43,31 @@ class AmendClaimFlow(
4443

4544
companion object {
4645
@JvmStatic
47-
fun tracker() = ProgressTracker(INITIALIZING, GENERATING, VERIFYING, SIGNING, FINALIZING)
46+
fun tracker() = ProgressTracker(
47+
InitializeFlowStep,
48+
BuildTransactionStep,
49+
VerifyTransactionStep,
50+
SignTransactionStep,
51+
SendStatesToRecordStep,
52+
FinalizeTransactionStep
53+
)
4854

4955
private const val FLOW_VERSION_1 = 1
5056
}
5157

5258
@Suspendable
5359
override fun call(): SignedTransaction {
54-
currentStep(INITIALIZING)
60+
currentStep(InitializeFlowStep)
5561
checkSufficientSessions(sessions, oldClaim.state.data, newClaim)
5662
checkClaimExists(newClaim)
5763

58-
val transaction = transaction(oldClaim.state.notary) {
64+
val transaction = buildTransaction(oldClaim.state.notary) {
5965
addAmendedClaim(oldClaim, newClaim)
6066
}
6167

62-
val signedTransaction = verifyAndSign(transaction, newClaim.issuer.owningKey)
63-
return finalize(signedTransaction, sessions)
68+
verifyTransaction(transaction)
69+
val signedTransaction = signTransaction(transaction)
70+
return finalizeTransaction(signedTransaction, sessions)
6471
}
6572

6673
/**
@@ -80,18 +87,18 @@ class AmendClaimFlow(
8087
) : FlowLogic<SignedTransaction>() {
8188

8289
private companion object {
83-
object AMENDING : ProgressTracker.Step("Amending claim.") {
90+
object AmendClaimStep : Step("Amending claim.") {
8491
override fun childProgressTracker() = tracker()
8592
}
8693
}
8794

88-
override val progressTracker = ProgressTracker(AMENDING)
95+
override val progressTracker = ProgressTracker(AmendClaimStep)
8996

9097
@Suspendable
9198
override fun call(): SignedTransaction {
92-
currentStep(AMENDING)
99+
currentStep(AmendClaimStep)
93100
val sessions = initiateFlows(observers, oldClaim.state.data, newClaim)
94-
return subFlow(AmendClaimFlow(oldClaim, newClaim, sessions, AMENDING.childProgressTracker()))
101+
return subFlow(AmendClaimFlow(oldClaim, newClaim, sessions, AmendClaimStep.childProgressTracker()))
95102
}
96103
}
97104
}

‎onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/AmendClaimFlowHandler.kt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@
1717
package io.onixlabs.corda.identityframework.workflow
1818

1919
import co.paralleluniverse.fibers.Suspendable
20+
import io.onixlabs.corda.core.workflow.ReceiveStatesToRecordStep
21+
import io.onixlabs.corda.core.workflow.RecordFinalizedTransactionStep
2022
import io.onixlabs.corda.core.workflow.currentStep
23+
import io.onixlabs.corda.core.workflow.finalizeTransactionHandler
2124
import io.onixlabs.corda.identityframework.workflow.AmendClaimFlow.Initiator
2225
import net.corda.core.crypto.SecureHash
2326
import net.corda.core.flows.FlowLogic
2427
import net.corda.core.flows.FlowSession
2528
import net.corda.core.flows.InitiatedBy
26-
import net.corda.core.flows.ReceiveFinalityFlow
2729
import net.corda.core.node.StatesToRecord
2830
import net.corda.core.transactions.SignedTransaction
2931
import net.corda.core.utilities.ProgressTracker
32+
import net.corda.core.utilities.ProgressTracker.Step
3033

3134
/**
3235
* Represents the flow handler for amending claims.
@@ -45,13 +48,12 @@ class AmendClaimFlowHandler(
4548

4649
companion object {
4750
@JvmStatic
48-
fun tracker() = ProgressTracker(RECORDING)
51+
fun tracker() = ProgressTracker(ReceiveStatesToRecordStep, RecordFinalizedTransactionStep)
4952
}
5053

5154
@Suspendable
5255
override fun call(): SignedTransaction {
53-
currentStep(RECORDING)
54-
return subFlow(ReceiveFinalityFlow(session, expectedTransactionId, statesToRecord))
56+
return finalizeTransactionHandler(session, expectedTransactionId, statesToRecord)
5557
}
5658

5759
/**
@@ -63,17 +65,22 @@ class AmendClaimFlowHandler(
6365
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6466

6567
private companion object {
66-
object OBSERVING : ProgressTracker.Step("Observing amended claim.") {
68+
object ObserveAmendedClaimStep : Step("Observing amended claim.") {
6769
override fun childProgressTracker(): ProgressTracker = tracker()
6870
}
6971
}
7072

71-
override val progressTracker = ProgressTracker(OBSERVING)
73+
override val progressTracker = ProgressTracker(ObserveAmendedClaimStep)
7274

7375
@Suspendable
7476
override fun call(): SignedTransaction {
75-
currentStep(OBSERVING)
76-
return subFlow(AmendClaimFlowHandler(session, progressTracker = OBSERVING.childProgressTracker()))
77+
currentStep(ObserveAmendedClaimStep)
78+
return subFlow(
79+
AmendClaimFlowHandler(
80+
session,
81+
progressTracker = ObserveAmendedClaimStep.childProgressTracker()
82+
)
83+
)
7784
}
7885
}
7986
}

0 commit comments

Comments
 (0)