diff --git a/build/contracts/BEBoxMall.json b/build/contracts/BEBoxMall.json index b128759..4b1d0e1 100644 --- a/build/contracts/BEBoxMall.json +++ b/build/contracts/BEBoxMall.json @@ -44544,8 +44544,8 @@ } }, "links": {}, - "address": "0xF278ff771F9E24968083B0bA54Cb42eb4B23C2d7", - "transactionHash": "0xee0f42f0e5420e8cfb454e8458f8ac0e67f34515ab1cce5041ae277a4f5684b6" + "address": "0x2bD8185e1B175c2b64859235981B700DD643dc4a", + "transactionHash": "0xee27e1f23ddead09ae83bf4f6ff03bcdd09e6cd5cf4f971a0fc2722cfff5c9bb" }, "1337": { "events": { @@ -45137,8 +45137,8 @@ } }, "links": {}, - "address": "0x791FcA0296fD49b65701495367c3969bcF0503F5", - "transactionHash": "0xa69a750d46bac5ad5f1cce4d377cdf2094a862754f876bbe71fbda4210951adf" + "address": "0xA94B7f0465E98609391C623d0560C5720a3f2D33", + "transactionHash": "0x56aabfc3ac09302882b6614c7a89d179011bf5d2ee741efec15022b310516dcf" }, "1644989050832": { "events": {}, @@ -45148,7 +45148,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.026Z", + "updatedAt": "2022-04-19T01:08:20.681Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/BEChip.json b/build/contracts/BEChip.json index 83d67b9..7be1a3f 100644 --- a/build/contracts/BEChip.json +++ b/build/contracts/BEChip.json @@ -24053,8 +24053,8 @@ } }, "links": {}, - "address": "0xca191D827f1d042e27AeD858534830758E39C89E", - "transactionHash": "0xbddd6429b743d71aadcf908e683b7070a218ead7fa427b54c5eb7d4c2ce2fd1f" + "address": "0x0640958BDb4D7956e1452FacEBD550C6Cf42aC94", + "transactionHash": "0xee464491a57aeaf040b0d2364766edfefb8f6873bc8096fe699ab866da6d77f7" }, "1337": { "events": { @@ -24405,8 +24405,8 @@ } }, "links": {}, - "address": "0x4FCb2Aab5cf7D86A54a6e1884679796416829714", - "transactionHash": "0xbafd9ea9c13403e69d51e3bc33ea5906f207915e095cd7f392fdf9b5553a0ad5" + "address": "0x9b1f7F645351AF3631a656421eD2e40f2802E6c0", + "transactionHash": "0x6b1a17cfbdcf2966b3c42ad8e6e16f26c0c73fc392bc04890ca9e051d43c1ddb" }, "1644989050832": { "events": { @@ -24586,7 +24586,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.112Z", + "updatedAt": "2022-04-19T01:08:20.757Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/BECoin.json b/build/contracts/BECoin.json index f714d63..581738a 100644 --- a/build/contracts/BECoin.json +++ b/build/contracts/BECoin.json @@ -9701,8 +9701,8 @@ } }, "links": {}, - "address": "0xfeFc3aab779863c1624eE008aba485c53805dCeb", - "transactionHash": "0xbedae77445aee6f04dd8e9d51a12d9917df1e7bc16799603faf9f2918621547f" + "address": "0xdb6D4bB22E2C12686Efff25a79EC78f9f078fe7D", + "transactionHash": "0x39b0de53e066c09aab18c810b7554ed11a45add9e633bfc5863389e2749e8060" }, "1337": { "events": { @@ -9935,8 +9935,8 @@ } }, "links": {}, - "address": "0xcC4e553C048B91609089846faEB8b59cf6230260", - "transactionHash": "0xe7cb7363ef9ebff502b78c8df020f87235e1821e59d5511f61335b7686ab7c2e" + "address": "0xCfEB869F69431e42cdB54A4F4f105C19C080A601", + "transactionHash": "0xbb200430c4f73223707054cbf0b7b884ae923dd74a59c352e9d7fdfc819f74d5" }, "1644989050832": { "events": {}, @@ -9946,7 +9946,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.045Z", + "updatedAt": "2022-04-19T01:08:20.697Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/BEEquipment.json b/build/contracts/BEEquipment.json index 379baf0..cfc57d5 100644 --- a/build/contracts/BEEquipment.json +++ b/build/contracts/BEEquipment.json @@ -24053,8 +24053,8 @@ } }, "links": {}, - "address": "0x7E4cdCDFBC43e40d718B7FCb18cE59d114152094", - "transactionHash": "0xb0b2eb5726c104f40ed8228726132a31b2f44aa863cae335fd1ff0bc25babf37" + "address": "0x500AD8A4D50d71Af5cA8eA3b12B914f7aE5466f7", + "transactionHash": "0x1fda681493165b88dcbdacbe9ee12474b6daaa0d3ef41fd45a66a4fed567663f" }, "1337": { "events": { @@ -24405,8 +24405,8 @@ } }, "links": {}, - "address": "0x6D3C7E261649bfEB7694F421C76c2321d6755e66", - "transactionHash": "0xccd45e3c58096bee28933590373c30ffed6bcad151eb6f3284caca3f1104aa27" + "address": "0x59d3631c86BbE35EF041872d502F218A39FBa150", + "transactionHash": "0x710887c5995123a55a33d37a4e451df2d0c5312fb11ff12f9c76a005fcecd441" }, "1644989050832": { "events": { @@ -24586,7 +24586,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.088Z", + "updatedAt": "2022-04-19T01:08:20.735Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/BEGold.json b/build/contracts/BEGold.json index 72e7e31..5cb76cc 100644 --- a/build/contracts/BEGold.json +++ b/build/contracts/BEGold.json @@ -13268,10 +13268,106 @@ "transactionHash": "0x9a175adfb92a24e3d9cad755b5e213855f879f33210665287fce06bacbc78afd" }, "322": { - "events": {}, + "events": { + "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "value", + "type": "uint256" + } + ], + "name": "Approval", + "type": "event" + }, + "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, + "0x62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258": { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "Paused", + "type": "event" + }, + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "value", + "type": "uint256" + } + ], + "name": "Transfer", + "type": "event" + }, + "0x5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa": { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "Unpaused", + "type": "event" + } + }, "links": {}, - "address": "0xE388e872e63aadF5a4F1521E4d96C10A28091457", - "transactionHash": "0xe58aa9e9e53ce80f07227f4ad104f0bbaa4e4c5048a12852eefd9d85c3124465" + "address": "0xC5Cd606b3e9B80b758e8274B198c76D929aA094A", + "transactionHash": "0x9f4bdecc01aed506f1bb247c8ca99ccd42d9ea28115d28f56018da0ade259c28" }, "1338": { "events": { @@ -13372,12 +13468,12 @@ } }, "links": {}, - "address": "0x2104F2ca1d9141dc15366A79599b2a612734583a", - "transactionHash": "0xba085516c0b505d40fe74276f315040d0bbaea37856fd10917509af1db40748f" + "address": "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550", + "transactionHash": "0x590823a341e07cece4c97e2cc0eb9045b2fee4ab94944ea0dd3de4e470146e84" } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.053Z", + "updatedAt": "2022-04-19T01:08:20.705Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/BEHero.json b/build/contracts/BEHero.json index a2a896f..012bad1 100644 --- a/build/contracts/BEHero.json +++ b/build/contracts/BEHero.json @@ -24059,8 +24059,8 @@ } }, "links": {}, - "address": "0xb783184dc14fA90c33766c7e8992ded045FA4058", - "transactionHash": "0x434f9c2104edb85e179fdb561f5d74c0dfca9b4d98f993f32ca24b8f5a164f59" + "address": "0x52917087cd4E48bDb5f336012E677f471f9E1C2D", + "transactionHash": "0xccab1a96a5a470f5b96e5ae7d2a05a282634f81984acbecbbf317b319b6bea01" }, "1337": { "events": { @@ -24411,8 +24411,8 @@ } }, "links": {}, - "address": "0x04234A0399C15C8fAb2467e9981FEcEe753af5e4", - "transactionHash": "0xc12990c3b3700c53ca142a89165b1ca9d820032c956d39a1b1738794436feaf3" + "address": "0x9561C133DD8580860B6b7E504bC5Aa500f0f06a7", + "transactionHash": "0x07b7fd17c110a1ce26872e66dbb1bb7ef5907f33f94404e01464b81db65f2365" }, "1644989050832": { "events": { @@ -24592,7 +24592,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.068Z", + "updatedAt": "2022-04-19T01:08:20.721Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/BELuckyBox.json b/build/contracts/BELuckyBox.json index b10fa08..5a5f3ef 100644 --- a/build/contracts/BELuckyBox.json +++ b/build/contracts/BELuckyBox.json @@ -27093,6 +27093,182 @@ "version": "0.8.10+commit.fc410830.Emscripten.clang" }, "networks": { + "322": { + "events": { + "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "approved", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "tokenId", + "type": "uint256" + } + ], + "name": "Approval", + "type": "event" + }, + "0x17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "operator", + "type": "address" + }, + { + "indexed": false, + "internalType": "bool", + "name": "approved", + "type": "bool" + } + ], + "name": "ApprovalForAll", + "type": "event" + }, + "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, + "0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "previousAdminRole", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "newAdminRole", + "type": "bytes32" + } + ], + "name": "RoleAdminChanged", + "type": "event" + }, + "0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" + } + ], + "name": "RoleGranted", + "type": "event" + }, + "0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" + } + ], + "name": "RoleRevoked", + "type": "event" + }, + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "tokenId", + "type": "uint256" + } + ], + "name": "Transfer", + "type": "event" + } + }, + "links": {}, + "address": "0xe7DB4A79917F6B0CDb85d0b93C8415187ce9D4e0", + "transactionHash": "0x0da565eb701da39b95e22829376bf7a38ce88f866d9897ccf8691e052a025eb4" + }, "1338": { "events": { "0x17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31": { @@ -27359,12 +27535,12 @@ } }, "links": {}, - "address": "0x995A9847826784d51B718AE55C65eEEC091551a0", - "transactionHash": "0xed6140aebc3f846a400936c80363a9143241e9e59cdf190fc03e175c9d91651f" + "address": "0x4339316e04CFfB5961D1c41fEF8E44bfA2A7fBd1", + "transactionHash": "0x82b090cce651cd302757192fb8234ad4d8ac6f8bc3b595f037d5b08f169f083d" } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.176Z", + "updatedAt": "2022-04-19T01:08:20.817Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/BETimelockController.json b/build/contracts/BETimelockController.json index a251232..73e1e8c 100644 --- a/build/contracts/BETimelockController.json +++ b/build/contracts/BETimelockController.json @@ -24240,10 +24240,204 @@ }, "networks": { "322": { - "events": {}, + "events": { + "0xc2617efa69bab66782fa219543714338489c4e9e178271560a91b82c3f612b58": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "id", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "index", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "address", + "name": "target", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "value", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "bytes", + "name": "data", + "type": "bytes" + } + ], + "name": "CallExecuted", + "type": "event" + }, + "0x4cf4410cc57040e44862ef0f45f3dd5a5e02db8eb8add648d4b0e236f1d07dca": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "id", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "index", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "address", + "name": "target", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "value", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "bytes", + "name": "data", + "type": "bytes" + }, + { + "indexed": false, + "internalType": "bytes32", + "name": "predecessor", + "type": "bytes32" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "delay", + "type": "uint256" + } + ], + "name": "CallScheduled", + "type": "event" + }, + "0xbaa1eb22f2a492ba1a5fea61b8df4d27c6c8b5f3971e63bb58fa14ff72eedb70": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "id", + "type": "bytes32" + } + ], + "name": "Cancelled", + "type": "event" + }, + "0x11c24f4ead16507c69ac467fbd5e4eed5fb5c699626d2cc6d66421df253886d5": { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "oldDuration", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "newDuration", + "type": "uint256" + } + ], + "name": "MinDelayChange", + "type": "event" + }, + "0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "previousAdminRole", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "newAdminRole", + "type": "bytes32" + } + ], + "name": "RoleAdminChanged", + "type": "event" + }, + "0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" + } + ], + "name": "RoleGranted", + "type": "event" + }, + "0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" + } + ], + "name": "RoleRevoked", + "type": "event" + } + }, "links": {}, - "address": "0x4613089287F604Eff94c1ab34B31424Fc4BD5312", - "transactionHash": "0xa881622258e0ee6005ebdf0932028565ceaa9fdd5f49265f5720008606a6dbd8" + "address": "0xeFd93583241515C8387EE82e83cc91E2B4411d8D", + "transactionHash": "0xbc1e205ca084573229b5d2510d4eb3476a1839a2985af70c93a8d347053455da" }, "1337": { "events": { @@ -24642,8 +24836,8 @@ } }, "links": {}, - "address": "0xE353d6de18FA190161D0007bb8bDB12F7FD212bF", - "transactionHash": "0x80add184ff38c02caa5a172b8a55f53eb602222bc0499d58262ec3163e75e29a" + "address": "0x4bf3A7dFB3b76b5B3E169ACE65f888A4b4FCa5Ee", + "transactionHash": "0x0ed7fda7132cc0f47ca24a45b2ee8bdc2a92d3b51558bcfcc157d4677924af02" }, "1644989050832": { "events": {}, @@ -24653,7 +24847,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:03.996Z", + "updatedAt": "2022-04-19T01:08:20.659Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/EvolveProxy.json b/build/contracts/EvolveProxy.json index acf28fa..e0903c7 100644 --- a/build/contracts/EvolveProxy.json +++ b/build/contracts/EvolveProxy.json @@ -27479,8 +27479,8 @@ } }, "links": {}, - "address": "0x00ad7758953f899aF5B2C8E960239f606BF29A3f", - "transactionHash": "0x2124f43f3bfd996cfc71ab6e1d5a88ab2e3d9fed4f84ac48378771b20a3bef6b" + "address": "0x13b26DFFa33A00930E9c764C84109f7Ea5e88701", + "transactionHash": "0x549a71009629d149b4461e82b08007c3b392313a65c9b0ead276a09aef577eef" }, "1337": { "events": { @@ -27667,8 +27667,8 @@ } }, "links": {}, - "address": "0x2e24FDad227e6ca1e7eB7623229eA188aC336E25", - "transactionHash": "0xcc9ee0d6898071fbbd5ce4b6c14b8b1da521160d90121f324f52fdf7193a653b" + "address": "0x0E696947A06550DEf604e82C26fd9E493e576337", + "transactionHash": "0x9dbdcc5e04b78c4142fed513a3e06fd05cc69fc56ec8c0ac0c1d0174d49fe9af" }, "1644989050832": { "events": {}, @@ -27678,7 +27678,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.155Z", + "updatedAt": "2022-04-19T01:08:20.798Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/LuckyBoxProxy.json b/build/contracts/LuckyBoxProxy.json index 5d8cdad..dee4f91 100644 --- a/build/contracts/LuckyBoxProxy.json +++ b/build/contracts/LuckyBoxProxy.json @@ -31341,6 +31341,12 @@ "version": "0.8.10+commit.fc410830.Emscripten.clang" }, "networks": { + "322": { + "events": {}, + "links": {}, + "address": "0x979833cB660ca586E352b636d3ddB4EbD40672C1", + "transactionHash": "0x6f29bf1c6de391fde456330ab45613a658859092f042440abefce6281d77a247" + }, "1338": { "events": { "0x17cecd0d3c0b7fa55a453f85b9a95721ef1ead7986b265aeb2fa3008271c25d7": { @@ -31519,12 +31525,12 @@ } }, "links": {}, - "address": "0x1BF5c1e9fb2E446D35857f015bC5e7d3D3BA710c", - "transactionHash": "0xc791f57c65e067444ff433ffa3dbccfcbe2f135cedd92af63edddfe3236edfb0" + "address": "0xdAA71FBBA28C946258DD3d5FcC9001401f72270F", + "transactionHash": "0xec77442634387c18d24b55b37d54b032f903090b7d03a05e7ae7a435d31d559e" } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.192Z", + "updatedAt": "2022-04-19T01:08:20.837Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/MarketPlace.json b/build/contracts/MarketPlace.json index 3d519f4..d7e8bb4 100644 --- a/build/contracts/MarketPlace.json +++ b/build/contracts/MarketPlace.json @@ -33592,8 +33592,8 @@ } }, "links": {}, - "address": "0x807A43Ca45811A7077136814Da7D2451c0d2F51f", - "transactionHash": "0x77e5c21122e2550879a86d8502a64b0c2f1bfca2ddb7a8a4a70023a91113aa64" + "address": "0x028baFe219Db5F60c5c8fc0ad8B5f5729F4BA7D2", + "transactionHash": "0x06aa70a066a993b341e7c6acf6fdbd9772661bb9353ab4de649a058bf7e5cb3e" }, "1337": { "events": { @@ -33792,8 +33792,8 @@ } }, "links": {}, - "address": "0x248F8c93bb716f57eEa55262428A9d5C3736074a", - "transactionHash": "0x1cb34d3a82dd7607376578e08156fb0aba82aa95c5569879bb8ec28df9ab7b18" + "address": "0x2612Af3A521c2df9EAF28422Ca335b04AdF3ac66", + "transactionHash": "0x620998d11a263ab98a53047b39f03a1c48648fd6aed1b56c3bbdf286ac6039c2" }, "1644989050832": { "events": { @@ -33872,7 +33872,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.130Z", + "updatedAt": "2022-04-19T01:08:20.775Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json index fe352d0..bf9b297 100644 --- a/build/contracts/Migrations.json +++ b/build/contracts/Migrations.json @@ -3152,8 +3152,8 @@ "322": { "events": {}, "links": {}, - "address": "0x5b36329D0DA1F56eD60F3C5DE1855c8dE0440140", - "transactionHash": "0xa21ab0e0b5eb5c5d1213e92deb7d3665e11b0552836b862d3a248acd3efd9d75" + "address": "0xd0eCd9F0C7C82bDC234f17A017133185721261dF", + "transactionHash": "0xb8d89f55e3b08881f550d4f33466f8c918c86cc1091d876b0983ad76bc8c708a" }, "1337": { "events": {}, @@ -3164,8 +3164,8 @@ "1338": { "events": {}, "links": {}, - "address": "0x59539cf6fAcF13a73CA821e3190329cfF41b5dcC", - "transactionHash": "0xca24c59941df8b650850d08347ded074eabbb7d84f37bfe5742c03476b4b5afd" + "address": "0xe78A0F7E598Cc8b0Bb87894B0F60dD2a88d6a8Ab", + "transactionHash": "0xd609e4dfdc5ef642b3192d2f90ee390eacb6863bf145da078ffca2a0aa1ba67e" }, "1644989050832": { "events": {}, @@ -3175,7 +3175,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.204Z", + "updatedAt": "2022-04-19T01:08:20.853Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/build/contracts/MinterFactory.json b/build/contracts/MinterFactory.json index f2b6884..d2c6d4f 100644 --- a/build/contracts/MinterFactory.json +++ b/build/contracts/MinterFactory.json @@ -8859,8 +8859,8 @@ } }, "links": {}, - "address": "0x91155Fda04fA11b3ffd6213b33179DD67fE6B844", - "transactionHash": "0x06f167fb679dc1b6fef94687aa9351303be9b4b5628d431b423ba62349c0414a" + "address": "0x8e5B0dbE45a0E726Be056B210ECF449f82996e7E", + "transactionHash": "0x48dc05e76d408e364906d44860fb1372f58b74a0d73916208782f3bdd50548b9" }, "1337": { "events": { @@ -8961,8 +8961,8 @@ } }, "links": {}, - "address": "0x42A31e3Eb0E8C8334DD16E198666B47550dAc46b", - "transactionHash": "0x6dd077ed1fc30484ece619a78749e003fff1cbdb2ab5fa03f4cd822872199ed7" + "address": "0x26b4AFb60d6C903165150C6F0AA14F8016bE4aec", + "transactionHash": "0xbc275985bc9d7fff915768099e8dcd6b1589d930dd1e024e89bdb33bee9b8506" }, "1644989050832": { "events": {}, @@ -8972,7 +8972,7 @@ } }, "schemaVersion": "3.4.3", - "updatedAt": "2022-04-18T13:12:04.145Z", + "updatedAt": "2022-04-19T01:08:20.788Z", "networkType": "ethereum", "devdoc": { "kind": "dev", diff --git a/config/config.js b/config/config.js index 1b083c3..73cb1ef 100644 --- a/config/config.js +++ b/config/config.js @@ -1,20 +1,20 @@ const market = { - feeToAddress: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1", - mallFeeAddress: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1", + feeToAddress: "0x50A8e60041A206AcaA5F844a1104896224be6F39", + mallFeeAddress: "0x50A8e60041A206AcaA5F844a1104896224be6F39", paymentTokens: [ - "0x0039f574ee5cc39bdd162e9a88e3eb1f111baf48", // USDT + "0x67f6a7BbE0da067A747C6b2bEdF8aBBF7D6f60dc", // USDT ], } const admins = { - admin: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1", + admin: "0x50A8e60041A206AcaA5F844a1104896224be6F39", proposers: [ - "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1", - "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0" + "0x50A8e60041A206AcaA5F844a1104896224be6F39", + "0xD91ce0e40E04e5Aba6139D93e7F46a4B2519b97f" ], executors: [ - "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1", - "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b" + "0x50A8e60041A206AcaA5F844a1104896224be6F39", + "0x42448C6a38c08637218D8327b748F213fC2c0231" ] } diff --git a/config/config_dev.js b/config/config_dev.js new file mode 100644 index 0000000..1b083c3 --- /dev/null +++ b/config/config_dev.js @@ -0,0 +1,31 @@ +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; \ No newline at end of file diff --git a/migrations/13_deploy_luckybox.js b/migrations/13_deploy_luckybox.js index 7b5e00d..78f1d32 100644 --- a/migrations/13_deploy_luckybox.js +++ b/migrations/13_deploy_luckybox.js @@ -21,28 +21,4 @@ module.exports = async function (deployer, network, accounts) { if(boxProxyInstance) { console.log("LuckyBoxProxy successfully deployed.") } - - const heroInstance = await Hero.deployed(); - const equipInstance = await Equip.deployed(); - const chipInstance = await Chip.deployed(); - - await boxProxyInstance.init( - [ - heroInstance.address, - equipInstance.address, - chipInstance.address, - luckyBoxInstance.address - ] - ) - await boxProxyInstance.updateExecutor(accounts[0]); - await heroInstance.setMintFactory(boxProxyInstance.address); - await equipInstance.setMintFactory(boxProxyInstance.address); - await chipInstance.setMintFactory(boxProxyInstance.address); - - await luckyBoxInstance.setMintFactory(boxProxyInstance.address); - - await heroInstance.setBurnProxy(boxProxyInstance.address); - await equipInstance.setBurnProxy(boxProxyInstance.address); - await chipInstance.setBurnProxy(boxProxyInstance.address); - await luckyBoxInstance.setBurnProxy(boxProxyInstance.address); } \ No newline at end of file diff --git a/migrations/14_update_luckybox.js b/migrations/14_update_luckybox.js new file mode 100644 index 0000000..0e9fda1 --- /dev/null +++ b/migrations/14_update_luckybox.js @@ -0,0 +1,38 @@ +const LuckyBox = artifacts.require('luckybox/BELuckyBox'); +const BoxProxy = artifacts.require('luckybox/LuckyBoxProxy'); +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) { + + const luckyBoxInstance = await LuckyBox.deployed(); + const boxProxyInstance = await BoxProxy.deployed(); + const heroInstance = await Hero.deployed(); + const equipInstance = await Equip.deployed(); + const chipInstance = await Chip.deployed(); + + // await boxProxyInstance.init( + // [ + // heroInstance.address, + // equipInstance.address, + // chipInstance.address, + // luckyBoxInstance.address + // ] + // ) + // console.log('boxProxyInstance inited') + // await boxProxyInstance.updateExecutor(accounts[0]); + // console.log('boxProxyInstance updateExecutor') + // await heroInstance.setMintFactory(boxProxyInstance.address); + // await equipInstance.setMintFactory(boxProxyInstance.address); + // await chipInstance.setMintFactory(boxProxyInstance.address); + // await luckyBoxInstance.setMintFactory(boxProxyInstance.address); + // console.log('nft mint factory updated') + + await heroInstance.setBurnProxy(boxProxyInstance.address); + await equipInstance.setBurnProxy(boxProxyInstance.address); + await chipInstance.setBurnProxy(boxProxyInstance.address); + await luckyBoxInstance.setBurnProxy(boxProxyInstance.address); + console.log('nft burn proxy updated') +} \ No newline at end of file diff --git a/migrations/14_update_timelock.js b/migrations/15_update_timelock.js similarity index 100% rename from migrations/14_update_timelock.js rename to migrations/15_update_timelock.js diff --git a/truffle-config.js b/truffle-config.js index b3ad1e2..a916ba6 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -80,7 +80,7 @@ module.exports = { provider: () => new HDWalletProvider(mnemonic, `https://rpc-testnet.kcc.network`), network_id: 322, confirmations: 6, - timeoutBlocks: 200, + timeoutBlocks: 5000, skipDryRun: true, production: true, from: '0x50A8e60041A206AcaA5F844a1104896224be6F39'