Merge pull request #207 from dhinakaran2705/main

dhinakaran2705 · web-flow · commit 3a335e8c5ace · 2022-04-18T17:16:26.000+05:30
Besu asset exchange now works with any 32 byte secret preimage
diff --git a/common/protos-java-kt/gradle.properties b/common/protos-java-kt/gradle.properties
@@ -1,4 +1,4 @@
 name=Interop Protos
 group=com.weaver
-version=1.2.4-alpha.8
+version=1.2.4-alpha.9
 kotlin.incremental=false
diff --git a/core/network/besu/contracts/interop/manageAsset.sol b/core/network/besu/contracts/interop/manageAsset.sol
@@ -40,7 +40,7 @@ contract InteroperationBaseClassERC20 {
 		address indexed receiver,
 		bytes32 indexed lockContractId,
 		bytes32 hashLock,
-		bytes32 preimage
+		string preimage
     	);
 
 	event Unlock(
@@ -109,7 +109,7 @@ contract InteroperationBaseClassERC20 {
 
 
 	// The receiver claims the ownership of an asset locked for them once they obtain the preimage of the hashlock
-	function claimFungibleAsset(bytes32 lockContractId, bytes32 preimage)
+	function claimFungibleAsset(bytes32 lockContractId, string memory preimage)
 		external
 		returns (bool)
 	{
diff --git a/core/network/corda-interop-app/gradle.properties b/core/network/corda-interop-app/gradle.properties
@@ -1,4 +1,4 @@
 name=Interoperability CorDapp
 group=com.weaver.corda.app.interop
-version=1.2.4-alpha.8
+version=1.2.4-alpha.9
 kotlin.incremental=false
diff --git a/docs/docs/external/getting-started/test-network/overview.md b/docs/docs/external/getting-started/test-network/overview.md
@@ -12,14 +12,18 @@ title: Component Overview
 Weaver offers a basic test network launching capability, both to demonstrate interoperation modes and to serve as a testbed for development and prototyping. Different modes (or scenarios) require different sets of components, but collectively you will need to run the following:
 
 - [Fabric testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/fabric/dev) - A pair of basic Fabric networks for testing interop flows
-- [Corda testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/corda) - A basic Corda network for testing interop flows
+- [Corda testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/corda) - A pair of basic Corda networks for testing interop flows
+- [Besu testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/besu) - A pair of basic Besu networks for testing interop flows
 - [Relay](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/relay) - The server module and protocol for cross-DLT interoperability. An instance of this is needed for every Fabric and Corda network
 - [Fabric driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/drivers/fabric-driver) - Driver used by the Fabric networks relay to communicate with the Fabric testnet
 - [Corda driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/drivers/corda-driver) - Driver used by the Corda networks relay to communicate with the Corda testnet
+- [Fabric Interop chaincode](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/network/fabric-interop-cc) - The Fabric interoperability contracts handle the dual process of servicing requests for views from external networks, and verifying requested views for integrity
 - [Corda interop app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/network/corda-interop-app) CorDapp used to handle interop duties between the relay and the application
-- [Corda client app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/corda/corda-simple-application) - CorDapp and client used to trigger interop flows initiated from the Corda side and to manage Corda state
+- [Besu interop contract](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/network/besu/contracts/interop) Solidity smart contract(s) used to handle interop duties for a Besu network
 - [Fabric client](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/fabric/fabric-cli) - Fabric client used to trigger interop flows initiated from the Fabric side and to manage Fabric state
-- [Fabric Interop chaincode](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/network/fabric-interop-cc) - The Fabric interoperability contracts handle the dual process of servicing requests for views from external networks, and verifying requested views for integrity
+- [Corda client app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/corda/corda-simple-application) - CorDapp and client used to trigger interop flows initiated from the Corda side and to manage Corda state
+- [Besu sample application](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/besu/simpleasset) - A sample application for asset exchange across two besu networks using HTLC
+- [Besu client app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/besu/besu-cli) - Besu client used to interact with the contracts deployed on the Besu testnet
 
 You can launch these components in one of several different ways:
 * **Setup with Locally Built Weaver Components**:
diff --git a/samples/besu/besu-cli/readme.md b/samples/besu/besu-cli/readme.md
@@ -44,7 +44,7 @@ besu-cli asset lock --network=network1 --sender_account=1 --recipient_account=2
 A random preimage and its corresponding hash will be generated and the preimage will be output, along with the lockContractID, to be used during Claim.
 - asset claim: Claim assets (fungible assets for now)
 ```
-besu-cli asset claim --network=network1 --lock_contract_id=lockContractID --recipient_account=2 --preimage_base64=preimage
+besu-cli asset claim --network=network1 --lock_contract_id=lockContractID --recipient_account=2 --preimage=preimage
 ```
 - asset unlock: Unlock and reclaim assets after timeout (fungible assets for now)
 ```
diff --git a/samples/besu/besu-cli/src/commands/asset/claim.ts b/samples/besu/besu-cli/src/commands/asset/claim.ts
@@ -16,8 +16,8 @@ const command: GluegunCommand = {
 			commandHelp(
 				print,
 				toolbox,
-				`besu-cli asset claim --network=network1 --lock_contract_id=lockContractID --recipient_account=2 --preimage_base64=preimage`,
-				'besu-cli asset claim --network=<network1|network2> --lock_contract_id=<lockContractID> --recipient_account=<2|1> --preimage_base64=<preimage>',
+				`besu-cli asset claim --network=network1 --lock_contract_id=lockContractID --recipient_account=2 --preimage=preimage`,
+				'besu-cli asset claim --network=<network1|network2> --lock_contract_id=<lockContractID> --recipient_account=<2|1> --preimage=<preimage>',
 				[
 					{
 						name: '--network',
@@ -35,9 +35,9 @@ const command: GluegunCommand = {
 							'The index of the account of the recipient of the asset from the list obtained through web3.eth.getAccounts(). For example, we can set Alice as accounts[1] and hence value of this parameter for Alice can be 1.'
 					},
 					{
-						name: '--preimage_base64',
+						name: '--preimage',
 						description:
-							'The preimage of hash with which the asset was locked with. Input format supported: base64.'
+							'The preimage of hash with which the asset was locked with.'
 					}
 				],
 				command,
@@ -76,26 +76,26 @@ const command: GluegunCommand = {
 			print.error('Lock contract ID not provided.')
 			return
 		}
-		const lockContractId = options.lock_contract_id
-		if(!options.preimage_base64){
+		const lockContractId = '0x' + options.lock_contract_id
+		if(!options.preimage){
 			print.error('Preimage not provided.')
 			return
 		}
-		const preimage_base64 = options.preimage_base64
-		const preimage = Buffer.from(preimage_base64, 'base64')
-		console.log('Length of preimage:', preimage.length)	
 
 		console.log('Parameters')
 		console.log('networkConfig', networkConfig)
 		console.log('Receiver', recipient)
 		console.log('Lock Contract ID', lockContractId)
-		console.log('Preimage', preimage)
+		console.log('Preimage', options.preimage)
+
+		const preimage_bytes32 = web3N.utils.utf8ToHex(options.preimage)
+		console.log('Preimage bytes32:', preimage_bytes32)	
 
 		// Balance of the recipient before claiming
 		var recipientBalance = await tokenContract.balanceOf(recipient)
 		console.log(`Account balance of the recipient in Network ${options.network} before claiming: ${recipientBalance.toString()}`)
 
-		await interopContract.claimFungibleAsset(lockContractId, preimage, {
+		await interopContract.claimFungibleAsset(lockContractId, options.preimage, {
 			from: recipient,
 		}).catch((error) => {
 			console.log("claimFungibleAsset threw an error:", error);
diff --git a/samples/besu/besu-cli/src/commands/asset/is-locked.ts b/samples/besu/besu-cli/src/commands/asset/is-locked.ts
@@ -41,23 +41,24 @@ const command: GluegunCommand = {
 			print.error('Lock contract ID not provided.')
 			return
 		}
+		const lockContractId = '0x' + options.lock_contract_id
 
 		console.log('Parameters')
 		console.log('networkConfig', networkConfig)
-		console.log('Lock Contract ID', options.lock_contract_id)
+		console.log('Lock Contract ID', lockContractId)
 		
 		const provider = new Web3.providers.HttpProvider('http://'+networkConfig.networkHost+':'+networkConfig.networkPort)
 		const web3N = new Web3(provider)
 		const interopContract = await getContractInstance(provider, networkConfig.interopContract)	
 		const accounts = await web3N.eth.getAccounts()
 		var sender = accounts[networkConfig.senderAccountIndex]
 
-		var isLocked = await interopContract.isFungibleAssetLocked(options.lock_contract_id, {
+		var isLocked = await interopContract.isFungibleAssetLocked(lockContractId, {
 			from: sender
 		}).catch(function () {
 			console.log("isFungibleAssetLocked threw an error");
 		})
-		console.log(`Is there an asset locked in ${options.lock_contract_id} in Network ${options.network}: ${isLocked}`) //Todo: Debug. isLocked is not printing correctly.
+		console.log(`Is there an asset locked in ${lockContractId} in Network ${options.network}: ${isLocked}`) //Todo: Debug. isLocked is not printing correctly.
 	}
 }
 
diff --git a/samples/besu/besu-cli/src/commands/asset/lock.ts b/samples/besu/besu-cli/src/commands/asset/lock.ts
@@ -18,7 +18,7 @@ const command: GluegunCommand = {
 				print,
 				toolbox,
 				`besu-cli asset lock --network=network1 --sender_account=1 --recipient_account=2 --amount=5 --timeout=1000`,
-				'besu-cli asset lock --network=<network1|network2> --sender_account=<1|2> --recipient_account=<2|1> --amount=<lock-amount> --timeout=<lock-duration-seconds> --hash=<hashLock-optional-parameter>',
+				'besu-cli asset lock --network=<network1|network2> --sender_account=<1|2> --recipient_account=<2|1> --amount=<lock-amount> --timeout=<lock-duration-seconds> --hash_base64=<hashLock-optional-parameter>',
 				[
 					{
 						name: '--network',
@@ -105,15 +105,16 @@ const command: GluegunCommand = {
 		var hash
 		var preimage
 		var hash_base64
-		var preimage_base64
+		var preimage_bytes
 		if(options.hash_base64){
 			hash_base64 = options.hash_base64
 		}
 		else{
 			// Generate a hash pair if not provided as an input parameter
-			preimage_base64 = crypto.randomBytes(32).toString('base64')
-			preimage = Buffer.from(preimage_base64, 'base64')
+			preimage = crypto.randomBytes(22).toString('base64')
 			hash_base64 = crypto.createHash('sha256').update(preimage).digest('base64')
+			preimage_bytes = Buffer.from(preimage)
+			console.log('Length of preimage byte array', preimage_bytes.length)
 		}
 		hash = Buffer.from(hash_base64, 'base64')
 		
@@ -124,7 +125,7 @@ const command: GluegunCommand = {
 		console.log('Amount', options.amount)
 		console.log('Timeout', timeLock)
 		console.log('Hash (base64): ', hash_base64)
-		console.log('Preimage (base64): ', preimage_base64)
+		console.log('Preimage: ', preimage)
 
 		// Balances of sender and receiver before locking
 		console.log(`Account balances before locking`)
@@ -150,7 +151,7 @@ const command: GluegunCommand = {
 			console.log("lockFungibleAsset threw an error");
 		})
 		const lockContractId = lockTx.logs[0].args.lockContractId
-		console.log(`Lock contract ID: ${lockContractId}`)
+		console.log(`Lock contract ID: ${lockContractId.toString().substring(2)}`)
 
 		// Balances of sender and receiver after locking
 		console.log(`Account balances after locking`)
diff --git a/samples/besu/besu-cli/src/commands/asset/unlock.ts b/samples/besu/besu-cli/src/commands/asset/unlock.ts
@@ -71,7 +71,7 @@ const command: GluegunCommand = {
 			print.error('Lock contract ID not provided.')
 			return
 		}
-		const lockContractId = options.lock_contract_id
+		const lockContractId = '0x' + options.lock_contract_id
 
 		console.log('Paramters')
 		console.log('networkConfig', networkConfig)
diff --git a/samples/corda/corda-simple-application/constants.properties b/samples/corda/corda-simple-application/constants.properties
@@ -9,4 +9,4 @@ log4jVersion =2.16.0
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
-weaverVersion=1.2.4-alpha.8
+weaverVersion=1.2.4-alpha.9
diff --git a/samples/corda/fungible-house-token/build.gradle b/samples/corda/fungible-house-token/build.gradle
@@ -18,7 +18,7 @@ buildscript {
         //TokenSDK
         tokens_release_group = 'com.r3.corda.lib.tokens'
         tokens_release_version = '1.2'
-        weaver_version = '1.2.4-alpha.8'
+        weaver_version = '1.2.4-alpha.9'
     }
 
     repositories {
diff --git a/sdks/corda/build.gradle b/sdks/corda/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     ext.corda_gradle_plugins_version = "5.0.12"
     ext.log4j_version = "2.16.0"
     ext.slf4j_version = "1.7.25"
-    ext.weaver_version = "1.2.4-alpha.8"
+    ext.weaver_version = "1.2.4-alpha.9"
     
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/sdks/corda/gradle.properties b/sdks/corda/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
 name=weaver-corda-sdk
 group=com.weaver.corda.sdk
-version=1.2.4-alpha.8
+version=1.2.4-alpha.9
 kotlin.incremental=false
diff --git a/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/CredentialsCreator.kt b/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/CredentialsCreator.kt
@@ -51,9 +51,9 @@ class CredentialsCreator(
         val jsonConfig = JSONObject(config)
         for (i in 0..nodes.size-1) {
             val node0Json = jsonConfig.getJSONObject(nodes[i])
-            val root_cert = Base64.getDecoder().decode(node0Json.getJSONArray("root_certs").getString(i)).toString(Charsets.UTF_8)
-            val doorman_cert = Base64.getDecoder().decode(node0Json.getJSONArray("doorman_certs").getString(i)).toString(Charsets.UTF_8)
-            val nodeca_cert = Base64.getDecoder().decode(node0Json.getJSONArray("nodeca_certs").getString(i)).toString(Charsets.UTF_8)
+            val root_cert = Base64.getDecoder().decode(node0Json.getJSONArray("root_certs").getString(0)).toString(Charsets.UTF_8)
+            val doorman_cert = Base64.getDecoder().decode(node0Json.getJSONArray("doorman_certs").getString(0)).toString(Charsets.UTF_8)
+            val nodeca_cert = Base64.getDecoder().decode(node0Json.getJSONArray("nodeca_certs").getString(0)).toString(Charsets.UTF_8)
             
             // Initialising class variables
             this.nodeid_cert += mapOf(nodes[i] to Base64.getDecoder().decode(node0Json.getJSONArray("nodeid_cert").getString(0)).toString(Charsets.UTF_8))
@@ -117,4 +117,4 @@ class CredentialsCreator(
                 .addAllIdentifiers(listOf(identifierProto))
                 .build()
     }
-}
+}
diff --git a/tests/network-setups/corda/scripts/get-cordapps.sh b/tests/network-setups/corda/scripts/get-cordapps.sh
@@ -3,7 +3,7 @@
 directory=$(dirname $0)
 app=${1:-simple}
 local=$2
-weaverVersion="1.2.4-alpha.8"
+weaverVersion="1.2.4-alpha.9"
 
 if [ "simple" = "$app" ]; then
   cordappPath=$directory/../../../../samples/corda/corda-simple-application
diff --git a/tests/network-setups/corda/scripts/start-nodes.sh b/tests/network-setups/corda/scripts/start-nodes.sh
@@ -9,7 +9,7 @@ simpleAppVersion="0.4"
 houseTokenAppVersion="1.0"
 tokenVersion="1.2"
 
-weaverVersion="1.2.4-alpha.8"
+weaverVersion="1.2.4-alpha.9"
 
 parties="Notary PartyA PartyB PartyC"
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ const command: GluegunCommand = {`
`71`	`71`	`print.error('Lock contract ID not provided.')`
`72`	`72`	`return`
`73`	`73`	`}`
`74`		`- const lockContractId = options.lock_contract_id`
	`74`	`+ const lockContractId = '0x' + options.lock_contract_id`
`75`	`75`
`76`	`76`	`console.log('Paramters')`
`77`	`77`	`console.log('networkConfig', networkConfig)`