Merge pull request #54 from multiversx/merge-3.5-3

Merge 3.5 3
multiversx · Aug 29, 2024 · af5cc52 · af5cc52
2 parents 0890e87 + 5053053
commit af5cc52
Show file tree

Hide file tree

Showing 74 changed files with 3,484 additions and 41,796 deletions.
diff --git a/.yarn/releases/yarn-1.22.22.cjs b/.yarn/releases/yarn-1.22.22.cjs
diff --git a/abi/contracts/Bridge/Bridge.abi.json b/abi/contracts/Bridge/Bridge.abi.json
@@ -1,24 +1,13 @@
 [
   {
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "board",
-        "type": "address[]"
-      },
-      {
-        "internalType": "uint256",
-        "name": "initialQuorum",
-        "type": "uint256"
-      },
-      {
-        "internalType": "contract ERC20Safe",
-        "name": "erc20Safe",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
+    "inputs": [],
+    "name": "InvalidInitialization",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotInitializing",
+    "type": "error"
   },
   {
     "anonymous": false,
@@ -39,6 +28,19 @@
     "name": "AdminRoleTransferred",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint64",
+        "name": "version",
+        "type": "uint64"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -389,6 +391,29 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address[]",
+        "name": "board",
+        "type": "address[]"
+      },
+      {
+        "internalType": "uint256",
+        "name": "initialQuorum",
+        "type": "uint256"
+      },
+      {
+        "internalType": "contract ERC20Safe",
+        "name": "erc20Safe",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/abi/contracts/Bridge/Bridge.go b/abi/contracts/Bridge/Bridge.go
diff --git a/abi/contracts/Bridge/Bridge.hex b/abi/contracts/Bridge/Bridge.hex
diff --git a/abi/contracts/Bridge/Bridge.json b/abi/contracts/Bridge/Bridge.json
diff --git a/abi/contracts/ERC20Safe/ERC20Safe.abi.json b/abi/contracts/ERC20Safe/ERC20Safe.abi.json
@@ -26,6 +26,16 @@
     "name": "FailedInnerCall",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "InvalidInitialization",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotInitializing",
+    "type": "error"
+  },
   {
     "inputs": [
       {
@@ -81,13 +91,13 @@
       {
         "indexed": false,
         "internalType": "uint112",
-        "name": "depositNonce",
+        "name": "batchId",
         "type": "uint112"
       },
       {
         "indexed": false,
         "internalType": "uint112",
-        "name": "batchId",
+        "name": "depositNonce",
         "type": "uint112"
       }
     ],
@@ -111,14 +121,27 @@
       },
       {
         "indexed": false,
-        "internalType": "string",
+        "internalType": "bytes",
         "name": "callData",
-        "type": "string"
+        "type": "bytes"
       }
     ],
     "name": "ERC20SCDeposit",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint64",
+        "name": "version",
+        "type": "uint64"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -353,9 +376,9 @@
         "type": "bytes32"
       },
       {
-        "internalType": "string",
+        "internalType": "bytes",
         "name": "callData",
-        "type": "string"
+        "type": "bytes"
       }
     ],
     "name": "depositWithSCExecution",
@@ -534,6 +557,13 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "isAnyBatchInProgress",

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/MintBurnERC20/MintBurnERC20.abi.json b/abi/contracts/MintBurnERC20/MintBurnERC20.abi.json
@@ -1,25 +1,4 @@
 [
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "symbol",
-        "type": "string"
-      },
-      {
-        "internalType": "uint8",
-        "name": "providedNumDecimals",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
   {
     "inputs": [],
     "name": "AccessControlBadConfirmation",
@@ -138,6 +117,16 @@
     "name": "ERC20InvalidSpender",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "InvalidInitialization",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotInitializing",
+    "type": "error"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -163,6 +152,19 @@
     "name": "Approval",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint64",
+        "name": "version",
+        "type": "uint64"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -461,6 +463,29 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "string",
+        "name": "name",
+        "type": "string"
+      },
+      {
+        "internalType": "string",
+        "name": "symbol",
+        "type": "string"
+      },
+      {
+        "internalType": "uint8",
+        "name": "providedNumDecimals",
+        "type": "uint8"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/abi/contracts/MintBurnERC20/MintBurnERC20.go b/abi/contracts/MintBurnERC20/MintBurnERC20.go
diff --git a/abi/contracts/MintBurnERC20/MintBurnERC20.hex b/abi/contracts/MintBurnERC20/MintBurnERC20.hex
diff --git a/abi/contracts/MintBurnERC20/MintBurnERC20.json b/abi/contracts/MintBurnERC20/MintBurnERC20.json
diff --git a/abi/contracts/Proxy/Proxy.abi.json b/abi/contracts/Proxy/Proxy.abi.json
@@ -0,0 +1,107 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_logic",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "initialOwner",
+        "type": "address"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_data",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "payable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "target",
+        "type": "address"
+      }
+    ],
+    "name": "AddressEmptyCode",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "admin",
+        "type": "address"
+      }
+    ],
+    "name": "ERC1967InvalidAdmin",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "implementation",
+        "type": "address"
+      }
+    ],
+    "name": "ERC1967InvalidImplementation",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "ERC1967NonPayable",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "FailedInnerCall",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "ProxyDeniedAdminAccess",
+    "type": "error"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "previousAdmin",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "newAdmin",
+        "type": "address"
+      }
+    ],
+    "name": "AdminChanged",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "implementation",
+        "type": "address"
+      }
+    ],
+    "name": "Upgraded",
+    "type": "event"
+  },
+  {
+    "stateMutability": "payable",
+    "type": "fallback"
+  }
+]