调整发布次序, 更新build的json

build/contracts/BEChip.json

@@ -24586,7 +24586,7 @@
     }
   },
   "schemaVersion": "3.4.3",
-  "updatedAt": "2022-04-20T01:26:08.588Z",
+  "updatedAt": "2022-04-22T01:46:02.147Z",
   "networkType": "ethereum",
   "devdoc": {
     "kind": "dev",

build/contracts/BEEquipment.json

@@ -24586,7 +24586,7 @@
     }
   },
   "schemaVersion": "3.4.3",
-  "updatedAt": "2022-04-20T01:26:08.572Z",
+  "updatedAt": "2022-04-22T01:46:02.132Z",
   "networkType": "ethereum",
   "devdoc": {
     "kind": "dev",

build/contracts/BEHero.json

@@ -24592,7 +24592,7 @@
     }
   },
   "schemaVersion": "3.4.3",
-  "updatedAt": "2022-04-20T01:26:08.556Z",
+  "updatedAt": "2022-04-22T01:46:02.116Z",
   "networkType": "ethereum",
   "devdoc": {
     "kind": "dev",

build/contracts/Migrations.json

@@ -3175,7 +3175,7 @@
     }
   },
   "schemaVersion": "3.4.3",
-  "updatedAt": "2022-04-20T01:26:08.664Z",
+  "updatedAt": "2022-04-22T01:46:02.156Z",
   "networkType": "ethereum",
   "devdoc": {
     "kind": "dev",

config/config.js

@@ -1,20 +1,20 @@
 const market = {
-  feeToAddress: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+  feeToAddress: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-  mallFeeAddress: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+  mallFeeAddress: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
   paymentTokens: [
-    "0x67f6a7BbE0da067A747C6b2bEdF8aBBF7D6f60dc", // USDT
+    "0x0039f574ee5cc39bdd162e9a88e3eb1f111baf48", // USDT
   ],
 }
 
 const admins = {
-  admin: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+  admin: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
   proposers: [
-    "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+    "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-    "0xD91ce0e40E04e5Aba6139D93e7F46a4B2519b97f"
+    "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0"
   ],
   executors: [
-    "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+    "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-    "0x42448C6a38c08637218D8327b748F213fC2c0231"
+    "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b"
   ]
 }
 

config/config_dev.js

@@ -1,31 +0,0 @@
-const market = {
-  feeToAddress: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-  mallFeeAddress: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-  paymentTokens: [
-    "0x0039f574ee5cc39bdd162e9a88e3eb1f111baf48", // USDT
-  ],
-}
-
-const admins = {
-  admin: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-  proposers: [
-    "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-    "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0"
-  ],
-  executors: [
-    "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-    "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b"
-  ]
-}
-
-const token = {
-  baseTokenURI: 'https://market.cebg.games/api/nft/info/',
-}
-
-var config = {
-  market,
-  admins,
-  token
-}
-
-module.exports = config;

config/config_testnet.js

@@ -0,0 +1,31 @@
+const market = {
+  feeToAddress: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+  mallFeeAddress: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+  paymentTokens: [
+    "0x67f6a7BbE0da067A747C6b2bEdF8aBBF7D6f60dc", // USDT
+  ],
+}
+
+const admins = {
+  admin: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+  proposers: [
+    "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+    "0xD91ce0e40E04e5Aba6139D93e7F46a4B2519b97f"
+  ],
+  executors: [
+    "0x50A8e60041A206AcaA5F844a1104896224be6F39",
+    "0x42448C6a38c08637218D8327b748F213fC2c0231"
+  ]
+}
+
+const token = {
+  baseTokenURI: 'https://market.cebg.games/api/nft/info/',
+}
+
+var config = {
+  market,
+  admins,
+  token
+}
+
+module.exports = config;

migrations/12_deploy_luckybox.js

@@ -1,9 +1,5 @@
 const LuckyBox = artifacts.require('mysterybox/BEMysteryBox');
 const BoxProxy = artifacts.require('mysterybox/MysteryBoxProxy');
-const Hero = artifacts.require('BEHero');
-const Equip = artifacts.require('BEEquipment');
-const Chip = artifacts.require('BEChip');
-const config = require("../config/config");
 
 module.exports = async function (deployer, network, accounts) {
   await deployer.deploy(

migrations/13_update_luckybox.js

@@ -22,7 +22,7 @@ module.exports = async function (deployer, network, accounts) {
     ]
   )
   console.log('boxProxyInstance inited')
-  await boxProxyInstance.updateExecutor(accounts[0]);
+  await boxProxyInstance.updateExecutor(config.admins.admin);
   console.log('boxProxyInstance updateExecutor')
   await heroInstance.setMintFactory(boxProxyInstance.address);
   await equipInstance.setMintFactory(boxProxyInstance.address);