ci-make-deploy-preview

apps/token/README.md

@@ -2,7 +2,7 @@
 
 **_Control panel for your VEGA tokens_**
 
-<img width="1438" alt="Screenshot 2021-12-11 at 06 32 51" src="https://user-images.githubusercontent.com/13255539/145666935-563fc1ff-35bc-4cd9-ae6d-cf711cc23454.png">
+<img width="1437" alt="Screenshot 2021-12-11 at 06 32 51" src="https://user-images.githubusercontent.com/13255539/145666935-563fc1ff-35bc-4cd9-ae6d-cf711cc23454.png">
 
 ## Features
 

libs/smart-contracts/src/contracts/staking-bridge.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/staking_abi.json';
-import { prepend0x } from '../utils';
+import { calcGasBuffer, prepend0x } from '../utils';
 
 export class StakingBridge {
   public contract: ethers.Contract;
@@ -14,18 +14,37 @@ export class StakingBridge {
     this.address = address;
   }
 
-  stake(amount: string, vegaPublicKey: string) {
-    return this.contract.stake(amount, prepend0x(vegaPublicKey));
+  async stake(amount: string, vegaPublicKey: string) {
+    const spender = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.stake(amount, spender);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.stake(amount, spender, {
+      gasLimit,
+    });
   }
-  remove_stake(amount: string, vegaPublicKey: string) {
-    return this.contract.remove_stake(amount, prepend0x(vegaPublicKey));
+  async remove_stake(amount: string, vegaPublicKey: string) {
+    const spender = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.remove_stake(amount, spender);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.remove_stake(amount, spender, {
+      gasLimit,
+    });
   }
-  transfer_stake(amount: string, newAddress: string, vegaPublicKey: string) {
-    return this.contract.transfer_stake(
+  async transfer_stake(
+    amount: string,
+    newAddress: string,
+    vegaPublicKey: string
+  ) {
+    const pubkey = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.transfer_stake(
       amount,
       newAddress,
-      prepend0x(vegaPublicKey)
+      pubkey
     );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.transfer_stake(amount, newAddress, pubkey, {
+      gasLimit,
+    });
   }
   staking_token() {
     return this.contract.staking_token();

libs/smart-contracts/src/contracts/token-vesting.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/vesting_abi.json';
-import { prepend0x } from '../utils';
+import { prepend0x, calcGasBuffer } from '../utils';
 
 export class TokenVesting {
   public contract: ethers.Contract;
@@ -14,11 +14,21 @@ export class TokenVesting {
     this.address = address;
   }
 
-  stake_tokens(amount: string, vegaPublicKey: string) {
-    return this.contract.stake_tokens(amount, prepend0x(vegaPublicKey));
+  async stake_tokens(amount: string, vegaPublicKey: string) {
+    const spender = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.stake_tokens(amount, spender);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.stake_tokens(amount, spender, {
+      gasLimit,
+    });
   }
-  remove_stake(amount: string, vegaPublicKey: string) {
-    return this.contract.remove_stake(amount, prepend0x(vegaPublicKey));
+  async remove_stake(amount: string, vegaPublicKey: string) {
+    const spender = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.remove_stake(amount, spender);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.remove_stake(amount, spender, {
+      gasLimit,
+    });
   }
   stake_balance(address: string, vegaPublicKey: string) {
     return this.contract.stake_balance(address, prepend0x(vegaPublicKey));
@@ -38,7 +48,13 @@ export class TokenVesting {
   user_total_all_tranches(address: string) {
     return this.contract.user_total_all_tranches(address);
   }
-  withdraw_from_tranche(trancheId: number) {
-    return this.contract.withdraw_from_tranche(trancheId);
+  async withdraw_from_tranche(trancheId: number) {
+    const res = await this.contract.estimateGas.withdraw_from_tranche(
+      trancheId
+    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.withdraw_from_tranche(trancheId, {
+      gasLimit,
+    });
   }
 }

libs/smart-contracts/src/contracts/token.ts

@@ -1,6 +1,7 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import erc20Abi from '../abis/erc20_abi.json';
+import { calcGasBuffer } from '../utils';
 
 export class Token {
   public contract: ethers.Contract;
@@ -23,8 +24,12 @@ export class Token {
   allowance(owner: string, spender: string): Promise<BigNumber> {
     return this.contract.allowance(owner, spender);
   }
-  approve(spender: string, amount: string) {
-    return this.contract.approve(spender, amount);
+  async approve(spender: string, amount: string) {
+    const res = await this.contract.estimateGas.approve(spender, amount);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.approve(spender, amount, {
+      gasLimit,
+    });
   }
   decimals(): Promise<number> {
     return this.contract.decimals();

libs/smart-contracts/src/utils/calc-gas-buffer.ts

@@ -0,0 +1,5 @@
+import type { BigNumber as EthersBigNumber } from 'ethers';
+
+export function calcGasBuffer(value: EthersBigNumber): EthersBigNumber {
+  return value.mul(120).div(100);
+}

libs/smart-contracts/src/utils/index.ts

@@ -1,2 +1,3 @@
 export * from './ascii-to-hex';
 export * from './prepend-0x';
+export * from './calc-gas-buffer';