Add "data" parameter to transfer methods/events

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>

solidity/contracts/lib/interfaces/izeto.sol

@@ -21,6 +21,7 @@ interface IZeto is IZetoBase {
     event UTXOTransfer(
         uint256[] inputs,
         uint256[] outputs,
-        address indexed submitter
+        address indexed submitter,
+        bytes data
     );
 }

solidity/contracts/zeto_anon.sol

@@ -63,7 +63,8 @@ contract Zeto_Anon is IZeto, ZetoBase, ZetoFungibleWithdraw, UUPSUpgradeable {
     function transfer(
         uint256[2] memory inputs,
         uint256[2] memory outputs,
-        Commonlib.Proof calldata proof
+        Commonlib.Proof calldata proof,
+        bytes calldata data
     ) public returns (bool) {
         require(
             validateTransactionProposal(inputs, outputs, proof),
@@ -91,7 +92,7 @@ contract Zeto_Anon is IZeto, ZetoBase, ZetoFungibleWithdraw, UUPSUpgradeable {
             inputArray[i] = inputs[i];
             outputArray[i] = outputs[i];
         }
-        emit UTXOTransfer(inputArray, outputArray, msg.sender);
+        emit UTXOTransfer(inputArray, outputArray, msg.sender, data);
 
         return true;
     }

solidity/contracts/zeto_anon_nullifier.sol

@@ -77,7 +77,8 @@ contract Zeto_AnonNullifier is
         uint256[2] memory nullifiers,
         uint256[2] memory outputs,
         uint256 root,
-        Commonlib.Proof calldata proof
+        Commonlib.Proof calldata proof,
+        bytes calldata data
     ) public returns (bool) {
         require(
             validateTransactionProposal(nullifiers, outputs, root),
@@ -108,7 +109,7 @@ contract Zeto_AnonNullifier is
             nullifierArray[i] = nullifiers[i];
             outputArray[i] = outputs[i];
         }
-        emit UTXOTransfer(nullifierArray, outputArray, msg.sender);
+        emit UTXOTransfer(nullifierArray, outputArray, msg.sender, data);
         return true;
     }
 

solidity/contracts/zeto_anon_nullifier_kyc.sol

@@ -83,7 +83,8 @@ contract Zeto_AnonNullifierKyc is
         uint256[2] memory nullifiers,
         uint256[2] memory outputs,
         uint256 root,
-        Commonlib.Proof calldata proof
+        Commonlib.Proof calldata proof,
+        bytes calldata data
     ) public returns (bool) {
         require(
             validateTransactionProposal(nullifiers, outputs, root),
@@ -115,7 +116,7 @@ contract Zeto_AnonNullifierKyc is
             nullifierArray[i] = nullifiers[i];
             outputArray[i] = outputs[i];
         }
-        emit UTXOTransfer(nullifierArray, outputArray, msg.sender);
+        emit UTXOTransfer(nullifierArray, outputArray, msg.sender, data);
         return true;
     }
 

solidity/contracts/zeto_nf_anon.sol

