Merge pull request #38 from multiversx/merge-proxy-into-safe

merge proxy into safe
multiversx · Aug 1, 2024 · 0890e87 · 0890e87
2 parents 7a9afde + 74faf4e
commit 0890e87
Show file tree

Hide file tree

Showing 19 changed files with 10,610 additions and 8,788 deletions.
diff --git a/abi/contracts/Bridge/Bridge.abi.json b/abi/contracts/Bridge/Bridge.abi.json
@@ -257,7 +257,7 @@
       },
       {
         "internalType": "bool",
-        "name": "",
+        "name": "isBatchFinal",
         "type": "bool"
       }
     ],
@@ -313,7 +313,7 @@
       },
       {
         "internalType": "bool",
-        "name": "",
+        "name": "areDepositsFinal",
         "type": "bool"
       }
     ],

diff --git a/abi/contracts/Bridge/Bridge.go b/abi/contracts/Bridge/Bridge.go
diff --git a/abi/contracts/Bridge/Bridge.json b/abi/contracts/Bridge/Bridge.json
@@ -261,7 +261,7 @@
         },
         {
           "internalType": "bool",
-          "name": "",
+          "name": "isBatchFinal",
           "type": "bool"
         }
       ],
@@ -317,7 +317,7 @@
         },
         {
           "internalType": "bool",
-          "name": "",
+          "name": "areDepositsFinal",
           "type": "bool"
         }
       ],

diff --git a/abi/contracts/ERC20Safe/ERC20Safe.abi.json b/abi/contracts/ERC20Safe/ERC20Safe.abi.json
@@ -94,6 +94,31 @@
     "name": "ERC20Deposit",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "uint112",
+        "name": "batchId",
+        "type": "uint112"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint112",
+        "name": "depositNonce",
+        "type": "uint112"
+      },
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "callData",
+        "type": "string"
+      }
+    ],
+    "name": "ERC20SCDeposit",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -310,6 +335,34 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "tokenAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "recipientAddress",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "string",
+        "name": "callData",
+        "type": "string"
+      }
+    ],
+    "name": "depositWithSCExecution",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "depositsCount",
@@ -362,7 +415,7 @@
       },
       {
         "internalType": "bool",
-        "name": "",
+        "name": "isBatchFinal",
         "type": "bool"
       }
     ],
@@ -418,7 +471,7 @@
       },
       {
         "internalType": "bool",
-        "name": "",
+        "name": "areDepositsFinal",
         "type": "bool"
       }
     ],

diff --git a/abi/contracts/ERC20Safe/ERC20Safe.go b/abi/contracts/ERC20Safe/ERC20Safe.go
diff --git a/abi/contracts/ERC20Safe/ERC20Safe.hex b/abi/contracts/ERC20Safe/ERC20Safe.hex
diff --git a/abi/contracts/ERC20Safe/ERC20Safe.json b/abi/contracts/ERC20Safe/ERC20Safe.json
diff --git a/abi/contracts/SCExecProxy/SCExecProxy.abi.json b/abi/contracts/SCExecProxy/SCExecProxy.abi.json