setAssetName(e.target.value)}
+// // />
+
+// //
+// //
+// //
+// //
+// //
+// // );
+
+// // const { open, vertical, horizontal } = state;
+
+// return (
+//
+
+//
+//
+// -
+// size=3
+//
+//
+//
+// - size=3
+//
+//
+// - size=3
+//
+//
+// - size=3
+//
+//
+// -
+// Alice
+//
+//
+//
+// -
+// Bob
+//
+//
+
+//
+//
+// );
+// }
diff --git a/src/r3/atomic-swap/c4evmswapdemo/src/components/AssetsTable.tsx b/src/r3/atomic-swap/c4evmswapdemo/src/components/AssetsTable.tsx
new file mode 100644
index 0000000..8d143bd
--- /dev/null
+++ b/src/r3/atomic-swap/c4evmswapdemo/src/components/AssetsTable.tsx
@@ -0,0 +1,48 @@
+import * as React from 'react';
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableHead from '@mui/material/TableHead';
+import TableRow from '@mui/material/TableRow';
+import Paper from '@mui/material/Paper';
+
+
+type AssetRow = {
+ assetName: string,
+ txHash: string,
+}
+type Props = {
+ assetRows: AssetRow[]
+}
+
+export default function AssetsTable({assetRows}:Props) {
+ const inverted = assetRows.reverse()
+ return (
+
+
+
+
+ Asset Name
+ TX Hash
+
+
+
+ {inverted.map((row) => (
+
+
+ {row.assetName}
+
+
+ {row.txHash.substring(0, 20)}...
+
+
+ ))}
+
+
+
+ );
+}
diff --git a/src/r3/atomic-swap/c4evmswapdemo/src/gateway/api.ts b/src/r3/atomic-swap/c4evmswapdemo/src/gateway/api.ts
new file mode 100644
index 0000000..1f2a611
--- /dev/null
+++ b/src/r3/atomic-swap/c4evmswapdemo/src/gateway/api.ts
@@ -0,0 +1,95 @@
+import axios from "axios";
+
+const endPointUrl = (actor: string) => {
+ switch (actor) {
+ case "alice":
+ return "http://localhost:50005";
+ case "bob":
+ return "http://localhost:50006";
+ }
+};
+
+export const generateAsset = async (actor: string, assetName: string) => {
+ return axios.post(`${endPointUrl(actor)}/generate-asset`, { assetName });
+};
+
+export const getAllAssets = async (actor: string) => {
+ return axios.get(`${endPointUrl(actor)}/all-assets`);
+};
+
+export const whoAmI = async (actor: string) => {
+ return axios.get(`${endPointUrl(actor)}/me`);
+};
+
+export const createDraftAssetSwap = async (
+ actor: string,
+ txHash: string,
+ txIndex: number,
+ recipient: string,
+ validators: string[],
+ signaturesRequired: number,
+ contractAddress: string,
+ fromAddress: string,
+ toAddress: string,
+ evmAmount: string,
+) => {
+ return axios.post(`${endPointUrl(actor)}/draft-asset-swap`, {
+ txHash,
+ txIndex,
+ recipient,
+ validators,
+ signaturesRequired,
+ contractAddress,
+ fromAddress,
+ toAddress,
+ evmAmount,
+ });
+};
+
+export const signDraftTransaction = async (
+ actor: string,
+ draftTxHash: string,
+) => {
+ return axios.post(`${endPointUrl(actor)}/sign-draft-transaction`, {
+ draftTxHash,
+ });
+};
+
+export const transferAndProve = async (
+ actor: string,
+ amount: string,
+ toAddress: string,
+ contractAddress: string,
+) => {
+ return axios.post(`${endPointUrl(actor)}/transfer-and-prove`, {
+ amount,
+ toAddress,
+ contractAddress,
+ });
+};
+
+export const collectBlockSignatures = async (
+ actor: string,
+ draftTxHash: string,
+ blockNumber: number,
+ blocking: boolean,
+) => {
+ return axios.post(`${endPointUrl(actor)}/collect-block-signatures`, {
+ draftTxHash,
+ blockNumber,
+ blocking,
+ });
+};
+
+export const unlockAsset = async (
+ actor: string,
+ signedTransactionId: string,
+ blockNumber: number,
+ transactionIndex: number,
+) => {
+ return axios.post(`${endPointUrl(actor)}/unlock-asset`, {
+ signedTransactionId,
+ blockNumber,
+ transactionIndex,
+ });
+};
diff --git a/src/r3/atomic-swap/c4evmswapdemo/src/hooks/useSteps.ts b/src/r3/atomic-swap/c4evmswapdemo/src/hooks/useSteps.ts
new file mode 100644
index 0000000..460853b
--- /dev/null
+++ b/src/r3/atomic-swap/c4evmswapdemo/src/hooks/useSteps.ts
@@ -0,0 +1,19 @@
+import { useState } from "react";
+
+export function useSteps() {
+ const [activeStep, setActiveStep] = useState(0);
+ const [stepResult, setStepResult] = useState("");
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState("");
+
+ return {
+ activeStep,
+ setActiveStep,
+ stepResult,
+ setStepResult,
+ loading,
+ setLoading,
+ error,
+ setError,
+ };
+}
diff --git a/src/r3/atomic-swap/c4evmswapdemo/tsconfig.json b/src/r3/atomic-swap/c4evmswapdemo/tsconfig.json
new file mode 100644
index 0000000..c133409
--- /dev/null
+++ b/src/r3/atomic-swap/c4evmswapdemo/tsconfig.json
@@ -0,0 +1,27 @@
+{
+ "compilerOptions": {
+ "target": "ES2017",
+ "lib": ["dom", "dom.iterable", "esnext"],
+ "allowJs": true,
+ "skipLibCheck": true,
+ "strict": true,
+ "noEmit": true,
+ "esModuleInterop": true,
+ "module": "esnext",
+ "moduleResolution": "bundler",
+ "resolveJsonModule": true,
+ "isolatedModules": true,
+ "jsx": "preserve",
+ "incremental": true,
+ "plugins": [
+ {
+ "name": "next"
+ }
+ ],
+ "paths": {
+ "@/*": ["./src/*"]
+ }
+ },
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+ "exclude": ["node_modules"]
+}
diff --git a/src/r3/atomic-swap/corda/build.gradle b/src/r3/atomic-swap/corda/build.gradle
index e678085..55d257b 100644
--- a/src/r3/atomic-swap/corda/build.gradle
+++ b/src/r3/atomic-swap/corda/build.gradle
@@ -194,9 +194,10 @@ task deployNodes(type: Cordform, dependsOn: ['jar']) {
projectCordapp { deploy = false }
extraConfig = [ 'devMode' : true, quasarExcludePackages: ["okhttp3**"] ]
rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
-
+ runSchemaMigration true
cordapp project(':evm-interop-contracts')
cordapp project(':evm-interop-workflows')
+
}
node {
@@ -214,6 +215,8 @@ task deployNodes(type: Cordform, dependsOn: ['jar']) {
address("localhost:10011")
adminAddress("localhost:10021")
}
+ runSchemaMigration true
+
}
node {
name "O=PartyA,L=London,C=GB"
@@ -229,6 +232,9 @@ task deployNodes(type: Cordform, dependsOn: ['jar']) {
address("localhost:10012")
adminAddress("localhost:10022")
}
+ runSchemaMigration true
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+
}
node {
name "O=PartyB,L=New York,C=US"
@@ -244,5 +250,8 @@ task deployNodes(type: Cordform, dependsOn: ['jar']) {
address("localhost:10013")
adminAddress("localhost:10023")
}
+ runSchemaMigration true
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+
}
}
diff --git a/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/Controller.kt b/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/Controller.kt
new file mode 100644
index 0000000..61a0626
--- /dev/null
+++ b/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/Controller.kt
@@ -0,0 +1,196 @@
+package com.r3.corda.template.webserver.example
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.interop.flows.CollectBlockSignaturesFlow
+import com.r3.corda.evminterop.workflows.GenericAssetState
+import org.slf4j.LoggerFactory
+import org.springframework.http.ResponseEntity
+import javax.servlet.http.HttpServletRequest
+import com.r3.corda.evminterop.workflows.IssueGenericAssetFlow
+import com.interop.flows.UnlockAssetFlow
+
+import net.corda.core.contracts.StateRef
+import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.CordaX500Name
+import net.corda.core.messaging.startFlow
+import net.corda.core.node.services.vault.QueryCriteria
+import com.interop.flows.DraftAssetSwapBaseFlow
+import com.interop.flows.SignDraftTransactionByIDFlow
+import com.r3.corda.evminterop.Erc20TransferEventEncoder
+import com.r3.corda.evminterop.dto.TransactionReceipt
+import com.r3.corda.evminterop.workflows.eth2eth.Erc20TransferFlow
+import org.springframework.web.bind.annotation.*
+
+
+data class AssetReturnType(
+ val assetName : String,
+ val txHash : String,
+ val index : Int
+)
+@CrossOrigin(origins = ["http://localhost:3000"])
+@RestController
+@RequestMapping("/")
+class Controller(rpc: InteropNodeRpcConnection) {
+
+ companion object {
+ private val logger = LoggerFactory.getLogger(RestController::class.java)
+ }
+
+ private val proxy = rpc.proxy
+
+ @GetMapping(value = ["me"], produces = ["application/json"])
+ fun whoami() = mapOf("me" to "Corda")
+
+
+
+ @GetMapping(value = ["all-assets"], produces = ["application/json"])
+ fun allAssets(): ResponseEntity> {
+ val assets = proxy.vaultQuery(GenericAssetState::class.java).states
+ return ResponseEntity.ok(assets.map {
+ AssetReturnType(it.state.data.assetName, it.ref.txhash.toString(), it.ref.index)
+ })
+ }
+ // Post mapping that generates a generic asset on corda
+ @PostMapping(value = ["generate-asset"], produces = ["application/json"])
+ fun createGenericAsset(request: HttpServletRequest): ResponseEntity {
+ // get body of the request
+ val body = request.reader.readText()
+ println("Request body: $body")
+
+ // Parse JSON body using Jackson
+ val mapper = ObjectMapper()
+ val jsonNode = mapper.readTree(body)
+ val assetName = jsonNode.get("assetName")?.asText()
+ ?: return ResponseEntity.badRequest().body("assetName is required")
+ println("Asset name: $assetName")
+ val output = proxy.startFlow(::IssueGenericAssetFlow, assetName).returnValue.get()
+ println("Output: $output")
+ return ResponseEntity.ok(output.toString())
+ }
+
+ @PostMapping(value = ["draft-asset-swap"], produces = ["application/json"])
+ fun createDraftAssetSwap(request: HttpServletRequest): ResponseEntity {
+ // query the asseti
+ // create a draft asset swap
+ // build a criteria builder
+
+ val body = request.reader.readText()
+ val mapper = ObjectMapper()
+ val jsonNode = mapper.readTree(body)
+ val assetTxhash = jsonNode.get("txHash")?.asText()
+ val id = SecureHash.parse(assetTxhash)
+ val index = jsonNode.get("txIndex")?.asInt() ?: 0
+
+
+ val recipientX500Name =
+ jsonNode.get("recipient")?.asText() ?: return ResponseEntity.badRequest().body("Recipient is required")
+ val recipientParty = proxy.wellKnownPartyFromX500Name(CordaX500Name.parse(recipientX500Name))
+ ?: return ResponseEntity.badRequest().body("Recipient not found")
+
+ // validators as a list
+ val validators = jsonNode.get("validators")?.map {
+ proxy.wellKnownPartyFromX500Name(CordaX500Name.parse(it.asText()))
+ ?: return ResponseEntity.badRequest().body("Validator not found")
+ } ?: return ResponseEntity.badRequest().body("Validators are required")
+
+ val signaturesRequired = jsonNode.get("signaturesRequired")?.asInt() ?: return ResponseEntity.badRequest()
+ .body("Signatures required is required")
+
+ val contractAddress = jsonNode.get("contractAddress")?.asText() ?: return ResponseEntity.badRequest()
+ .body("Contract address is required")
+ val fromAddress =
+ jsonNode.get("fromAddress")?.asText() ?: return ResponseEntity.badRequest().body("From address is required")
+ val toAddress =
+ jsonNode.get("toAddress")?.asText() ?: return ResponseEntity.badRequest().body("To address is required")
+ val evmAmount =
+ jsonNode.get("evmAmount")?.asText() ?: return ResponseEntity.badRequest().body("EVM amount is required")
+
+ val transferEventEncoder =
+ Erc20TransferEventEncoder(contractAddress, fromAddress, toAddress, evmAmount.toBigInteger())
+
+
+ val stateRef = StateRef(id, index)
+
+ val criteria = QueryCriteria.VaultQueryCriteria()
+ .withStateRefs(listOf(stateRef)) // Assuming output index 0, adjust if needed
+
+ val results = proxy.vaultQueryByCriteria(criteria, GenericAssetState::class.java)
+ if (results.states.isEmpty()) {
+ return ResponseEntity.badRequest().body("Asset not found")
+ }
+ // get the fist
+ val draftTxHash = proxy.startFlow(
+ ::DraftAssetSwapBaseFlow,
+ stateRef,
+ recipientParty,
+ proxy.notaryIdentities().first(),
+ validators,
+ signaturesRequired,
+ transferEventEncoder
+ ).returnValue.get()
+
+ return ResponseEntity.ok(draftTxHash.toString())
+ }
+
+ @PostMapping(value=["sign-draft-transaction"], produces = ["application/json"])
+ fun signDraftTransaction(request: HttpServletRequest): ResponseEntity {
+ val body = request.reader.readText()
+ val mapper = ObjectMapper()
+ val jsonNode = mapper.readTree(body)
+ val draftTxHash = jsonNode.get("draftTxHash")?.asText()
+ ?: return ResponseEntity.badRequest().body("Draft transaction hash is required")
+ val signedDraftTransaction = proxy.startFlow(::SignDraftTransactionByIDFlow, SecureHash.parse(draftTxHash)).returnValue.get()
+ return ResponseEntity.ok(signedDraftTransaction.tx.id.toString())
+ }
+
+ // TODO: Improve responses
+ @PostMapping(value=["transfer-and-prove"], produces = ["application/json"])
+ fun transferAndProve(request: HttpServletRequest): ResponseEntity {
+ // get the body of the request
+ val body = request.reader.readText()
+ val mapper = ObjectMapper()
+ val jsonNode = mapper.readTree(body)
+ val amount = jsonNode.get("amount")?.asText()
+ ?: return ResponseEntity.badRequest().body(null)
+ val toAddress = jsonNode.get("toAddress")?.asText()
+ ?: return ResponseEntity.badRequest().body(null)
+ val contractAddress = jsonNode.get("contractAddress")?.asText()
+ ?: return ResponseEntity.badRequest().body(null)
+ val transactionReceipt = proxy.startFlow(::Erc20TransferFlow, contractAddress, toAddress, amount.toBigInteger()).returnValue.get()
+ return ResponseEntity.ok(transactionReceipt)
+ }
+ // Query the vault for the generic asset
+
+ @PostMapping(value= ["collect-block-signatures"], produces = ["application/json"])
+ fun collectBlockSignatures(request: HttpServletRequest): ResponseEntity {
+ val body = request.reader.readText()
+ val mapper = ObjectMapper()
+ val jsonNode = mapper.readTree(body)
+ val draftTxHash = jsonNode.get("draftTxHash")?.asText()
+ ?: return ResponseEntity.badRequest().body("Draft transaction hash is required")
+ val blockNumber = jsonNode.get("blockNumber")?.asInt()
+ ?: return ResponseEntity.badRequest().body("Block number is required")
+ val blocking = jsonNode.get("blocking")?.asBoolean()
+ ?: return ResponseEntity.badRequest().body("isFinal is required")
+ proxy.startFlow(::CollectBlockSignaturesFlow, SecureHash.parse(draftTxHash), blockNumber.toBigInteger(), blocking)
+ return ResponseEntity.ok("Block signatures collected")
+ }
+
+ @PostMapping(value=["unlock-asset"], produces = ["application/json"])
+ fun unlockAssetFlow(request: HttpServletRequest): ResponseEntity {
+ val body = request.reader.readText()
+ val mapper = ObjectMapper()
+ val jsonNode = mapper.readTree(body)
+ val signedTransactionId = jsonNode.get("signedTransactionId")?.asText()
+ ?: return ResponseEntity.badRequest().body("Draft transaction hash is required")
+ val blockNumber = jsonNode.get("blockNumber")?.asInt()
+ ?: return ResponseEntity.badRequest().body("Block number is required")
+ val transactionIndex = jsonNode.get("transactionIndex")?.asInt()
+ ?: return ResponseEntity.badRequest().body("Transaction index is required")
+ val unlockTx = proxy.startFlow(::UnlockAssetFlow, SecureHash.parse(signedTransactionId), blockNumber.toBigInteger(), transactionIndex.toBigInteger()).returnValue.get()
+ return ResponseEntity.ok(unlockTx.toString())
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/InteropNodeRpcConnection.kt b/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/InteropNodeRpcConnection.kt
new file mode 100644
index 0000000..e94ceea
--- /dev/null
+++ b/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/InteropNodeRpcConnection.kt
@@ -0,0 +1,77 @@
+package com.r3.corda.template.webserver.example
+
+import com.r3.corda.evminterop.workflows.UnsecureRemoteEvmIdentityFlow
+import net.corda.client.rpc.CordaRPCClient
+import net.corda.client.rpc.CordaRPCConnection
+import net.corda.core.messaging.CordaRPCOps
+import net.corda.core.messaging.startFlow
+import net.corda.core.utilities.NetworkHostAndPort
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.stereotype.Component
+import javax.annotation.PostConstruct
+import javax.annotation.PreDestroy
+
+private const val CORDA_USER_NAME = "config.rpc.username"
+private const val CORDA_USER_PASSWORD = "config.rpc.password"
+private const val CORDA_NODE_HOST = "config.rpc.host"
+private const val CORDA_RPC_PORT = "config.rpc.port"
+private const val EVM_RPC_HOST = "config.evm.rpc.host"
+private const val EVM_RPC_PORT = "config.evm.rpc.port"
+private const val EVM_RPC_CHAIN_ID = "config.evm.rpc.chainId"
+private const val EVM_RPC_PROTOCOL_ADDRESS = "config.evm.rpc.protocolAddress"
+private const val EVM_RPC_DEPLOYER_ADDRESS = "config.evm.rpc.deployerAddress"
+private const val EVM_PRIVATE_KEY = "config.evm.privateKey"
+
+
+/**
+ * Wraps an RPC connection to a Corda node.
+ *
+ * The RPC connection is configured using command line arguments.
+ *
+ * @param host The host of the node we are connecting to.
+ * @param rpcPort The RPC port of the node we are connecting to.
+ * @param username The username for logging into the RPC client.
+ * @param password The password for logging into the RPC client.
+ * @property proxy The RPC proxy.
+ */
+@Component
+open class InteropNodeRpcConnection(
+ @Value("\${$CORDA_NODE_HOST}") private val host: String,
+ @Value("\${$CORDA_USER_NAME}") private val username: String,
+ @Value("\${$CORDA_USER_PASSWORD}") private val password: String,
+ @Value("\${$CORDA_RPC_PORT}") private val rpcPort: Int,
+ @Value("\${$EVM_RPC_HOST}") private val evmRpcHost: String,
+ @Value("\${$EVM_RPC_PORT}") private val evmRpcPort: Int,
+ @Value("\${$EVM_RPC_CHAIN_ID}") private val evmRpcChainId: Long,
+ @Value("\${$EVM_RPC_PROTOCOL_ADDRESS}") private val evmRpcProtocolAddress: String,
+ @Value("\${$EVM_RPC_DEPLOYER_ADDRESS}") private val evmRpcDeployerAddress: String,
+ @Value("\${$EVM_PRIVATE_KEY}") private val evmPrivateKey: String
+) : AutoCloseable {
+
+ lateinit var rpcConnection: CordaRPCConnection
+ private set
+ lateinit var proxy: CordaRPCOps
+ private set
+
+ @PostConstruct
+ fun initialiseNodeRPCConnection() {
+ val rpcAddress = NetworkHostAndPort(host, rpcPort)
+ val rpcClient = CordaRPCClient(rpcAddress)
+ val rpcConnection = rpcClient.start(username, password)
+ proxy = rpcConnection.proxy
+
+ proxy.startFlow(
+ ::UnsecureRemoteEvmIdentityFlow,
+ evmPrivateKey,
+ "http://$evmRpcHost:$evmRpcPort",
+ evmRpcChainId,
+ evmRpcProtocolAddress,
+ evmRpcDeployerAddress
+ )
+ }
+
+ @PreDestroy
+ override fun close() {
+ rpcConnection.notifyServerAndClose()
+ }
+}
\ No newline at end of file
diff --git a/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/Server.kt b/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/Server.kt
new file mode 100644
index 0000000..8edb379
--- /dev/null
+++ b/src/r3/atomic-swap/corda/client/src/main/kotlin/webserver/example/Server.kt
@@ -0,0 +1,23 @@
+package com.r3.corda.template.webserver.example
+
+
+import org.springframework.boot.Banner
+import org.springframework.boot.SpringApplication
+import org.springframework.boot.WebApplicationType.SERVLET
+import org.springframework.boot.autoconfigure.SpringBootApplication
+
+/**
+ * Our Spring Boot application.
+ */
+@SpringBootApplication
+private open class Server
+
+/**
+ * Starts our Spring Boot application.
+ */
+fun main(args: Array) {
+ val app = SpringApplication(Server::class.java)
+ app.setBannerMode(Banner.Mode.OFF)
+ app.webApplicationType = SERVLET
+ app.run(*args)
+}
\ No newline at end of file
diff --git a/src/r3/atomic-swap/corda/evm-interop-contracts/src/main/resources/migration/iou.changelog-master.xml b/src/r3/atomic-swap/corda/evm-interop-contracts/src/main/resources/migration/iou.changelog-master.xml
new file mode 100644
index 0000000..32b4d1d
--- /dev/null
+++ b/src/r3/atomic-swap/corda/evm-interop-contracts/src/main/resources/migration/iou.changelog-master.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/r3/atomic-swap/corda/evm-interop-contracts/src/main/resources/migration/iou.changelog-v1.xml b/src/r3/atomic-swap/corda/evm-interop-contracts/src/main/resources/migration/iou.changelog-v1.xml
new file mode 100644
index 0000000..6b78427
--- /dev/null
+++ b/src/r3/atomic-swap/corda/evm-interop-contracts/src/main/resources/migration/iou.changelog-v1.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/r3/atomic-swap/corda/evm-interop-workflows/src/main/kotlin/com/r3/corda/evminterop/workflows/GenericAsset.kt b/src/r3/atomic-swap/corda/evm-interop-workflows/src/main/kotlin/com/r3/corda/evminterop/workflows/GenericAsset.kt
index 50b5167..2216a14 100644
--- a/src/r3/atomic-swap/corda/evm-interop-workflows/src/main/kotlin/com/r3/corda/evminterop/workflows/GenericAsset.kt
+++ b/src/r3/atomic-swap/corda/evm-interop-workflows/src/main/kotlin/com/r3/corda/evminterop/workflows/GenericAsset.kt
@@ -27,6 +27,10 @@ object GenericAssetSchemaV1 : MappedSchema(
version = 1,
mappedTypes = listOf(PersistentGenericAsset::class.java)
) {
+ override val migrationResource: String?
+ get() = "iou.changelog-master";
+
+
@Entity
@Table(name = "generic_asset_states")
class PersistentGenericAsset(
diff --git a/src/r3/atomic-swap/corda/samples/atomic-swap/build.gradle b/src/r3/atomic-swap/corda/samples/atomic-swap/build.gradle
index 92fa8a8..a7266fa 100644
--- a/src/r3/atomic-swap/corda/samples/atomic-swap/build.gradle
+++ b/src/r3/atomic-swap/corda/samples/atomic-swap/build.gradle
@@ -43,6 +43,8 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
cordapp project(':evm-interop-contracts')
cordapp project(':evm-interop-workflows')
cordapp project(':samples:atomic-swap:swap-workflows')
+ runSchemaMigration = true
+
}
node {
@@ -60,6 +62,8 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
address("localhost:10011")
adminAddress("localhost:10021")
}
+ runSchemaMigration true
+
}
node {
@@ -76,6 +80,8 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
address("localhost:10012")
adminAddress("localhost:10022")
}
+ runSchemaMigration true
+
}
@@ -93,6 +99,8 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
address("localhost:10013")
adminAddress("localhost:10023")
}
+ runSchemaMigration true
+
}
node {
@@ -109,5 +117,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
address("localhost:10014")
adminAddress("localhost:10024")
}
+ runSchemaMigration true
+
}
}
diff --git a/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/main/kotlin/com/interop/flows/DraftAssetSwapBaseFlow.kt b/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/main/kotlin/com/interop/flows/DraftAssetSwapBaseFlow.kt
index 2a4b393..52e5888 100644
--- a/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/main/kotlin/com/interop/flows/DraftAssetSwapBaseFlow.kt
+++ b/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/main/kotlin/com/interop/flows/DraftAssetSwapBaseFlow.kt
@@ -24,8 +24,9 @@ import net.corda.core.identity.AbstractParty
@StartableByRPC
@InitiatingFlow
class DraftAssetSwapBaseFlow(
- private val transactionId: SecureHash,
- private val outputIndex: Int,
+ private val assetTx: StateRef,
+// private val transactionId: SecureHash,
+// private val outputIndex: Int,
private val recipient: AbstractParty,
private val notary: AbstractParty,
private val validators: List,
@@ -34,6 +35,8 @@ class DraftAssetSwapBaseFlow(
) : FlowLogic() {
@Suspendable
override fun call(): SecureHash {
+ val transactionId = assetTx.txhash
+ val outputIndex = assetTx.index
require(signaturesThreshold <= validators.count() && signaturesThreshold > 0)
val knownNotary = serviceHub.identityService.wellKnownPartyFromAnonymous(notary)
@@ -74,8 +77,9 @@ class DraftAssetSwapBaseFlow(
@StartableByRPC
@InitiatingFlow
class DemoDraftAssetSwapBaseFlow(
- private val transactionId: SecureHash,
- private val outputIndex: Int,
+ private val assetTx: StateRef,
+// private val transactionId: SecureHash,
+// private val outputIndex: Int,
private val recipient: AbstractParty,
private val validator: AbstractParty
) : FlowLogic() {
@@ -93,8 +97,7 @@ class DemoDraftAssetSwapBaseFlow(
return subFlow(
DraftAssetSwapBaseFlow(
- transactionId,
- outputIndex,
+ assetTx,
recipient,
notary,
listOf(validator),
diff --git a/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/main/kotlin/com/interop/flows/UnlockAssetFlow.kt b/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/main/kotlin/com/interop/flows/UnlockAssetFlow.kt
index dd33d03..1e5bc46 100644
--- a/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/main/kotlin/com/interop/flows/UnlockAssetFlow.kt
+++ b/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/main/kotlin/com/interop/flows/UnlockAssetFlow.kt
@@ -20,8 +20,6 @@ import net.corda.core.flows.FlowLogic
import net.corda.core.flows.InitiatingFlow
import net.corda.core.flows.StartableByRPC
import net.corda.core.transactions.SignedTransaction
-import net.corda.core.utilities.ProgressTracker
-import net.corda.core.utilities.loggerFor
import org.web3j.rlp.RlpEncoder
import org.web3j.rlp.RlpString
import org.web3j.utils.Numeric
diff --git a/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/test/kotlin/com/interop/flows/SignaturesThresholdTests.kt b/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/test/kotlin/com/interop/flows/SignaturesThresholdTests.kt
index e15c7a2..0dd029e 100644
--- a/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/test/kotlin/com/interop/flows/SignaturesThresholdTests.kt
+++ b/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/test/kotlin/com/interop/flows/SignaturesThresholdTests.kt
@@ -29,7 +29,7 @@ class SignaturesThresholdTests : TestNetSetup() {
// Create Corda asset owned by Bob
val assetTx = runFlow(bob, IssueGenericAssetFlow(assetName))
- val draftTxHash = runFlow(bob, DemoDraftAssetSwapBaseFlow(assetTx.txhash, assetTx.index, alice.toParty(), charlie.toParty()))
+ val draftTxHash = runFlow(bob, DemoDraftAssetSwapBaseFlow(assetTx, alice.toParty(), charlie.toParty()))
val stx = runFlow(bob, SignDraftTransactionByIDFlow(draftTxHash))
@@ -51,8 +51,7 @@ class SignaturesThresholdTests : TestNetSetup() {
val assetTx = runFlow(bob, IssueGenericAssetFlow(assetName))
val draftTxHash = runFlow(bob, DraftAssetSwapBaseFlow(
- transactionId = assetTx.txhash,
- outputIndex = assetTx.index,
+ assetTx = assetTx,
recipient = alice.toParty(),
notary = alice.services.networkMapCache.notaryIdentities.first(),
validators = listOf(charlie.toParty() as AbstractParty, bob.toParty() as AbstractParty),
@@ -80,8 +79,7 @@ class SignaturesThresholdTests : TestNetSetup() {
val assetTx = runFlow(bob, IssueGenericAssetFlow(assetName))
val draftTxHash = runFlow(bob, DraftAssetSwapBaseFlow(
- transactionId = assetTx.txhash,
- outputIndex = assetTx.index,
+ assetTx = assetTx,
recipient = alice.toParty(),
notary = alice.services.networkMapCache.notaryIdentities.first(),
validators = listOf(charlie.toParty() as AbstractParty, bob.toParty() as AbstractParty),
diff --git a/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/test/kotlin/com/interop/flows/SwapTests.kt b/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/test/kotlin/com/interop/flows/SwapTests.kt
index 4b92070..289fc75 100644
--- a/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/test/kotlin/com/interop/flows/SwapTests.kt
+++ b/src/r3/atomic-swap/corda/samples/atomic-swap/swap-workflows/src/test/kotlin/com/interop/flows/SwapTests.kt
@@ -25,8 +25,7 @@ class SwapTests : TestNetSetup() {
val assetTx = runFlow(bob, IssueGenericAssetFlow(assetName))
val draftTxHash = runFlow(bob, DraftAssetSwapBaseFlow(
- assetTx.txhash,
- assetTx.index,
+ assetTx = assetTx,
alice.toParty(),
alice.services.networkMapCache.notaryIdentities.first(),
listOf(charlie.toParty() as AbstractParty, bob.toParty() as AbstractParty),
diff --git a/src/r3/atomic-swap/corda/settings.gradle b/src/r3/atomic-swap/corda/settings.gradle
index bf45136..bc4c626 100644
--- a/src/r3/atomic-swap/corda/settings.gradle
+++ b/src/r3/atomic-swap/corda/settings.gradle
@@ -1,4 +1,10 @@
+plugins {
+ id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
include 'evm-interop-common'
include 'evm-interop-contracts'
include 'evm-interop-workflows'
-include 'samples:atomic-swap:swap-workflows'
\ No newline at end of file
+include 'samples:atomic-swap:swap-workflows'
+include 'client'
+include 'client'
+