commands and subcommands working

Author: okwme

configV4.js renamed to buidler.config.4.js

@@ -72,11 +72,12 @@ async function deployAllContracts({overwrites, accounts, artifacts, web3, chainI
         if (overwrites['Clovers'] || !cloversAddress) {
             clovers = await Clovers.new('Clovers', 'CLVR')
             tx = await web3.eth.getTransactionReceipt(clovers.transactionHash)
-            verbose && console.log(_ + 'Deploy clovers - ' + tx.gasUsed)
+            verbose && console.log(_ + `Deploy clovers at ${clovers.address} - ` + tx.gasUsed)
             verbose && gasToCash(tx.gasUsed)
             totalGas = totalGas.add(utils.toBN(tx.gasUsed))
         } else {
             clovers = await Clovers.at(cloversAddress)
+            verbose && console.log(_ + `Already deployed Clovers at ${cloversAddress}`)
         }
 
         // Deploy CloversMetadata.sol
@@ -85,11 +86,12 @@ async function deployAllContracts({overwrites, accounts, artifacts, web3, chainI
         if (overwrites['CloversMetadata'] || !cloversMetadataAddress){
             cloversMetadata = await CloversMetadata.new(clovers.address)
             tx = await web3.eth.getTransactionReceipt(cloversMetadata.transactionHash)
-            verbose && console.log(_ + 'Deploy cloversMetadata - ' + tx.gasUsed)
+            verbose && console.log(_ + `Deploy cloversMetadata at ${cloversMetadata.address} - ` + tx.gasUsed)
             verbose && gasToCash(tx.gasUsed)
             totalGas = totalGas.add(utils.toBN(tx.gasUsed))
         } else {
             cloversMetadata = await CloversMetadata.at(cloversMetadataAddress)
+            verbose && console.log(_ + `Already deployed CloversMetadata at ${cloversMetadataAddress}`)
         }
 
         // Deploy ClubToken.sol (ERC20)
@@ -100,35 +102,38 @@ async function deployAllContracts({overwrites, accounts, artifacts, web3, chainI
         if (overwrites['ClubToken'] || !clubTokenAddress) {
             clubToken = await ClubToken.new('CloverCoin', 'CLC', decimals)
             tx = await web3.eth.getTransactionReceipt(clubToken.transactionHash)
-            verbose && console.log(_ + 'Deploy clubToken - ' + tx.gasUsed)
+            verbose && console.log(_ + `Deploy clubToken at ${clubToken.address} - ` + tx.gasUsed)
             verbose && gasToCash(tx.gasUsed)
             totalGas = totalGas.add(utils.toBN(tx.gasUsed))
         } else {
             clubToken = await ClubToken.at(clubTokenAddress)
+            verbose && console.log(_ + `Already deployed ClubToken at ${clubTokenAddress}`)
         }
 
         // Deploy Reversi.sol
         let reversiAddress = await alreadyDeployed('Reversi')
         if (overwrites['Reversi'] || overwrites['CloversController'] || !reversiAddress){
             reversi = await Reversi.new()
             tx = await web3.eth.getTransactionReceipt(reversi.transactionHash)
-            verbose && console.log(_ + 'Deploy reversi - ' + tx.gasUsed)
+            verbose && console.log(_ + `Deploy reversi at ${reversi.address} - ` + tx.gasUsed)
             verbose && gasToCash(tx.gasUsed)
             totalGas = totalGas.add(utils.toBN(tx.gasUsed))
         }else {
             reversi = await Reversi.at(reversiAddress)
+            verbose && console.log(_ + `Already deployed Reversi at ${reversiAddress}`)
         }
         // Deploy ClubTokenController.sol
         // -w ClubToken address
         let clubTokenControllerAddress = await alreadyDeployed('ClubTokenController')
         if (overwrites['ClubTokenController'] || !clubTokenControllerAddress){
             clubTokenController = await ClubTokenController.new(clubToken.address)
             tx = await web3.eth.getTransactionReceipt(clubTokenController.transactionHash)
-            verbose && console.log(_ + 'Deploy clubTokenController - ' + tx.gasUsed)
+            verbose && console.log(_ + `Deploy clubTokenController at ${clubTokenController.address} - ` + tx.gasUsed)
             verbose && gasToCash(tx.gasUsed)
             totalGas = totalGas.add(utils.toBN(tx.gasUsed))
         } else {
             clubTokenController = await ClubTokenController.at(clubTokenControllerAddress)
+            verbose && console.log(_ + `Already deployed ClubTokenController at ${clubTokenControllerAddress}`)
         }
 
         // Deploy CloversController.sol
@@ -149,11 +154,12 @@ async function deployAllContracts({overwrites, accounts, artifacts, web3, chainI
                 clubTokenController.address
             )
             tx = await web3.eth.getTransactionReceipt(cloversController.transactionHash)
-            verbose && console.log(_ + 'Deploy cloversController - ' + tx.gasUsed)
+            verbose && console.log(_ + `Deploy cloversController at ${cloversController.address} - ` + tx.gasUsed)
             verbose && gasToCash(tx.gasUsed)
             totalGas = totalGas.add(utils.toBN(tx.gasUsed))
         } else {
             cloversController = await CloversController.at(cloversControllerAdress)
+            verbose && console.log(_ + `Already deployed CloversController at ${cloversControllerAdress}`)
         }
 
         // Deploy SimpleCloversMarket.sol
@@ -170,11 +176,12 @@ async function deployAllContracts({overwrites, accounts, artifacts, web3, chainI
                 cloversController.address,
             )
             tx = await web3.eth.getTransactionReceipt(simpleCloversMarket.transactionHash)
-            verbose && console.log(_ + 'Deploy simpleCloversMarket - ' + tx.gasUsed)
+            verbose && console.log(_ + `Deploy simpleCloversMarket at ${simpleCloversMarket.address} - ` + tx.gasUsed)
             verbose && gasToCash(tx.gasUsed)
             totalGas = totalGas.add(utils.toBN(tx.gasUsed))
         } else {
             simpleCloversMarket = await SimpleCloversMarket.at(simpleCloversMarketAddress)
+            verbose && console.log(_ + `Already deployed SimpleCloversMarket at ${simpleCloversMarketAddress}`)
         }
 
         return {

configV5.js renamed to buidler.config.js

@@ -394,8 +394,8 @@
       "transactionHash": null
     },
     "1234": {
-      "address": "0x007446Aa60789901216cB34a4c44914197459A65",
-      "transactionHash": "0xbf69e4ff03e8418c15bc6ee405f6e676ed248aa15300dd9a05af5d09e011e635"
+      "address": "0xe1C5D5b2B32CFB30efb3e7f4403a753DB6036bC7",
+      "transactionHash": "0x8a7e8dd6ee79469fb7260234c5ca40b46693fe7fc40e3eac9514e109334d5fbf"
     },
     "1569787081442": {
       "events": {
@@ -665,11 +665,11 @@
         }
       },
       "links": {
-        "\\$b2fca45de5ef9c5a18731e56fbc51add96\\$": "0x6A72818BB8C844664678b8f47ee84F75753Fa2e2",
-        "Reversi": "0x6A72818BB8C844664678b8f47ee84F75753Fa2e2"
+        "\\$b2fca45de5ef9c5a18731e56fbc51add96\\$": "0x0164A8cd6F267BF474b376f13a72afc21D890c4E",
+        "Reversi": "0x0164A8cd6F267BF474b376f13a72afc21D890c4E"
       },
-      "address": "0x72C5D60cbD966dBD7dbCD494bce6985D161D3172",
-      "transactionHash": "0xc93b58084c3144ffdd6aea238198b829873982d45c308871cd29acfe93ad69a9"
+      "address": "0x15531AC3b5471Abdaf99BE1926C8311765a0581c",
+      "transactionHash": "0x23a7080f219443edb43e0f7cc8939a6342ec82dc9d3543d21a9f56838bc93218"
     },
     "1569787081442": {
       "events": {},
@@ -1308,8 +1308,8 @@
       "transactionHash": null
     },
     "1234": {
-      "address": "0x6A72818BB8C844664678b8f47ee84F75753Fa2e2",
-      "transactionHash": "0x1193a56253fad05e29fdccb5db5f9f844a1a6b1514405f450266e0c66d220070"
+      "address": "0x0164A8cd6F267BF474b376f13a72afc21D890c4E",
+      "transactionHash": "0xfc633e6a913e06ad7a7e327706a2678362d792fcd151a9c992229eebfa32b93c"
     },
     "1569787081442": {
       "events": {},

helpers/deployAllContracts.js

@@ -7,12 +7,12 @@
     "test": "test"
   },
   "scripts": {
-    "testnet": "npx ganache-cli",
+    "testnet": "npx ganache-cli-i ",
     "compile": "yarn compile-old && yarn compile-new",
-    "compile-old": "buidler compile --config configV4.js",
-    "compile-new": "buidler compile --config configV5.js",
+    "compile-old": "buidler compile --config buidler.config.4.js",
+    "compile-new": "buidler compile",
     "compileAndTest": "yarn compile && truffle test",
-    "test": "buidler test --no-compile --config configV5.js test/*.test.js",
+    "test": "buidler test --no-compile test/*.test.js",
     "build": "build.js",
     "patch": "npm version patch",
     "pub": "npm publish",

networks.json

@@ -1,9 +1,9 @@
 usePlugin("@nomiclabs/buidler-truffle5");
-// import { internalTask, task, types } from "../internal/core/config/config-env";
 
 task("deployUpdate", "Deploy and Update Contracts")
-.setAction(async (taskArgs, env) => {
-    console.log({internalTask})
-    await internalTask('deploy')
-    await internalTask('update')
+.addFlag("v", "Add verbose output to the command", false)
+.addOptionalVariadicPositionalParam("overwrite", "Just list the contract names you'd like to overwrite", [])
+.setAction(async ({v, overwrite}, { run }) => {
+    var contracts = await run('deploy', {overwrite, v})
+    await run('update', {v, contracts})
 })

package.json

@@ -7,9 +7,9 @@ const path = require('path')
 const confFile = path.join(__dirname, '../conf/network-restore')
 const conf = require(confFile)
 const artifactor = new Artifactor(conf.buildPath);
-const verbose = true
-const overwrites = {
-    Reversi: true,
+
+let overwrites = {
+    Reversi: false,
     Support: false,
     Clovers: false,
     CloversMetadata: false,
@@ -19,7 +19,15 @@ const overwrites = {
     ClubToken: false
 }
 task("deploy", "Deploys contracts")
- .setAction(async (taskArgs, env) => {
+.addFlag("v", "Add verbose output to the command", false)
+.addOptionalVariadicPositionalParam("overwrite", "Just list the contract names you'd like to overwrite", [])
+.setAction(async ({ overwrite, v }, env) => {
+    const verbose = v
+    overwrite.forEach(element => {
+        if (overwrites[element] === undefined) throw new Error(`${element} does not exist`)
+        overwrites[element] = true
+    });
+
     const accounts = await web3.eth.getAccounts();
     var {
         reversi, 
@@ -30,6 +38,7 @@ task("deploy", "Deploys contracts")
         simpleCloversMarket, 
         clubToken
     } = await deployAllContracts({overwrites, accounts, artifacts, web3, verbose})
+
     // save contract info inside of ./truffle/
     await saveNetworks([reversi, 
         clovers, 
@@ -38,8 +47,18 @@ task("deploy", "Deploys contracts")
         clubTokenController, 
         simpleCloversMarket, 
         clubToken])
+
     // save network info inside of ./networks.json
     await extractNetworks(confFile)
+    return {
+        reversi, 
+        clovers, 
+        cloversMetadata, 
+        cloversController, 
+        clubTokenController, 
+        simpleCloversMarket, 
+        clubToken
+    }
  });
 
  async function saveNetworks(contractArray) {

tasks/deploy-update.js

@@ -1,12 +1,11 @@
 usePlugin("@nomiclabs/buidler-truffle5");
-var networks =require('../networks.json')
 var { deployAllContracts } = require('../helpers/deployAllContracts')
 var { updateAllContracts } = require('../helpers/updateAllContracts')
 
-const verbose = true
-
-task('update', 'Updates contract values').
-setAction(async (taskArgs, env) => {
+task('update', 'Updates contract values')
+.addFlag("v", "Add verbose output to the command", false)
+.setAction(async ({v, contracts}, env) => {
+    verbose = v
     const accounts = await web3.eth.getAccounts()
     var {
         reversi, 
@@ -16,8 +15,8 @@ setAction(async (taskArgs, env) => {
         clubTokenController, 
         simpleCloversMarket, 
         clubToken
-    } = await deployAllContracts({accounts, artifacts, web3})
-    
+    } = contracts || await deployAllContracts({accounts, artifacts, web3})
+
     await updateAllContracts({
         clovers, 
         cloversMetadata,