-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/os/0.9.0' into knguyen/ES-620/gradle_version_ca…
…talog
- Loading branch information
Showing
144 changed files
with
3,580 additions
and
298 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
.../main/kotlin/com/r3/corda/test/utxo/chainable/workflow/ChainableContractCreateTestFlow.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package com.r3.corda.test.utxo.chainable.workflow | ||
|
|
||
| import com.r3.corda.ledger.utxo.base.StaticPointer | ||
| import com.r3.corda.test.utxo.chainable.contract.MyChainableContract | ||
| import com.r3.corda.test.utxo.chainable.contract.MyChainableState | ||
| import com.r3.corda.test.utxo.chainable.contract.MyContractState | ||
| import net.corda.v5.application.crypto.DigestService | ||
| import net.corda.v5.application.flows.CordaInject | ||
| import net.corda.v5.application.flows.SubFlow | ||
| import net.corda.v5.application.membership.MemberLookup | ||
| import net.corda.v5.base.annotations.Suspendable | ||
| import net.corda.v5.crypto.DigestAlgorithmName | ||
| import net.corda.v5.ledger.common.NotaryLookup | ||
| import net.corda.v5.ledger.utxo.StateAndRef | ||
| import net.corda.v5.ledger.utxo.StateRef | ||
| import net.corda.v5.ledger.utxo.UtxoLedgerService | ||
| import java.time.Instant | ||
| import java.time.temporal.ChronoUnit | ||
| import java.util.UUID | ||
|
|
||
| class ChainableContractCreateTestFlow(private val rule: String) : SubFlow<List<StateAndRef<*>>> { | ||
|
|
||
| @CordaInject | ||
| private lateinit var digestService: DigestService | ||
|
|
||
| @CordaInject | ||
| private lateinit var memberLookup: MemberLookup | ||
|
|
||
| @CordaInject | ||
| private lateinit var notaryLookup: NotaryLookup | ||
|
|
||
| @CordaInject | ||
| private lateinit var utxoLedgerService: UtxoLedgerService | ||
|
|
||
| @Suspendable | ||
| override fun call(): List<StateAndRef<*>> { | ||
| val key = memberLookup.myInfo().firstLedgerKey | ||
| val outputs = when (rule) { | ||
| "CONTRACT_RULE_CREATE_OUTPUTS" -> listOf(MyContractState(UUID.randomUUID())) | ||
| "CONTRACT_RULE_CREATE_POINTERS" -> { | ||
| listOf( | ||
| MyChainableState( | ||
| UUID.randomUUID(), | ||
| key, | ||
| StaticPointer( | ||
| StateRef(digestService.hash(byteArrayOf(1, 2, 3, 4), DigestAlgorithmName.SHA2_256), 0), | ||
| MyChainableState::class.java | ||
| ) | ||
| ), | ||
| MyChainableState(UUID.randomUUID(), key, null) | ||
| ) | ||
| } | ||
| "VALID" -> { | ||
| listOf( | ||
| MyChainableState(UUID.randomUUID(), key, null), | ||
| MyChainableState(UUID.randomUUID(), key, null), | ||
| MyContractState(UUID.randomUUID()) | ||
| ) | ||
| } | ||
| else -> throw IllegalArgumentException("Invalid rule type passed in") | ||
| } | ||
| val transaction = utxoLedgerService.createTransactionBuilder() | ||
| .setNotary(notaryLookup.notaryServices.first().name) | ||
| .addOutputStates(outputs) | ||
| .addSignatories(key) | ||
| .addCommand(MyChainableContract.Create()) | ||
| .setTimeWindowUntil(Instant.now().plus(10, ChronoUnit.DAYS)) | ||
| .toSignedTransaction() | ||
|
|
||
| return utxoLedgerService.finalize(transaction, emptyList()).transaction.outputStateAndRefs | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
.../main/kotlin/com/r3/corda/test/utxo/chainable/workflow/ChainableContractDeleteTestFlow.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package com.r3.corda.test.utxo.chainable.workflow | ||
|
|
||
| import com.r3.corda.test.utxo.chainable.contract.MyChainableContract | ||
| import com.r3.corda.test.utxo.chainable.contract.MyChainableState | ||
| import net.corda.v5.application.flows.CordaInject | ||
| import net.corda.v5.application.flows.SubFlow | ||
| import net.corda.v5.application.membership.MemberLookup | ||
| import net.corda.v5.base.annotations.Suspendable | ||
| import net.corda.v5.ledger.common.NotaryLookup | ||
| import net.corda.v5.ledger.utxo.StateAndRef | ||
| import net.corda.v5.ledger.utxo.UtxoLedgerService | ||
| import java.time.Instant | ||
| import java.time.temporal.ChronoUnit | ||
|
|
||
| class ChainableContractDeleteTestFlow( | ||
| private val rule: String, | ||
| private val stateAndRefs: List<StateAndRef<*>> | ||
| ) : SubFlow<List<StateAndRef<*>>> { | ||
|
|
||
| @CordaInject | ||
| private lateinit var memberLookup: MemberLookup | ||
|
|
||
| @CordaInject | ||
| private lateinit var notaryLookup: NotaryLookup | ||
|
|
||
| @CordaInject | ||
| private lateinit var utxoLedgerService: UtxoLedgerService | ||
|
|
||
| @Suspendable | ||
| override fun call(): List<StateAndRef<*>> { | ||
| val key = memberLookup.myInfo().firstLedgerKey | ||
| val inputs = when (rule) { | ||
| "CONTRACT_RULE_DELETE_INPUTS" -> { | ||
| stateAndRefs | ||
| .filter { it.state.contractState !is MyChainableState } | ||
| .map { it.ref } | ||
| } | ||
| "VALID" -> { | ||
| stateAndRefs.map { it.ref } | ||
| } | ||
| else -> throw IllegalArgumentException("Invalid rule type passed in") | ||
| } | ||
| val transaction = utxoLedgerService.createTransactionBuilder() | ||
| .setNotary(notaryLookup.notaryServices.first().name) | ||
| .addInputStates(inputs) | ||
| .addSignatories(key) | ||
| .addCommand(MyChainableContract.Delete()) | ||
| .setTimeWindowUntil(Instant.now().plus(10, ChronoUnit.DAYS)) | ||
| .toSignedTransaction() | ||
|
|
||
| return utxoLedgerService.finalize(transaction, emptyList()).transaction.outputStateAndRefs | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
...pp/src/main/kotlin/com/r3/corda/test/utxo/chainable/workflow/ChainableContractTestFlow.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package com.r3.corda.test.utxo.chainable.workflow | ||
|
|
||
| import net.corda.v5.application.flows.ClientRequestBody | ||
| import net.corda.v5.application.flows.ClientStartableFlow | ||
| import net.corda.v5.application.flows.CordaInject | ||
| import net.corda.v5.application.flows.FlowEngine | ||
| import net.corda.v5.application.marshalling.JsonMarshallingService | ||
| import net.corda.v5.base.annotations.Suspendable | ||
|
|
||
| class ChainableContractTestFlow : ClientStartableFlow { | ||
|
|
||
| @CordaInject | ||
| private lateinit var flowEngine: FlowEngine | ||
|
|
||
| @CordaInject | ||
| private lateinit var jsonMarshallingService: JsonMarshallingService | ||
|
|
||
| @Suspendable | ||
| override fun call(requestBody: ClientRequestBody): String { | ||
| val request = requestBody.getRequestBodyAs(jsonMarshallingService, Request::class.java) | ||
| when (request.command) { | ||
| "CREATE" -> flowEngine.subFlow(ChainableContractCreateTestFlow(request.rule)) | ||
| "UPDATE" -> { | ||
| val outputs = flowEngine.subFlow(ChainableContractCreateTestFlow("VALID")) | ||
| flowEngine.subFlow(ChainableContractUpdateTestFlow(request.rule, outputs)) | ||
| } | ||
| "DELETE" -> { | ||
| val outputs = flowEngine.subFlow(ChainableContractCreateTestFlow("VALID")) | ||
| flowEngine.subFlow(ChainableContractDeleteTestFlow(request.rule, outputs)) | ||
| } | ||
| else -> throw IllegalArgumentException("Invalid command type passed in") | ||
| } | ||
| return "success" | ||
| } | ||
| } | ||
|
|
||
| private class Request(val command: String, val rule: String) |
86 changes: 86 additions & 0 deletions
86
.../main/kotlin/com/r3/corda/test/utxo/chainable/workflow/ChainableContractUpdateTestFlow.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| package com.r3.corda.test.utxo.chainable.workflow | ||
|
|
||
| import com.r3.corda.ledger.utxo.base.StaticPointer | ||
| import com.r3.corda.test.utxo.chainable.contract.MyChainableContract | ||
| import com.r3.corda.test.utxo.chainable.contract.MyChainableState | ||
| import com.r3.corda.test.utxo.chainable.contract.MyContractState | ||
| import net.corda.v5.application.flows.CordaInject | ||
| import net.corda.v5.application.flows.SubFlow | ||
| import net.corda.v5.application.membership.MemberLookup | ||
| import net.corda.v5.base.annotations.Suspendable | ||
| import net.corda.v5.ledger.common.NotaryLookup | ||
| import net.corda.v5.ledger.utxo.StateAndRef | ||
| import net.corda.v5.ledger.utxo.StateRef | ||
| import net.corda.v5.ledger.utxo.UtxoLedgerService | ||
| import java.time.Instant | ||
| import java.time.temporal.ChronoUnit | ||
| import java.util.UUID | ||
|
|
||
| class ChainableContractUpdateTestFlow( | ||
| private val rule: String, | ||
| private val stateAndRefs: List<StateAndRef<*>> | ||
| ) : SubFlow<List<StateAndRef<*>>> { | ||
|
|
||
| @CordaInject | ||
| private lateinit var memberLookup: MemberLookup | ||
|
|
||
| @CordaInject | ||
| private lateinit var notaryLookup: NotaryLookup | ||
|
|
||
| @CordaInject | ||
| private lateinit var utxoLedgerService: UtxoLedgerService | ||
|
|
||
| @Suspendable | ||
| override fun call(): List<StateAndRef<*>> { | ||
| val key = memberLookup.myInfo().firstLedgerKey | ||
| val (inputs, outputs) = when (rule) { | ||
| "CONTRACT_RULE_UPDATE_INPUTS" -> { | ||
| emptyList<StateRef>() to listOf(MyContractState(UUID.randomUUID())) | ||
| } | ||
| "CONTRACT_RULE_UPDATE_OUTPUTS" -> { | ||
| stateAndRefs.map { it.ref } to emptyList() | ||
| } | ||
| "CONTRACT_RULE_UPDATE_POINTERS" -> { | ||
| stateAndRefs.map { it.ref } to stateAndRefs | ||
| .filter { it.state.contractState is MyChainableState } | ||
| .map { (it.state.contractState as MyChainableState).copy(previousStatePointer = null) } | ||
| } | ||
| "CONTRACT_RULE_UPDATE_EXCLUSIVE_POINTERS" -> { | ||
| val stateRef = stateAndRefs.first().ref | ||
| stateAndRefs.map { it.ref } to stateAndRefs | ||
| .filter { it.state.contractState is MyChainableState } | ||
| .map { | ||
| (it.state.contractState as MyChainableState).copy( | ||
| previousStatePointer = StaticPointer( | ||
| stateRef, | ||
| MyChainableState::class.java | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| "VALID" -> { | ||
| stateAndRefs.map { it.ref } to stateAndRefs | ||
| .filter { it.state.contractState is MyChainableState } | ||
| .map { | ||
| (it.state.contractState as MyChainableState).copy( | ||
| previousStatePointer = StaticPointer( | ||
| it.ref, | ||
| MyChainableState::class.java | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| else -> throw IllegalArgumentException("Invalid rule type passed in") | ||
| } | ||
| val transaction = utxoLedgerService.createTransactionBuilder() | ||
| .setNotary(notaryLookup.notaryServices.first().name) | ||
| .addInputStates(inputs) | ||
| .addOutputStates(outputs) | ||
| .addSignatories(key) | ||
| .addCommand(MyChainableContract.Update()) | ||
| .setTimeWindowUntil(Instant.now().plus(10, ChronoUnit.DAYS)) | ||
| .toSignedTransaction() | ||
|
|
||
| return utxoLedgerService.finalize(transaction, emptyList()).transaction.outputStateAndRefs | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
...est-app/src/main/kotlin/com/r3/corda/test/utxo/chainable/workflow/MemberInfoExtensions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.r3.corda.test.utxo.chainable.workflow | ||
|
|
||
| import net.corda.v5.membership.MemberInfo | ||
| import java.security.PublicKey | ||
|
|
||
| internal val MemberInfo.firstLedgerKey: PublicKey | ||
| get() = ledgerKeys.first() |
23 changes: 23 additions & 0 deletions
23
e2e-tests/cpbs/ledger-utxo-advanced-chainable-test-contract/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| plugins { | ||
| id 'org.jetbrains.kotlin.jvm' | ||
| id 'net.corda.plugins.cordapp-cpk2' | ||
| } | ||
|
|
||
| cordapp { | ||
| targetPlatformVersion platformVersion.toInteger() | ||
| minimumPlatformVersion platformVersion.toInteger() | ||
| contract { | ||
| name "Advanced UTXO Ledger Test Chainable Contract" | ||
| versionId 1 | ||
| vendor "R3" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| cordaProvided platform("net.corda:corda-api:$cordaApiVersion") | ||
| cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle' | ||
| cordaProvided 'net.corda:corda-ledger-utxo' | ||
|
|
||
| cordapp project(":chainable") | ||
| cordapp project(":ownable") | ||
| } |
52 changes: 52 additions & 0 deletions
52
...contract/src/main/kotlin/com/r3/corda/test/utxo/chainable/contract/MyChainableContract.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package com.r3.corda.test.utxo.chainable.contract | ||
|
|
||
| import com.r3.corda.ledger.utxo.chainable.ChainableContract | ||
| import com.r3.corda.ledger.utxo.chainable.ChainableContractCommand | ||
| import com.r3.corda.ledger.utxo.chainable.ChainableContractCreateCommand | ||
| import com.r3.corda.ledger.utxo.chainable.ChainableContractDeleteCommand | ||
| import com.r3.corda.ledger.utxo.chainable.ChainableContractUpdateCommand | ||
| import net.corda.v5.ledger.utxo.transaction.UtxoLedgerTransaction | ||
|
|
||
| class MyChainableContract : ChainableContract() { | ||
|
|
||
| override fun getPermittedCommandTypes(): List<Class<out ChainableContractCommand<*>>> { | ||
| return listOf(Create::class.java, Update::class.java, Delete::class.java) | ||
| } | ||
|
|
||
| override fun onVerify(transaction: UtxoLedgerTransaction) { | ||
|
|
||
| } | ||
|
|
||
| class Create : ChainableContractCreateCommand<MyChainableState>() { | ||
|
|
||
| override fun getContractStateType(): Class<MyChainableState> { | ||
| return MyChainableState::class.java | ||
| } | ||
|
|
||
| override fun onVerify(transaction: UtxoLedgerTransaction) { | ||
|
|
||
| } | ||
| } | ||
|
|
||
| class Update : ChainableContractUpdateCommand<MyChainableState>() { | ||
|
|
||
| override fun getContractStateType(): Class<MyChainableState> { | ||
| return MyChainableState::class.java | ||
| } | ||
|
|
||
| override fun onVerify(transaction: UtxoLedgerTransaction) { | ||
|
|
||
| } | ||
| } | ||
|
|
||
| class Delete : ChainableContractDeleteCommand<MyChainableState>() { | ||
|
|
||
| override fun getContractStateType(): Class<MyChainableState> { | ||
| return MyChainableState::class.java | ||
| } | ||
|
|
||
| override fun onVerify(transaction: UtxoLedgerTransaction) { | ||
|
|
||
| } | ||
| } | ||
| } |
Oops, something went wrong.