refactor: ito new proxy contract (#3487)

* refactor: ito new proxy contract 1. multi contract 2. some bug fix * chore: rename package name * chore: solve conflict * fix: region ip service broken close #3309 * chore: revert pnpm lock * chore: claim all old ITO * fix: package reference * chore: update changelog * chore: update text * chore: resolve conflict * chore: reply code review
DimensionDev · Jul 15, 2021 · cb3223a · cb3223a
1 parent a8e0077
commit cb3223a
Show file tree

Hide file tree

Showing 37 changed files with 1,215 additions and 822 deletions.
diff --git a/packages/constants/data/ito.json b/packages/constants/data/ito.json
@@ -21,28 +21,39 @@
         "Matic": "",
         "Mumbai": ""
     },
-    "ITO_BSC_POLYGON_CONTRACT_ADDRESS": {
-        "Mainnet": "",
-        "Ropsten": "",
+    "ITO2_CONTRACT_ADDRESS": {
+        "Mainnet": "0xc2CFbF22d6Dc87D0eE18d38d73733524c109Ff46",
+        "Ropsten": "0xBD4c3Cf084B6F4d25430Ee5d44436e860Cc58Ee4",
         "Rinkeby": "",
         "Kovan": "",
         "Gorli": "",
-        "BSC": "0x54a0A221C25Fc0a347EC929cFC5db0be17fA2a2B",
+        "BSC": "0x96c7D011cdFD467f551605f0f5Fce279F86F4186",
         "BSCT": "0x981be454a930479d92C91a0092D204b64845A5D6",
-        "Matic": "0x981be454a930479d92C91a0092D204b64845A5D6",
+        "Matic": "0xF9F7C1496c21bC0180f4B64daBE0754ebFc8A8c0",
         "Mumbai": "0x54a0A221C25Fc0a347EC929cFC5db0be17fA2a2B"
     },
     "DEFAULT_QUALIFICATION_ADDRESS": {
         "Mainnet": "0x81b6ae377e360dcad63611846a2516f4ba8c88ac",
-        "Ropsten": "0x050745919acaa000e5b116b2c499e6f4ed5ce5b6",
+        "Ropsten": "",
         "Rinkeby": "0x88AA0AB3B7cDE263073e1cBa1D06473adeC1b38E",
         "Kovan": "",
         "Gorli": "",
-        "BSC": "0x5B966f3a32Db9C180843bCb40267A66b73E4f022",
+        "BSC": "",
         "BSCT": "0x54a0A221C25Fc0a347EC929cFC5db0be17fA2a2B",
         "Matic": "0x02Ea0720254F7fa4eca7d09A1b9C783F1020EbEF",
         "Mumbai": "0x5B966f3a32Db9C180843bCb40267A66b73E4f022"
     },
+    "DEFAULT_QUALIFICATION2_ADDRESS": {
+        "Mainnet": "0x4dC5f343Fe57E4fbDA1B454d125D396A3181272c",
+        "Ropsten": "0xd5e6434bde165062b3d9572DEFd6393c7B3E2902",
+        "Rinkeby": "",
+        "Kovan": "",
+        "Gorli": "",
+        "BSC": "0xAb7B1bE4233A04e5C43a810E75657ECED8E5463B",
+        "BSCT": "",
+        "Matic": "0x2cf91AD8C175305EBe6970Bd8f81231585EFbd77",
+        "Mumbai": ""
+    },
     "SUBGRAPH_URL": {
         "Mainnet": "https://api.thegraph.com/subgraphs/name/dimensiondev/mask-ito-mainnet",
         "Ropsten": "https://api.thegraph.com/subgraphs/name/dimensiondev/mask-ito",

diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md
@@ -38,6 +38,17 @@ Bsc 0x54a0A221C25Fc0a347EC929cFC5db0be17fA2a2B
 Polygon 0x981be454a930479d92C91a0092D204b64845A5D6
 ```
 
+> Jun-25-2021
+> branch: master
+> commit: e05d299e80c1910fadd90bf021c52ced8b13f891
+
+```plain
+Mainnet 0xc2CFbF22d6Dc87D0eE18d38d73733524c109Ff46
+Ropsten 0xBD4c3Cf084B6F4d25430Ee5d44436e860Cc58Ee4
+Bsc 0x96c7D011cdFD467f551605f0f5Fce279F86F4186
+Polygon 0xF9F7C1496c21bC0180f4B64daBE0754ebFc8A8c0
+```
+
 ## MaskITO
 
 > Feb-21-2021

diff --git a/packages/contracts/abis/BscPolygonITO.json → packages/contracts/abis/ITO2.json b/packages/contracts/abis/BscPolygonITO.json → packages/contracts/abis/ITO2.json
@@ -1,20 +1,15 @@
 [
-    {
-        "inputs": [],
-        "stateMutability": "nonpayable",
-        "type": "constructor"
-    },
     {
         "anonymous": false,
         "inputs": [
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "bytes32",
                 "name": "id",
                 "type": "bytes32"
             },
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "address",
                 "name": "claimer",
                 "type": "address"
@@ -45,13 +40,13 @@
         "anonymous": false,
         "inputs": [
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "bytes32",
                 "name": "id",
                 "type": "bytes32"
             },
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "address",
                 "name": "token_address",
                 "type": "address"
@@ -76,22 +71,22 @@
         "anonymous": false,
         "inputs": [
             {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "total",
-                "type": "uint256"
+                "indexed": true,
+                "internalType": "address",
+                "name": "creator",
+                "type": "address"
             },
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "bytes32",
                 "name": "id",
                 "type": "bytes32"
             },
             {
                 "indexed": false,
-                "internalType": "address",
-                "name": "creator",
-                "type": "address"
+                "internalType": "uint256",
+                "name": "total",
+                "type": "uint256"
             },
             {
                 "indexed": false,
@@ -155,13 +150,13 @@
         "anonymous": false,
         "inputs": [
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "bytes32",
                 "name": "id",
                 "type": "bytes32"
             },
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "address",
                 "name": "swapper",
                 "type": "address"
@@ -204,13 +199,13 @@
         "anonymous": false,
         "inputs": [
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "bytes32",
                 "name": "id",
                 "type": "bytes32"
             },
             {
-                "indexed": false,
+                "indexed": true,
                 "internalType": "address",
                 "name": "token_address",
                 "type": "address"
@@ -225,6 +220,19 @@
         "name": "WithdrawSuccess",
         "type": "event"
     },
+    {
+        "inputs": [],
+        "name": "base_time",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "inputs": [
             {
@@ -368,6 +376,19 @@
         "stateMutability": "payable",
         "type": "function"
     },
+    {
+        "inputs": [
+            {
+                "internalType": "uint64",
+                "name": "_base_time",
+                "type": "uint64"
+            }
+        ],
+        "name": "initialize",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
     {
         "inputs": [
             {
@@ -376,9 +397,9 @@
                 "type": "bytes32"
             },
             {
-                "internalType": "uint256",
+                "internalType": "uint32",
                 "name": "_unlock_time",
-                "type": "uint256"
+                "type": "uint32"
             }
         ],
         "name": "setUnlockTime",
@@ -390,28 +411,28 @@
         "inputs": [
             {
                 "internalType": "bytes32",
-                "name": "_id",
+                "name": "id",
                 "type": "bytes32"
             },
             {
                 "internalType": "bytes32",
                 "name": "verification",
                 "type": "bytes32"
             },
-            {
-                "internalType": "bytes32",
-                "name": "validation",
-                "type": "bytes32"
-            },
             {
                 "internalType": "uint256",
                 "name": "exchange_addr_i",
                 "type": "uint256"
             },
             {
                 "internalType": "uint128",
-                "name": "_input_total",
+                "name": "input_total",
                 "type": "uint128"
+            },
+            {
+                "internalType": "bytes32[]",
+                "name": "data",
+                "type": "bytes32[]"
             }
         ],
         "name": "swap",