fix: fix bug about #110 (#111)

packages/vvisp/contracts/test/DependencyA.sol

@@ -5,10 +5,17 @@ contract DependencyA {
  address addressB;
  address addressC;
  address owner;
+ bool initialized;
 
  constructor(address _addressB, address _addressC, address _owner) public {
  addressB = _addressB;
  addressC = _addressC;
  owner = _owner;
  }
+
+ function initialize() public {
+ require(!initialized);
+ // something
+ initialized = true;
+ }
 }

packages/vvisp/contracts/test/DependencyB.sol

@@ -5,10 +5,17 @@ contract DependencyB {
  uint tmp;
  address addressD;
  address owner;
+ bool initialized;
 
  constructor(uint _tmp, address _addressD, address _owner) public {
  tmp = _tmp;
  addressD = _addressD;
  owner = _owner;
  }
+
+ function initialize() public {
+ require(!initialized);
+ // something
+ initialized = true;
+ }
 }

packages/vvisp/contracts/test/SecondA.sol

@@ -4,13 +4,16 @@ pragma solidity >=0.5.0 <0.6.0;
 contract SecondA {
  address addressB;
  address addressC;
+ bool initialized = false;
 
  constructor(address _addressB, address _addressC, address[] memory _owners) public {
  addressB = _addressB;
  addressC = _addressC;
  }
 
  function initialize(address _token, address _owner, address[] memory _addressA) public {
+ require(!initialized);
  // something
+ initialized = true;
  }
 }

packages/vvisp/contracts/test/SecondD.sol

@@ -4,9 +4,16 @@ pragma solidity >=0.5.0 <0.6.0;
 contract SecondD {
  address addressB;
  address owner;
+ bool initialized = false;
 
  constructor(address _addressB, address _owner) public {
  addressB = _addressB;
  owner = _owner;
  }
+
+ function initialize() public {
+ require(!initialized);
+ // something
+ initialized = true;
+ }
 }

packages/vvisp/scripts/deploy-service/preProcess/checkError.js

@@ -6,7 +6,7 @@ module.exports = function(targets, compileOutput, options) {
  getCycle,
  printOrSilent
  } = require('@haechi-labs/vvisp-utils');
- const { hasConstructArgs, hasInitArgs, getVar } = require('../utils/index');
+ const { hasConstructArgs, hasInit, getVar } = require('../utils/index');
  const { INITIALIZE, CONSTRUCTOR, UPGRADEABLE } = require('../constants');
 
  printOrSilent(chalk.head('Check Arguments...'), options);
