fix: attempt to estimate gas for token reservation

Author: ross-rosario

src/LowLevel/LowLevel.ts

@@ -81,8 +81,8 @@ a browser, make sure you have MetaMask installed and enabled.`
   public getAccount = async () => {
     const nodeAccounts = await web3.eth.getAccounts();
     const walletAccount = (web3.eth.accounts.wallet as Web3Wallet)[0] || {};
-
-    return nodeAccounts[0] || walletAccount.address;
+    const account = walletAccount.address || nodeAccounts[0];
+    return account;
   };
 
   public initialize = async ({

src/LowLevel/PolyToken.ts

@@ -4,14 +4,15 @@ import { PolyTokenAbi } from './abis/PolyTokenAbi';
 import { PolyTokenFaucetAbi } from './abis/PolyTokenFaucetAbi';
 import { Contract } from './Contract';
 import { Context } from './LowLevel';
+import { fromWei, toWei, prepareAndSendTx } from './utils';
+
 import {
   GenericContract,
   AllowanceArgs,
   GetTokensArgs,
   BalanceOfArgs,
   ApproveArgs,
 } from './types';
-import { fromWei, toWei } from './utils';
 
 interface PolyTokenContract extends GenericContract {
   methods: {
@@ -84,9 +85,10 @@ export class PolyToken extends Contract<PolyTokenContract> {
     }
 
     return () =>
-      this.contract.methods
-        .approve(spender, amountInWei)
-        .send({ from: ownerAddress });
+      await prepareAndSendTx(
+        this.contract.methods.approve(spender, amountInWei),
+        { from: ownerAddress }
+      );
   };
 
   public symbol = async () => {

src/LowLevel/SecurityTokenRegistry.ts

@@ -12,7 +12,8 @@ import {
   GetTickerDetailsArgs,
   IsTickerAvailableArgs,
 } from './types';
-import { fromWei } from './utils';
+import { fromWei, prepareAndSendTx } from './utils';
+
 import { PolymathError } from '../PolymathError';
 import { ErrorCodes } from '../types';
 import { ZERO_ADDRESS } from './constants';
@@ -73,9 +74,10 @@ export class SecurityTokenRegistry extends Contract<
     tokenName,
   }: RegisterTickerArgs) => {
     return () =>
-      this.contract.methods
-        .registerTicker(owner, ticker, tokenName)
-        .send({ from: this.context.account });
+      prepareAndSendTx(
+        this.contract.methods.registerTicker(owner, ticker, tokenName),
+        { from: this.context.account }
+      );
   };
 
   public getTickerDetails = async ({ ticker }: GetTickerDetailsArgs) => {

src/LowLevel/utils.ts

@@ -1,5 +1,7 @@
 import Web3 from 'web3';
 import BigNumber from 'bignumber.js';
+import { web3 } from '../LowLevel/web3Client';
+import { Tx, TransactionObject } from 'web3/eth/types';
 
 const { utils } = Web3;
 
@@ -63,3 +65,25 @@ export function toAscii(value: string) {
 export function isAddress(value: string) {
   return utils.isAddress(value);
 }
+
+// @TODO add multiplier
+// @TODO add docs
+
+export async function prepareAndSendTx(
+  method: TransactionObject<any>,
+  options: Tx
+) {
+  const block = await web3.eth.getBlock('latest');
+  const networkGasLimit = block.gasLimit;
+  options.gasPrice = options.gasPrice || (await web3.eth.getGasPrice());
+  if (options.from) {
+    options.nonce =
+      options.nonce || (await web3.eth.getTransactionCount(options.from));
+  }
+  if (!options.gas) {
+    const gasLimit = await method.estimateGas(options);
+    // Do not exceed block gas limit.
+    if (gasLimit < networkGasLimit) options.gas = gasLimit;
+  }
+  return method.send(options);
+}

src/Polymath.ts

@@ -112,17 +112,18 @@ export class Polymath {
     polymathRegistryAddress,
     httpProvider,
     httpProviderUrl,
+    privateKey,
   }: PolymathNetworkParams) => {
     let lowLevel: LowLevel;
 
     if (httpProvider) {
       this.httpProvider = httpProvider;
-      lowLevel = new LowLevel({ provider: this.httpProvider });
+      lowLevel = new LowLevel({ provider: this.httpProvider, privateKey });
     } else if (httpProviderUrl) {
       this.httpProviderUrl = httpProviderUrl;
-      lowLevel = new LowLevel({ provider: this.httpProviderUrl });
+      lowLevel = new LowLevel({ provider: this.httpProviderUrl, privateKey });
     } else {
-      lowLevel = new LowLevel();
+      lowLevel = new LowLevel({ privateKey });
     }
 
     this.lowLevel = lowLevel;

src/types/index.ts

@@ -80,6 +80,7 @@ export interface PolymathNetworkParams {
   wsProvider?: WebsocketProvider;
   wsProviderUrl?: string;
   polymathRegistryAddress: string;
+  privateKey?: string;
 }
 
 export enum ProcedureTypes {