diff --git a/configAdapter.js b/configAdapter.js index 3d043ad..8b34994 100644 --- a/configAdapter.js +++ b/configAdapter.js @@ -5,10 +5,8 @@ const { KOVAN_CONFIG } = require("./config/kovan-config"); const { MBTEST_CONFIG } = require("./config/mbtest-config"); const { MBTESTNET_CONFIG } = require("./config/mbtestnet-config"); const { MATIC_CONFIG } = require("./config/matic-config"); -<<<<<<< HEAD const { ARB_CONFIG } = require("./config/arb-config"); -======= ->>>>>>> update drops test +const { ARB_CONFIG } = require("./config/arb-config"); const { RINKEBY_CONFIG } = require("./config/rinkeby-config"); exports.GetConfig = function (network, accounts) { diff --git a/contracts/DODODrops/MysteryBoxKAKA.sol b/contracts/DODODrops/DODODropsV1.sol similarity index 98% rename from contracts/DODODrops/MysteryBoxKAKA.sol rename to contracts/DODODrops/DODODropsV1.sol index 45fedbd..e545250 100644 --- a/contracts/DODODrops/MysteryBoxKAKA.sol +++ b/contracts/DODODrops/DODODropsV1.sol @@ -13,7 +13,7 @@ import {InitializableOwnable} from "../lib/InitializableOwnable.sol"; import {Address} from "../external/utils/Address.sol"; import {ERC721URIStorage} from "../external/ERC721/ERC721URIStorage.sol"; -contract MysteryBoxKAKA is ERC721URIStorage, InitializableOwnable { +contract DODODropsV1 is ERC721URIStorage, InitializableOwnable { using SafeMath for uint256; using SafeERC20 for IERC20; using Address for address; diff --git a/deploy-nft.txt b/deploy-nft.txt index 2b96aaa..0ff2d11 100644 --- a/deploy-nft.txt +++ b/deploy-nft.txt @@ -356,3 +356,15 @@ DodoNftErc721Address: 0x98f2A8d6100635Ecb40ADA1B1FFb1ff4f0b3c5D8 Init DodoNftErc721 Tx: 0x13011015953cf45401c13204bf8b89c85daa00b238eb588d8570bd2d5886b31e DodoNftErc1155Address: 0xE9C572287936dB1B0a951ca0768C1b0d26b62A04 Init DodoNftErc1155 Tx: 0xb2fe57187897820c91a35a66b2480d5ff03aef8a1c354780539894c1ec0074a2 +==================================================== +network type: rinkeby +Deploy time: 2021/5/31 下午12:02:12 +Deploy type: MysteryBoxKAKA +MysteryBoxV1Address: 0x722BaEb4d4d7b3915be607c7544375dA17A68ec4 +Init MysteryBoxV1 Tx: 0x680854792a879dd266694977fce84cc72a734f61b41659a82cf68788a0b734ec +==================================================== +network type: rinkeby +Deploy time: 2021/5/31 下午12:08:05 +Deploy type: MysteryBoxKAKA +MysteryBoxV1Address: 0x72C4Ac83F7CF0C34735E216c3CA0fc56987A7106 +Init MysteryBoxV1 Tx: 0xa0c46836ee6f58447a89992dd37d879b0a91c021007c330e52f469fc46274a54 diff --git a/migrations/5_deploy_nft.js b/migrations/5_deploy_nft.js index e916893..5d1fe23 100644 --- a/migrations/5_deploy_nft.js +++ b/migrations/5_deploy_nft.js @@ -18,7 +18,7 @@ const NFTTokenFactory = artifacts.require("NFTTokenFactory"); const DodoNftErc721 = artifacts.require("DODONFT"); const DodoNftErc1155 = artifacts.require("DODONFT1155"); -const DODODropsV1 = artifacts.require("MysteryBoxKAKA"); +const DODODropsV1 = artifacts.require("DODODropsV1"); const RandomGenerator = artifacts.require("RandomGenerator"); module.exports = async (deployer, network, accounts) => { @@ -72,8 +72,8 @@ module.exports = async (deployer, network, accounts) => { logger.log("MysteryBoxV1Address: ", MysteryBoxV1Address); const MysteryBoxV1Instance = await DODODropsV1.at(MysteryBoxV1Address); var tx = await MysteryBoxV1Instance.init( - "DODOMysteryBoxKAKA", - "KAKA_Marvel", + "FearNft", + "FearNft", "", multiSigAddress, RandomGeneratorAddress diff --git a/truffle-config.js b/truffle-config.js index e5d7359..60c4bdf 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -180,6 +180,16 @@ module.exports = { gasPrice: 0, }, + arb: { + provider: function () { + return wrapProvider( + new HDWalletProvider(privKey, "https://arb1.arbitrum.io/rpc") + ) + }, + network_id: '42161', + gasPrice: 100000000, + }, + matic: { networkCheckTimeout: 1000000, provider: () => {