done

comments

comments

remove gasLimits and arcConstants

lint

comments

.gitignore

docs

typo

supposed to use gas estimates in tests

.gitignore

@@ -12,4 +12,3 @@ yarn.lock
 test-build/
 site/
 docs/api/
-arcConstants.js

config/default.json

@@ -4,6 +4,7 @@
   "cacheContractWrappers": true,
   "logLevel": 9,
   "estimateGas": false,
+  "defaultGasLimit": 4543760,
   "gasPriceAdjustor": null,
   "txDepthRequiredForConfirmation": {
     "default": 7,

docs/Configuration.md

@@ -9,6 +9,9 @@ Automatically approve token transfers for operations that require the sender pay
 **cacheContractWrappers**
 `true` to cache contract wrappers obtained using the contract wrapper factory methods `.at` and `.new`.  The cache is local, it does not persist across application instances.  The default is `false`.
 
+**defaultGasLimit**
+The default gas limit used for most operations when "estimateGas" is false.
+
 **defaultVotingMachine**
 The voting machine used by default by `Dao.new` when creating new DAOs.  Default is "AbsoluteVote".
 

docs/Migration.md

@@ -23,9 +23,6 @@ Arc.js ships with contracts already migrated to Kovan and MainNet.  But you may
     !!! warning
         The mnemonic won't work unless it confirms to [BIP39](https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki).  You can generate examples of conformant mnemonics [here](https://iancoleman.io/bip39/).
 
-    !!! info
-        The migration script will use the gas settings defined in the Arc.js file `arc.js/gasLimits.js`.  The gas limit when migrating/creating Daos is computed dynamically as a function of the number of founders.
-
 3. Provide a list of Genesis DAO founders as described in [configuring founders](#configuring-founders).
 
 4. If deploying to ganache, then run `npm start ganache`, or from your application: `npm explore @daostack/arc.js -- npm start ganache`.

lib/contractWrapperBase.ts

@@ -1,6 +1,5 @@
 import { BigNumber } from "bignumber.js";
 import { promisify } from "es6-promisify";
-import { computeMaxGasLimit } from "../gasLimits.js";
 import { Address, Hash, SchemePermissions } from "./commonTypes";
 import { ConfigService } from "./configService";
 import { ControllerService } from "./controllerService";
@@ -20,6 +19,7 @@ import {
   TxGeneratingFunctionOptions
 } from "./transactionService";
 import { Utils } from "./utils";
+import { UtilsInternal } from "./utilsInternal";
 import { EventFetcherFactory, Web3EventService } from "./web3EventService";
 
 /**
@@ -176,9 +176,7 @@ export abstract class ContractWrapperBase implements IContractWrapper {
 
     const currentNetwork = await Utils.getNetworkName();
 
-    const web3 = await Utils.getWeb3();
-
-    const maxGasLimit = await computeMaxGasLimit(web3);
+    const maxGasLimit = await UtilsInternal.computeMaxGasLimit();
 
     if (currentNetwork === "Ganache") {
       return maxGasLimit; // because who cares with ganache and we can't get good estimates from it
@@ -313,14 +311,14 @@ export abstract class ContractWrapperBase implements IContractWrapper {
     try {
       let error;
 
-      const gasPriceComputer = ConfigService.get("gasPriceAdjustment") as GasPriceAdjustor;
+      const gasPriceComputed = ConfigService.get("gasPriceAdjustment") as GasPriceAdjustor;
+      const web3 = await Utils.getWeb3();
 
-      if (gasPriceComputer && !web3Params.gasPrice) {
-        const web3 = await Utils.getWeb3();
-        if (gasPriceComputer) {
+      if (gasPriceComputed && !web3Params.gasPrice) {
+        if (gasPriceComputed) {
           const defaultGasPrice =
             await promisify((callback: any): void => { web3.eth.getGasPrice(callback); })() as BigNumber;
-          web3Params.gasPrice = await gasPriceComputer(defaultGasPrice);
+          web3Params.gasPrice = await gasPriceComputed(defaultGasPrice);
         }
         LoggingService.debug(
           `invoking function with configured gasPrice: ${web3.fromWei(web3Params.gasPrice, "gwei")}`);
@@ -337,6 +335,9 @@ export abstract class ContractWrapperBase implements IContractWrapper {
             LoggingService.error(`estimateGas failed: ${ex}`);
             error = ex;
           });
+      } else if (web3Params.gas) {
+        // cap any already-given gas limit
+        web3Params.gas = Math.min(web3Params.gas, await UtilsInternal.computeMaxGasLimit());
       }
 
       if (error) {

lib/contractWrapperFactory.ts

@@ -1,8 +1,11 @@
+import { promisify } from "es6-promisify";
 import { Address } from "./commonTypes";
+import { ConfigService } from "./configService";
 import { IConfigService } from "./iConfigService";
 import { IContractWrapper, IContractWrapperFactory } from "./iContractWrapperBase";
 import { LoggingService } from "./loggingService";
 import { Utils } from "./utils";
+import { UtilsInternal } from "./utilsInternal";
 import { Web3EventService } from "./web3EventService";
 
 /**
@@ -44,6 +47,17 @@ export class ContractWrapperFactory<TWrapper extends IContractWrapper>
   public async new(...rest: Array<any>): Promise<TWrapper> {
     await this.ensureSolidityContract();
 
+    let gas;
+
+    if (ConfigService.get("estimateGas") && (!rest || !rest.length || (!rest[rest.length - 1].gas))) {
+      gas = await this.estimateConstructorGas(...rest);
+      LoggingService.debug(`Instantiating ${this.solidityContractName} with gas: ${gas}`);
+    }
+
+    if (gas) {
+      rest = [...rest, { gas }];
+    }
+
     const hydratedWrapper =
       await new this.wrapper(this.solidityContract, this.web3EventService).hydrateFromNew(...rest);
 
@@ -84,6 +98,28 @@ export class ContractWrapperFactory<TWrapper extends IContractWrapper>
     return this.getHydratedWrapper(getWrapper);
   }
 
+  protected async estimateConstructorGas(...params: Array<any>): Promise<number> {
+    const web3 = await Utils.getWeb3();
+    await this.ensureSolidityContract();
+    const callData = (web3.eth.contract(this.solidityContract.abi).new as any).getData(
+      ...params,
+      {
+        data: this.solidityContract.bytecode,
+      });
+
+    const currentNetwork = await Utils.getNetworkName();
+
+    const maxGasLimit = await UtilsInternal.computeMaxGasLimit();
+
+    if (currentNetwork === "Ganache") {
+      return maxGasLimit; // because who cares with ganache and we can't get good estimates from it
+    }
+
+    const gas = await promisify((callback: any) => web3.eth.estimateGas({ data: callData }, callback))() as number;
+
+    return Math.max(Math.min(gas, maxGasLimit), 21000);
+  }
+
   private async getHydratedWrapper(
     getWrapper: () => Promise<TWrapper>,
     address?: Address): Promise<TWrapper> {

lib/index.ts

@@ -44,7 +44,6 @@ export * from "./proposalGeneratorBase";
 export * from "./loggingService";
 export * from "./transactionService";
 export * from "./utils";
-export const computeForgeOrgGasLimit: any = require("../gasLimits.js").computeForgeOrgGasLimit;
 
 import { Web3 } from "web3";
 import { AccountService } from "./accountService";
@@ -85,7 +84,7 @@ export async function InitializeArcJs(options?: InitializeArcOptions): Promise<W
      */
     ContractWrapperFactory.setConfigService(ConfigService);
     /**
-     * Initialize LoggingService here to avoid cirular dependency involving ConfigService and PubSubService
+     * Initialize LoggingService here to avoid circular dependency involving ConfigService and PubSubService
      */
     LoggingService.logLevel = parseInt(ConfigService.get("logLevel"), 10) as LogLevel;
     /**

lib/migrations/2_deploy_schemes.ts

@@ -1,7 +1,7 @@
 import { Web3 } from "web3";
 import { Utils } from "../utils";
+import { UtilsInternal } from "../utilsInternal";
 /* tslint:disable-next-line:no-var-requires */
-const computeMaxGasLimit: any = require("../../gasLimits.js").computeMaxGasLimit;
 /* tslint:disable-next-line:no-var-requires */
 const env = require("env-variable")();
 
@@ -53,7 +53,7 @@ export const arcJsDeployer = (
     console.log(`Deploying schemes to ${network}`);
 
     const DAOToken = await Utils.requireContract("DAOToken");
-    const gasLimit = await computeMaxGasLimit(web3);
+    const gasLimit = await UtilsInternal.computeMaxGasLimit();
     const gasPrice = 10000000000; // 10 Gwei
     let genTokenAddress;