Merge branch 'develop' into feature/mask-labs

* develop: (25 commits) chore: set gh-actions name (#3542) Hotfix/1.33.2 to develop (#3537) chore: github bot auto add conflict label to pr (#3539) fix: add notistack for theme (#3534) feat: add new token selector and show balance (#3482) feat: ITO lazy load history list (#3524) chore: clean blob (#3528) chore: clean file reader (#3527) feat: migrate VCent plugin to new plugin infra (#3497) chore: remove unused code (#3525) fix: handle change (#3523) fix: file service label (#3526) feat: migrate Transak plugin to new plugin infra (#3496) chore: clean event bound (#3522) refactor: ito new proxy contract (#3487) feat: migrate Polls plugin to new plugin infra (#3500) chore: clean jsx (#3520) chore: fix storybook build issue (#3380) refactor: remove web3-shared dependency in shared package (#3519) chore: update github bot configuration (#3516) ...
DimensionDev · Jul 1, 2021 · eb05491 · eb05491
2 parents 2060728 + 896863d
commit eb05491
Show file tree

Hide file tree

Showing 386 changed files with 5,448 additions and 2,882 deletions.
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
@@ -3,11 +3,7 @@ addReviewers: true
 addAssignees: false
 
 reviewers:
-  - guanbinrui
-  - Jack-Works
-  - jk234ert
-  - septs
-  - zhouhanseng
+  - Dev-Maskbook
 
 numberOfReviewers: 0
 

diff --git a/.github/stale.yml b/.github/stale.yml
@@ -1,6 +1,6 @@
 # https://github.com/probot/stale
 
-daysUntilStale: 90
+daysUntilStale: 60
 daysUntilClose: 7
 
 exemptLabels:
@@ -22,5 +22,3 @@ markComment: >
   for your contributions.
 
 limitPerRun: 30
-
-only: issues
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
@@ -0,0 +1,18 @@
+name: Bot
+
+on:
+  push:
+    branches: [master, develop, released]
+  pull_request:
+    branches: [master, develop, released]
+
+jobs:
+  triage:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "Blocked: Has Conflict"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -73,7 +73,7 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: ${{ runner.os }}-node-
       - run: npx pnpm install
-      - run: npm run lint:ci
+      - run: npm run lint:ci -- --max-warnings=0
       - run: npm run lint:ci -- --format junit -o reports/junit/eslint-results.xml
       - name: Upload eslint report
         uses: actions/upload-artifact@v2

diff --git a/.i18n-codegen.json b/.i18n-codegen.json
@@ -15,8 +15,8 @@
             }
         },
         {
-            "input": "./packages/theme/src/locales/en.json",
-            "output": "./packages/theme/src/locales/i18n_generated",
+            "input": "./packages/shared/src/locales/en.json",
+            "output": "./packages/shared/src/locales/i18n_generated",
             "parser": "i18next",
             "generator": {
                 "type": "i18next/react-hooks",

diff --git a/packages/constants/data/ito.json b/packages/constants/data/ito.json
@@ -21,6 +21,17 @@
         "Matic": "",
         "Mumbai": ""
     },
+    "ITO2_CONTRACT_ADDRESS": {
+        "Mainnet": "0xc2CFbF22d6Dc87D0eE18d38d73733524c109Ff46",
+        "Ropsten": "0xBD4c3Cf084B6F4d25430Ee5d44436e860Cc58Ee4",
+        "Rinkeby": "",
+        "Kovan": "",
+        "Gorli": "",
+        "BSC": "0x96c7D011cdFD467f551605f0f5Fce279F86F4186",
+        "BSCT": "0x981be454a930479d92C91a0092D204b64845A5D6",
+        "Matic": "0xF9F7C1496c21bC0180f4B64daBE0754ebFc8A8c0",
+        "Mumbai": "0x54a0A221C25Fc0a347EC929cFC5db0be17fA2a2B"
+    },
     "ITO_BSC_POLYGON_CONTRACT_ADDRESS": {
         "Mainnet": "",
         "Ropsten": "",
@@ -43,6 +54,17 @@
         "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/constants/data/token-asset-base-url.json b/packages/constants/data/token-asset-base-url.json
@@ -0,0 +1,40 @@
+{
+    "TOKEN_ASSET_BASE_URI": {
+        "Mainnet": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/ethereum"
+        ],
+        "Ropsten": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/ethereum"
+        ],
+        "Rinkeby": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/ethereum"
+        ],
+        "Kovan": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/ethereum"
+        ],
+        "Gorli": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/ethereum"
+        ],
+        "BSC": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/smartchain",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/smartchain"
+        ],
+        "BSCT": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/smartchain",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/smartchain"
+        ],
+        "Matic": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/polygon"
+        ],
+        "Mumbai": [
+            "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon",
+            "https://rawcdn.githack.com/trustwallet/assets/master/blockchains/polygon"
+        ]
+    }
+}
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",