Fixing deploy farm

Author: sullof

.gitignore

@@ -28,6 +28,8 @@ npm-debug.log
 
 # local env variables
 .env
+.env.*
+env.*
 
 # truffle build directory
 build/
@@ -59,6 +61,5 @@ artifacts
 
 #local data
 db
-env.json
 /etherscan
 .openzeppelin

contracts/GenesisFarm.sol

@@ -33,16 +33,16 @@ contract GenesisFarm is Ownable, IManager {
     IEverdragons2Genesis everdragons2_,
     uint256 maxForSale_,
     uint256 maxClaimable_,
-    uint16 price_,
+    uint256 price_,
     uint256 saleStartAt_
   ) {
     everdragons2Genesis = everdragons2_;
     require(everdragons2Genesis.mintEnded() == false, "Not an E2 token");
-    require(saleStartAt_ > block.timestamp, "Invalid sale start time");
+    require(saleStartAt_ > 0, "Invalid sale start time");
     maxForSale = maxForSale_; // 250
     maxClaimable = maxClaimable_; // 350
     _nextTokenId = maxClaimable_ + 1;
-    price = uint256(price_).mul(10**18);
+    price = price_;
     saleStartAt = saleStartAt_;
   }
 

export/deployed.json

@@ -1,6 +1,10 @@
 {
   "1337": {
-    "Everdragons2Genesis": "0x22753E4264FDDc6181dc7cce468904A80a363E44",
-    "GenesisFarm": "0xA7c59f010700930003b33aB25a7a0679C860f29c"
+    "Everdragons2Genesis": "0xffa7CA1AEEEbBc30C874d32C7e22F052BbEa0429",
+    "GenesisFarm": "0x3aAde2dCD2Df6a8cAc689EE797591b2913658659"
+  },
+  "80001": {
+    "Everdragons2Genesis": "0xeC3a1a418203827AD24391F6f44D4d60223270Df",
+    "GenesisFarm": "0x87Ab04CC86A72349e63021413F461539b14C130c"
   }
-}
+}

hardhat.config.js

@@ -2,8 +2,11 @@ require("@nomiclabs/hardhat-waffle");
 require("@nomiclabs/hardhat-etherscan");
 require('@openzeppelin/hardhat-upgrades');
 // require("hardhat-gas-reporter");
+const requireOrMock = require('require-or-mock')
 
-let env = require('./env.json');
+let env = requireOrMock('env.js', {
+
+});
 
 if (process.env.GAS_REPORT === 'yes') {
   require("hardhat-gas-reporter");
@@ -48,11 +51,11 @@ module.exports = {
     },
     rinkeby: {
       url: `https://rinkeby.infura.io/v3/${env.infuraApiKey}`,
-      accounts: [env.privateKey]
+      accounts: [env.privateKeyTestnet]
     },
     goerli: {
       url: `https://goerli.infura.io/v3/${env.infuraApiKey}`,
-      accounts: [env.privateKey]
+      accounts: [env.privateKeyTestnet]
     },
     ethereum: {
       url: `https://mainnet.infura.io/v3/${env.infuraApiKey}`,
@@ -62,19 +65,19 @@ module.exports = {
       url: "https://data-seed-prebsc-1-s1.binance.org:8545",
       chainId: 97,
       gasPrice: 20000000000,
-      accounts: [env.privateKey]
+      accounts: [env.privateKeyTestnet]
     },
     bsc: {
-      url: "https://bsc-dataseed.binance.org/",
+      url: "https://bsc-dataseed.binance.org",
       chainId: 56,
       gasPrice: 20000000000,
       accounts: [env.privateKey]
     },
     mumbai: {
-      url: 'https://rpc-mumbai.maticvigil.com',
+      url: 'https://rpc-mumbai.matic.today',
       chainId: 80001,
       gasPrice: 20000000000,
-      accounts: [env.privateKey]
+      accounts: [env.privateKeyTestnet]
     },
     matic: {
       url: `https://rpc-mainnet.maticvigil.com/v1/${env.maticvigilKey}`,

require-or-mock-config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  'env.js': {
+    mainnetAlchemyKey: 'some-fake-api',
+    privateKey: '0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a',
+    etherscanKey: 'some-fake-api',
+    bscscanKey: 'some-fake-api',
+    maticvigilKey: 'some-fake-api',
+    infuraApiKey: 'some-fake-api',
+    coinMarketCapAPIKey: 'some-fake-api',
+    polygonscanAPIKey: 'some-fake-api'
+  }
+}

scripts/deploy-e2genesis.js

@@ -20,7 +20,8 @@ async function main() {
 
   console.log(
       "Deploying contracts with the account:",
-      deployer.address
+      deployer.address,
+      'to', network
   );
 
   console.log("Account balance:", (await deployer.getBalance()).toString());

scripts/deploy-genesisfarm.js

@@ -5,7 +5,8 @@ const requireOrMock = require('require-or-mock')
 
 const {
   initEthers,
-  getTimestamp
+  getTimestamp,
+  normalize
 } = require('../test/helpers')
 
 const DeployUtils = require('./lib/DeployUtils')
@@ -33,9 +34,18 @@ async function main() {
   const everdragons2Genesis = Everdragons2Genesis.attach(deployed[chainId].Everdragons2Genesis)
 
   const GenesisFarm = await ethers.getContractFactory("GenesisFarm")
-  const genesisFarm = await GenesisFarm.deploy(everdragons2Genesis.address, 250, 600, 500,
+
+  const price = normalize(network === 'matic' ? 500 : 0.1)
+  const delay = network === 'matic' ? 3600 : 10
+
+  const genesisFarm = await GenesisFarm.deploy(
+      everdragons2Genesis.address,
+      250,
+      600,
+      price,
       // sale start after one hour
-      (await getTimestamp()) + 3600)
+      (await getTimestamp()) + delay
+  )
   await genesisFarm.deployed()
   console.log("GenesisFarm deployed to:", genesisFarm.address);
 

test/GenesisFarm.test.js

@@ -37,10 +37,11 @@ describe("GenesisFarm", async function () {
     }
     everdragons2Genesis = await upgrades.deployProxy(Everdragons2Genesis, []);
     await everdragons2Genesis.deployed()
-    genesisFarm = await GenesisFarm.deploy(everdragons2Genesis.address,
+    genesisFarm = await GenesisFarm.deploy(
+        everdragons2Genesis.address,
         25, // maxForSale
         10, // maxClaimable
-        10, // price in MATIC
+        normalize(10), // price in MATIC
         saleStartAt)
     await genesisFarm.deployed()
     await everdragons2Genesis.setManager(genesisFarm.address)

test/helpers.js

@@ -44,7 +44,7 @@ const Helpers = {
   },
 
   normalize(val, n = 18) {
-    return '' + val + '0'.repeat(n)
+    return ('' + val + '0'.repeat(n)).replace(/^0+/, '').replace(/\./, '')
   }
 
 }