From d5045f0c2d16f3a13378eda31201723efc4a7352 Mon Sep 17 00:00:00 2001 From: cebgcontract <99630598+cebgcontract@users.noreply.github.com> Date: Mon, 14 Feb 2022 19:17:53 +0800 Subject: [PATCH] change sth --- .gitignore | 3 ++- config/config.js | 8 ++++---- contracts/BEBoxMall.sol | 2 +- contracts/BETimelockController.sol | 2 +- migrations/4_deploy_market.js | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 7703b28..e1c9667 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules .secret .DS_Store -openzepplelin \ No newline at end of file +openzepplelin +.vscode/ \ No newline at end of file diff --git a/config/config.js b/config/config.js index ed72535..d226fbf 100644 --- a/config/config.js +++ b/config/config.js @@ -1,17 +1,17 @@ const market = { - feeToAddress: "0xd1072b14A2f27C22657c166bEADf983d892e1c5a", + feeToAddress: "0x50A8e60041A206AcaA5F844a1104896224be6F39", paymentTokens: [ "0x67f6a7BbE0da067A747C6b2bEdF8aBBF7D6f60dc", // USDT ], } const admins = { - proposers: ["0xd1072b14A2f27C22657c166bEADf983d892e1c5a"], - executors: ["0xd1072b14A2f27C22657c166bEADf983d892e1c5a"] + proposers: ["0x50A8e60041A206AcaA5F844a1104896224be6F39"], + executors: ["0x50A8e60041A206AcaA5F844a1104896224be6F39"] } const token = { - baseTokenURI: '', + baseTokenURI: 'https://ghost.kingsome.cn/api/svr/tmp/', } var config = { diff --git a/contracts/BEBoxMall.sol b/contracts/BEBoxMall.sol index 7fd691c..d293caa 100644 --- a/contracts/BEBoxMall.sol +++ b/contracts/BEBoxMall.sol @@ -12,7 +12,7 @@ contract BEBoxMall is Ownable, HasSignature, TimelockController{ using SafeERC20 for IERC20; using Address for address; - uint256 public constant MIN_DELAY = 2 days; + uint256 public constant MIN_DELAY = 2 seconds; uint256 public constant MAX_DELAY = 16 days; uint256 private _minDelay; diff --git a/contracts/BETimelockController.sol b/contracts/BETimelockController.sol index 627ae43..0de0bd2 100644 --- a/contracts/BETimelockController.sol +++ b/contracts/BETimelockController.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.10; import "@openzeppelin/contracts/governance/TimelockController.sol"; contract BETimelockController is TimelockController { - uint256 public constant MIN_DELAY = 2 days; + uint256 public constant MIN_DELAY = 2 seconds; uint256 public constant MAX_DELAY = 16 days; uint256 private _minDelay; diff --git a/migrations/4_deploy_market.js b/migrations/4_deploy_market.js index 46d03b8..509639e 100644 --- a/migrations/4_deploy_market.js +++ b/migrations/4_deploy_market.js @@ -14,7 +14,7 @@ module.exports = async function (deployer, network, accounts) { marketInstance.setFeeToAddress(config.market.feeToAddress); marketInstance.setPaymentTokens(config.market.paymentTokens); } catch(err) { - console.log(err); + console.log("MarketPlace setFeeToAddress or setPaymentTokens with error", err); } // add marketplace to whitelist