Merge pull request #509 from EYBlockchain/westlad/ercaddress-removal

remove ERC addresses from transfer
EYBlockchain · Feb 23, 2022 · 2ce68f1 · 2ce68f1
2 parents a679011 + f5dd737
commit 2ce68f1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/nightfall-client/src/services/transfer.mjs b/nightfall-client/src/services/transfer.mjs
@@ -31,6 +31,7 @@ const {
   SHIELD_CONTRACT_NAME,
   PROTOCOL,
   USE_STUBS,
+  ZERO,
 } = config;
 const { generalise, GN } = gen;
 
@@ -204,7 +205,7 @@ async function transfer(transferParams) {
     historicRootBlockNumberL2: blockNumberL2s,
     transactionType,
     publicInputs,
-    ercAddress,
+    ercAddress: ZERO, // we don't want to expose the ERC address during a transfer
     commitments: newCommitments,
     nullifiers,
     compressedSecrets,

diff --git a/nightfall-deployer/circuits/double_transfer.zok b/nightfall-deployer/circuits/double_transfer.zok
@@ -43,7 +43,7 @@ struct Secrets {
 }
 
 def main(\
-	field[2] fErcAddress,\
+	private field[2] fErcAddress,\
 	private OldCommitmentPreimage[2] oldCommitment,\
 	private NewCommitmentPreimage[2] newCommitment,\
 	field[2] fNewCommitmentHash,\

diff --git a/nightfall-deployer/circuits/double_transfer_stub.zok b/nightfall-deployer/circuits/double_transfer_stub.zok
@@ -26,7 +26,7 @@ struct Secrets {
 }
 
 def main(\
-	field[2] fErcAddress,\
+	private field[2] fErcAddress,\
 	private OldCommitmentPreimage[2] oldCommitment,\
 	private NewCommitmentPreimage[2] newCommitment,\
 	field[2] fNewCommitmentHash,\

diff --git a/nightfall-deployer/circuits/single_transfer.zok b/nightfall-deployer/circuits/single_transfer.zok
@@ -43,7 +43,7 @@ struct Secrets {
 }
 
 def main(\
-	field fErcAddress,\
+	private field fErcAddress,\
 	private OldCommitmentPreimage oldCommitment,\
 	private NewCommitmentPreimage newCommitment,\
 	field fNewCommitmentHash,\

diff --git a/nightfall-deployer/circuits/single_transfer_stub.zok b/nightfall-deployer/circuits/single_transfer_stub.zok
@@ -25,7 +25,7 @@ struct Secrets {
 }
 
 def main(\
-	field fErcAddress,\
+	private field fErcAddress,\
 	private OldCommitmentPreimage oldCommitment,\
 	private NewCommitmentPreimage newCommitment,\
 	field fNewCommitmentHash,\

diff --git a/nightfall-optimist/src/services/transaction-checker.mjs b/nightfall-optimist/src/services/transaction-checker.mjs
@@ -66,7 +66,7 @@ async function checkTransactionType(transaction) {
       if (
         transaction.tokenId !== ZERO ||
         Number(transaction.value) !== 0 ||
-        transaction.ercAddress === ZERO ||
+        transaction.ercAddress !== ZERO ||
         transaction.recipientAddress !== ZERO ||
         transaction.commitments[0] === ZERO ||
         transaction.commitments[1] !== ZERO ||
@@ -87,7 +87,7 @@ async function checkTransactionType(transaction) {
       if (
         transaction.tokenId !== ZERO ||
         Number(transaction.value) !== 0 ||
-        transaction.ercAddress === ZERO ||
+        transaction.ercAddress !== ZERO ||
         transaction.recipientAddress !== ZERO ||
         transaction.commitments.some(c => c === ZERO) ||
         transaction.commitments.length !== 2 ||
@@ -173,7 +173,7 @@ async function verifyProof(transaction) {
       break;
     case 1: // single transfer transaction
       inputs = new PublicInputs([
-        transaction.ercAddress,
+        // transaction.ercAddress,
         transaction.commitments[0], // not truncating here as we already ensured hash < group order
         generalise(transaction.nullifiers[0]).hex(32, 31),
         historicRootFirst.root,
@@ -184,8 +184,8 @@ async function verifyProof(transaction) {
       break;
     case 2: // double transfer transaction
       inputs = new PublicInputs([
-        transaction.ercAddress, // this is correct; ercAddress appears twice
-        transaction.ercAddress, // in a double-transfer public input hash
+        // transaction.ercAddress, // this is correct; ercAddress appears twice
+        // transaction.ercAddress, // in a double-transfer public input hash
         transaction.commitments, // not truncating here as we already ensured hash < group order
         transaction.nullifiers.map(nullifier => generalise(nullifier).hex(32, 31)),
         historicRootFirst.root,