@@ -16,21 +16,24 @@ module.exports = function(targets, compileOutput, options) {
  const abi = JSON.parse(
  getCompiledContracts(compileOutput, filePath).interface
  );
- const hasInit = hasInitArgs(contract);
+ const hasInitialize = hasInit(contract);
  const hasConstruct = hasConstructArgs(contract);
- if (hasInit && hasConstruct) {
+ if (hasInitialize && hasConstruct) {
  let initialize = false;
  let constructorArguments = false;
  for (let i = 0; i < abi.length; i++) {
  if (
  abi[i].name === contract[INITIALIZE].functionName &&
  abi[i].type === 'function'
  ) {
- if (contract[INITIALIZE].arguments.length !== abi[i].inputs.length) {
+ const length = contract[INITIALIZE].arguments
+ ? contract[INITIALIZE].arguments.length
+ : 0;
+ if (length !== abi[i].inputs.length) {
  throw new Error(
  `Arguments Number Error at ${name}: Expected ${
  abi[i].inputs.length
- }, but ${contract[INITIALIZE].arguments.length}`
+ }, but ${length}`
  );
  }
  initialize = true;
@@ -49,17 +52,20 @@ module.exports = function(targets, compileOutput, options) {
  break;
  }
  }
- } else if (hasInit) {
+ } else if (hasInitialize) {
  for (let i = 0; i < abi.length; i++) {
  if (
  abi[i].name === contract[INITIALIZE].functionName &&
  abi[i].type === 'function'
  ) {
- if (contract[INITIALIZE].arguments.length !== abi[i].inputs.length) {
+ const length = contract[INITIALIZE].arguments
+ ? contract[INITIALIZE].arguments.length
+ : 0;
+ if (length !== abi[i].inputs.length) {
  throw new Error(
  `Arguments Number Error at ${name}: Expected ${
  abi[i].inputs.length
- }, but ${contract[INITIALIZE].arguments.length}`
+ }, but ${length}`
  );
  }
  break;

packages/vvisp/scripts/deploy-service/processes/initNonUpgradeables.js

@@ -40,6 +40,9 @@ module.exports = async function(deployState, options) {
  const { contract, name } = nonUpgradeables[i];
  const stateContract = stateClone.contracts[name];
 
+ if (!stateContract.pending) {
+ continue;
+ }
  const initialize = stateContract[INITIALIZE];
  if (initialize && initialize.functionName) {
  const instancePath = path.join('./', contract.path);

packages/vvisp/scripts/deploy-service/processes/injectVar.js

@@ -1,13 +1,13 @@
 module.exports = function(deployState) {
  const { CONSTRUCTOR, INITIALIZE, VARIABLES } = require('../constants');
  const { forIn } = require('@haechi-labs/vvisp-utils');
- const { getVar, hasConstructArgs, hasInitArgs } = require('../utils/index');
+ const { getVar, hasConstructArgs, hasInit } = require('../utils/index');
 
  const stateClone = deployState.getState();
  const variables = deployState[VARIABLES];
 
  forIn(stateClone.contracts, (contract, name) => {
- if (hasInitArgs(contract)) {
+ if (hasInit(contract)) {
  _injectVar(variables, stateClone, name, INITIALIZE);
  }
  if (hasConstructArgs(contract)) {
@@ -22,7 +22,7 @@ module.exports = function(deployState) {
  const _arguments =
  _type === CONSTRUCTOR
  ? _contract[CONSTRUCTOR]
- : _contract[INITIALIZE].arguments;
+ : _contract[INITIALIZE].arguments || [];
  const _path = `${_name}/${_type}`;
 
  _injecting(_variables, _stateClone, _path, _arguments, _contract);

packages/vvisp/scripts/deploy-service/utils/hasInit.js

@@ -0,0 +1,4 @@
+module.exports = function(contract) {
+ const { INITIALIZE } = require('../constants');
+ return contract[INITIALIZE] && contract[INITIALIZE].functionName;
+};

packages/vvisp/scripts/deploy-service/utils/index.js

@@ -1,13 +1,13 @@
 const getVar = require('./getVar');
 const hasConstructArgs = require('./hasConstructArgs');
-const hasInitArgs = require('./hasInitArgs');
+const hasInit = require('./hasInit');
 const pathToInstance = require('./pathToInstance');
 const writeState = require('./writeState.js');
 
 module.exports = {
  getVar,
  hasConstructArgs,
- hasInitArgs,
+ hasInit,
  pathToInstance,
  writeState
 };

packages/vvisp/test/dummy/justNonUpgradeables.service1.json

@@ -12,15 +12,25 @@
  "${contracts.DependencyB.address}",
  "${contracts.DependencyC.address}",
  "${variables.owner}"
- ]
+ ],
+ "initialize": {
+ "functionName": "initialize",
+ "arguments": [
+ ]
+ }
  },
  "DependencyB": {
  "path": "contracts/test/DependencyB.sol",
  "constructorArguments": [
  3,
  "${contracts.DependencyD.address}",
  "${variables.owner}"
- ]
+ ],
+ "initialize": {
+ "functionName": "initialize",
+ "arguments": [
+ ]
+ }
  },
  "DependencyC": {
  "path": "contracts/test/DependencyC.sol",

packages/vvisp/test/dummy/justNonUpgradeables.service2.json

@@ -63,7 +63,12 @@
  "constructorArguments": [
  "${variables.owner}",
  "${variables.owner}"
- ]
+ ],
+ "initialize": {
+ "functionName": "initialize",
+ "arguments": [
+ ]
+ }
  }
  }
 }

packages/vvisp/test/scripts/deploy-service/index.test.js

@@ -6,7 +6,7 @@ const deployService = require('../../../scripts/deploy-service/');
 const compareConfigAndState = require('../../../scripts/deploy-service/preProcess/compareConfigAndState');
 const { PENDING_STATE } = require('../../../scripts/deploy-service/constants');
 const { SERVICE_PATH, STATE_PATH, TEST } = require('../../../config/Constant');
-const { hasInitArgs } = require('../../../scripts/deploy-service/utils');
+const { hasInit } = require('../../../scripts/deploy-service/utils');
 const {
  Config,
  forIn,
@@ -192,7 +192,7 @@ function getWaitingTxNum() {
  nonUpgradeableExists = true;
  }
  resultNumber++; // nonUpgradeables
- if (hasInitArgs(contract)) {
+ if (hasInit(contract)) {
  resultNumber++; // init Tx
  }
  }