A version of lock and claim which work when base64 version of the preimage is provided to claim

Signed-off-by: Dhinakaran Vinayagamurthy <[email protected]>

Author: dhinakaran2705

samples/besu/besu-cli/src/commands/asset/claim.ts

@@ -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',
+						name: '--preimage_base64',
 						description:
-							'The preimage of hash with which the asset was locked with.'
+							'The preimage of hash with which the asset was locked with. Input format supported: base64.'
 					}
 				],
 				command,
@@ -77,11 +77,13 @@ const command: GluegunCommand = {
 			return
 		}
 		const lockContractId = options.lock_contract_id
-		if(!options.preimage){
+		if(!options.preimage_base64){
 			print.error('Preimage not provided.')
 			return
 		}
-		const preimage = options.preimage
+		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)
@@ -95,8 +97,8 @@ const command: GluegunCommand = {
 
 		await interopContract.claimFungibleAsset(lockContractId, preimage, {
 			from: recipient,
-		}).catch(function () {
-			console.log("claimFungibleAsset threw an error");
+		}).catch((error) => {
+			console.log("claimFungibleAsset threw an error:", error);
 		})
 
 		// Balance of the recipient after claiming

samples/besu/besu-cli/src/commands/asset/is-locked.ts

@@ -45,12 +45,19 @@ const command: GluegunCommand = {
 		console.log('Parameters')
 		console.log('networkConfig', networkConfig)
 		console.log('Lock Contract ID', options.lock_contract_id)
-
+		
 		const provider = new Web3.providers.HttpProvider('http://'+networkConfig.networkHost+':'+networkConfig.networkPort)
-		const interopContract = await getContractInstance(provider, networkConfig.interopContract)
+		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 = interopContract.isFungibleAssetLocked(options.lock_contract_id)
-		console.log(`Is there an asset locked in ${options.lock_conntract_id} in Network ${options.network}: ${isLocked}`)
+		var isLocked = await interopContract.isFungibleAssetLocked(options.lock_contract_id, {
+			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.
 	}
 }
 

samples/besu/besu-cli/src/commands/asset/lock.ts

@@ -46,7 +46,7 @@ const command: GluegunCommand = {
 							'Time in seconds for which the asset will be locked. The asset will be locked till Date.now() + the timeout provided'
 					},
 					{
-						name: '--hash',
+						name: '--hash_base64',
 						description:
 							'The hash value with which the asset will be locked i.e., providing its pre-image will enable unlocking the asset. This is an optional parameter. If not provided, we will generate a fresh hash pair with a randomly generated pre-image and output the corresponding pre-image.'
 					}
@@ -101,25 +101,30 @@ const command: GluegunCommand = {
 			return
 		}
 		const timeLock = Math.floor(Date.now() / 1000) + options.timeout
+		// The hash input has to be dealt with care. The smart contracts take in bytes as input. But the cli takes in strings as input. So to handle that, we take in the hash in its base64 version as input and then obtain the byte array from this. If a hash is not provided, we generate a base 64 encoding and then generate its corresponding byte array from it. This byte array will be input to generate the hash. 
 		var hash
 		var preimage
-		if(options.hash){
-			hash = options.hash
+		var hash_base64
+		var preimage_base64
+		if(options.hash_base64){
+			hash_base64 = options.hash_base64
 		}
 		else{
 			// Generate a hash pair if not provided as an input parameter
-			preimage = crypto.randomBytes(32)
-			hash = crypto.createHash('sha256').update(preimage).digest()
+			preimage_base64 = crypto.randomBytes(32).toString('base64')
+			preimage = Buffer.from(preimage_base64, 'base64')
+			hash_base64 = crypto.createHash('sha256').update(preimage).digest('base64')
 		}
+		hash = Buffer.from(hash_base64, 'base64')
 
 		console.log('Parameters:')
 		console.log('networkConfig', networkConfig)
 		console.log('Sender', sender)
 		console.log('Receiver', recipient)
 		console.log('Amount', options.amount)
 		console.log('Timeout', timeLock)
-		console.log('Hash: ', hash)
-		console.log('Preimage: ', preimage)
+		console.log('Hash (base64): ', hash_base64)
+		console.log('Preimage (base64): ', preimage_base64)
 
 		// Balances of sender and receiver before locking
 		console.log(`Account balances before locking`)

samples/besu/besu-cli/src/commands/asset/unlock.ts

@@ -36,7 +36,7 @@ const command: GluegunCommand = {
 					}
 				],
 				command,
-				['asset', 'claim']
+				['asset', 'unlock']
 			)
 			return
 		}
@@ -80,7 +80,7 @@ const command: GluegunCommand = {
 
 		// Balance of the recipient before claiming
 		var senderBalance = await tokenContract.balanceOf(sender)
-		console.log(`Account balance of the sender in Network ${options.network} before claiming: ${senderBalance.toString()}`)
+		console.log(`Account balance of the sender in Network ${options.network} before unlocking: ${senderBalance.toString()}`)
 
 		await interopContract.unlockFungibleAsset(lockContractId, {
 			from: sender
@@ -90,7 +90,7 @@ const command: GluegunCommand = {
 
 		// Balance of the recipient after claiming
 		var senderBalance = await tokenContract.balanceOf(sender)
-		console.log(`Account balance of the sender in Network ${options.network} after claiming: ${senderBalance.toString()}`)
+		console.log(`Account balance of the sender in Network ${options.network} after unlocking: ${senderBalance.toString()}`)
 	}
 }