Re-order initialize() args to match the deployed scripts

Signed-off-by: Jim Zhang <jim.zhang@kaleido.io>
hyperledger-labs · Aug 30, 2024 · 36d397c · 36d397c
1 parent cda7682
commit 36d397c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/solidity/contracts/factory.sol b/solidity/contracts/factory.sol
@@ -56,9 +56,9 @@ contract ZetoTokenFactory {
         );
         (IZetoFungibleInitializable(instance)).initialize(
             initialOwner,
+            args.verifier,
             args.depositVerifier,
-            args.withdrawVerifier,
-            args.verifier
+            args.withdrawVerifier
         );
         emit ZetoTokenDeployed(instance);
         return instance;

diff --git a/solidity/contracts/zeto_anon.sol b/solidity/contracts/zeto_anon.sol
@@ -39,9 +39,9 @@ contract Zeto_Anon is ZetoBase, ZetoFungibleWithdraw, UUPSUpgradeable {
 
     function initialize(
         address initialOwner,
+        Groth16Verifier_Anon _verifier,
         Groth16Verifier_CheckHashesValue _depositVerifier,
-        Groth16Verifier_CheckInputsOutputsValue _withdrawVerifier,
-        Groth16Verifier_Anon _verifier
+        Groth16Verifier_CheckInputsOutputsValue _withdrawVerifier
     ) public initializer {
         __ZetoBase_init(initialOwner);
         __ZetoFungibleWithdraw_init(_depositVerifier, _withdrawVerifier);

diff --git a/solidity/contracts/zeto_anon_enc.sol b/solidity/contracts/zeto_anon_enc.sol
@@ -41,9 +41,9 @@ contract Zeto_AnonEnc is ZetoBase, ZetoFungibleWithdraw, UUPSUpgradeable {
 
     function initialize(
         address initialOwner,
+        Groth16Verifier_AnonEnc _verifier,
         Groth16Verifier_CheckHashesValue _depositVerifier,
-        Groth16Verifier_CheckInputsOutputsValue _withdrawVerifier,
-        Groth16Verifier_AnonEnc _verifier
+        Groth16Verifier_CheckInputsOutputsValue _withdrawVerifier
     ) public initializer {
         __ZetoBase_init(initialOwner);
         __ZetoFungibleWithdraw_init(_depositVerifier, _withdrawVerifier);

diff --git a/solidity/contracts/zeto_anon_enc_nullifier.sol b/solidity/contracts/zeto_anon_enc_nullifier.sol
@@ -43,9 +43,9 @@ contract Zeto_AnonEncNullifier is
 
     function initialize(
         address initialOwner,
+        Groth16Verifier_AnonEncNullifier _verifier,
         Groth16Verifier_CheckHashesValue _depositVerifier,
-        Groth16Verifier_CheckNullifierValue _withdrawVerifier,
-        Groth16Verifier_AnonEncNullifier _verifier
+        Groth16Verifier_CheckNullifierValue _withdrawVerifier
     ) public initializer {
         __ZetoNullifier_init(initialOwner);
         __ZetoFungibleWithdrawWithNullifiers_init(

diff --git a/solidity/contracts/zeto_anon_enc_nullifier_non_repudiation.sol b/solidity/contracts/zeto_anon_enc_nullifier_non_repudiation.sol
@@ -55,9 +55,9 @@ contract Zeto_AnonEncNullifierNonRepudiation is
 
     function initialize(
         address initialOwner,
+        Groth16Verifier_AnonEncNullifierNonRepudiation _verifier,
         Groth16Verifier_CheckHashesValue _depositVerifier,
-        Groth16Verifier_CheckNullifierValue _withdrawVerifier,
-        Groth16Verifier_AnonEncNullifierNonRepudiation _verifier
+        Groth16Verifier_CheckNullifierValue _withdrawVerifier
     ) public initializer {
         __ZetoNullifier_init(initialOwner);
         __ZetoFungibleWithdrawWithNullifiers_init(

diff --git a/solidity/contracts/zeto_anon_nullifier.sol b/solidity/contracts/zeto_anon_nullifier.sol
@@ -47,9 +47,9 @@ contract Zeto_AnonNullifier is
 
     function initialize(
         address initialOwner,
+        Groth16Verifier_AnonNullifier _verifier,
         Groth16Verifier_CheckHashesValue _depositVerifier,
-        Groth16Verifier_CheckNullifierValue _withdrawVerifier,
-        Groth16Verifier_AnonNullifier _verifier
+        Groth16Verifier_CheckNullifierValue _withdrawVerifier
     ) public initializer {
         __ZetoNullifier_init(initialOwner);
         __ZetoFungibleWithdrawWithNullifiers_init(

diff --git a/solidity/contracts/zeto_anon_nullifier_kyc.sol b/solidity/contracts/zeto_anon_nullifier_kyc.sol
@@ -48,9 +48,9 @@ contract Zeto_AnonNullifierKyc is
 
     function initialize(
         address initialOwner,
+        Groth16Verifier_AnonNullifierKyc _verifier,
         Groth16Verifier_CheckHashesValue _depositVerifier,
-        Groth16Verifier_CheckNullifierValue _withdrawVerifier,
-        Groth16Verifier_AnonNullifierKyc _verifier
+        Groth16Verifier_CheckNullifierValue _withdrawVerifier
     ) public initializer {
         __Registry_init();
         __ZetoNullifier_init(initialOwner);