@@ -55,7 +55,8 @@ contract Zeto_NfAnon is IZeto, ZetoBase, UUPSUpgradeable {
     function transfer(
         uint256 input,
         uint256 output,
-        Commonlib.Proof calldata proof
+        Commonlib.Proof calldata proof,
+        bytes calldata data
     ) public returns (bool) {
         require(
             validateTransactionProposal([input, 0], [output, 0], proof),
@@ -81,7 +82,7 @@ contract Zeto_NfAnon is IZeto, ZetoBase, UUPSUpgradeable {
         inputArray[0] = input;
         outputArray[0] = output;
 
-        emit UTXOTransfer(inputArray, outputArray, msg.sender);
+        emit UTXOTransfer(inputArray, outputArray, msg.sender, data);
         return true;
     }
 

solidity/contracts/zeto_nf_anon_nullifier.sol

@@ -63,7 +63,8 @@ contract Zeto_NfAnonNullifier is IZeto, ZetoNullifier, UUPSUpgradeable {
         uint256 nullifier,
         uint256 output,
         uint256 root,
-        Commonlib.Proof calldata proof
+        Commonlib.Proof calldata proof,
+        bytes calldata data
     ) public returns (bool) {
         require(
             validateTransactionProposal([nullifier, 0], [output, 0], root),
@@ -89,7 +90,7 @@ contract Zeto_NfAnonNullifier is IZeto, ZetoNullifier, UUPSUpgradeable {
         nullifierArray[0] = nullifier;
         outputArray[0] = output;
 
-        emit UTXOTransfer(nullifierArray, outputArray, msg.sender);
+        emit UTXOTransfer(nullifierArray, outputArray, msg.sender, data);
         return true;
     }
 

solidity/contracts/zkDvP.sol

@@ -220,15 +220,17 @@ contract zkDvP {
                 paymentToken.transfer(
                     trade.paymentInputs,
                     trade.paymentOutputs,
-                    trade.paymentProof
+                    trade.paymentProof,
+                    ""
                 ),
                 "Payment branch of the trade failed"
             );
             require(
                 assetToken.transfer(
                     trade.assetInput,
                     trade.assetOutput,
-                    trade.assetProof
+                    trade.assetProof,
+                    ""
                 ),
                 "Asset branch of the trade failed"
             );

solidity/test/zeto_anon.ts

@@ -221,7 +221,9 @@ describe("Zeto based fungible token with anonymity without encryption or nullifi
     encodedProof: any
   ) {
     const signerAddress = await signer.signer.getAddress();
-    const tx = await zeto.connect(signer.signer).transfer(inputCommitments, outputCommitments, encodedProof);
+    const tx = await zeto
+      .connect(signer.signer)
+      .transfer(inputCommitments, outputCommitments, encodedProof, "0x");
     const results = await tx.wait();
     console.log(`Method transfer() complete. Gas used: ${results?.gasUsed}`);
 

solidity/test/zeto_anon_nullifier.ts

@@ -404,7 +404,9 @@ describe("Zeto based fungible token with anonymity using nullifiers without encr
     encodedProof: any
   ) {
     const startTx = Date.now();
-    const tx = await zeto.connect(signer.signer).transfer(nullifiers, outputCommitments, root, encodedProof);
+    const tx = await zeto
+      .connect(signer.signer)
+      .transfer(nullifiers, outputCommitments, root, encodedProof, "0x");
     const results: ContractTransactionReceipt | null = await tx.wait();
     console.log(`Time to execute transaction: ${Date.now() - startTx}ms. Gas used: ${results?.gasUsed}`);
     return results;

solidity/test/zeto_anon_nullifier_kyc.ts

@@ -582,7 +582,9 @@ describe("Zeto based fungible token with anonymity, KYC, using nullifiers withou
     encodedProof: any
   ) {
     const startTx = Date.now();
-    const tx = await zeto.connect(signer.signer).transfer(nullifiers, outputCommitments, root, encodedProof);
+    const tx = await zeto
+      .connect(signer.signer)
+      .transfer(nullifiers, outputCommitments, root, encodedProof, "0x");
     const results: ContractTransactionReceipt | null = await tx.wait();
     console.log(`Time to execute transaction: ${Date.now() - startTx}ms. Gas used: ${results?.gasUsed}`);
     return results;

solidity/test/zeto_nf_anon.ts

@@ -126,7 +126,9 @@ describe("Zeto based non-fungible token with anonymity without encryption or nul
     outputCommitment: BigNumberish,
     encodedProof: any
   ) {
-    const tx = await zeto.connect(signer.signer).transfer(inputCommitment, outputCommitment, encodedProof);
+    const tx = await zeto
+      .connect(signer.signer)
+      .transfer(inputCommitment, outputCommitment, encodedProof, "0x");
     const results = await tx.wait();
     console.log(`Method transfer() complete. Gas used: ${results?.gasUsed}`);
 

solidity/test/zeto_nf_anon_nullifier.ts

@@ -264,7 +264,9 @@ describe("Zeto based non-fungible token with anonymity using nullifiers without
     encodedProof: any
   ) {
     const startTx = Date.now();
-    const tx = await zeto.connect(signer.signer).transfer(nullifier, outputCommitment, root, encodedProof);
+    const tx = await zeto
+      .connect(signer.signer)
+      .transfer(nullifier, outputCommitment, root, encodedProof, "0x");
     const results: ContractTransactionReceipt | null = await tx.wait();
     console.log(`Time to execute transaction: ${Date.now() - startTx}ms. Gas used: ${results?.gasUsed}`);
     return results;