Merge pull request #143 from raid-guild/develop

removed custom gas price
This commit is contained in:
dan13ram 2021-02-19 01:07:26 +05:30 committed by GitHub
commit abe561c115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 35 deletions

View File

@ -1,9 +1,7 @@
import { Contract, utils } from 'ethers';
import { gql, request } from 'graphql-request';
import { getGasPrice } from './gasPrice';
import { getAMBAddress, getGraphEndpoint, logError } from './helpers';
import { isEIP1193 } from './providers';
export const fetchConfirmations = async (chainId, ethersProvider) => {
const abi = ['function requiredBlockConfirmations() view returns (uint256)'];
@ -50,12 +48,7 @@ export const executeSignatures = async (ethersProvider, chainId, message) => {
);
const address = getAMBAddress(chainId);
const ambContract = new Contract(address, abi, ethersProvider.getSigner());
const options = isEIP1193(ethersProvider)
? undefined
: { gasPrice: getGasPrice(chainId) };
return options
? ambContract.executeSignatures(message.msgData, signatures, options)
: ambContract.executeSignatures(message.msgData, signatures);
return ambContract.executeSignatures(message.msgData, signatures);
};
const messagesTXQuery = gql`

View File

@ -1,7 +1,6 @@
import { BigNumber, Contract } from 'ethers';
import { REVERSE_BRIDGE_ENABLED } from './constants';
import { getGasPrice } from './gasPrice';
import {
getBridgeNetwork,
getMediatorAddress,
@ -9,7 +8,7 @@ import {
logError,
} from './helpers';
import { getOverriddenToToken, isOverridden } from './overrides';
import { getEthersProvider, isEIP1193 } from './providers';
import { getEthersProvider } from './providers';
import { fetchTokenDetails } from './token';
const getToName = (fromName, fromxDai) => {
@ -241,32 +240,23 @@ export const fetchTokenLimits = async (
export const relayTokens = async (ethersProvider, token, receiver, amount) => {
const signer = ethersProvider.getSigner();
const { chainId, mode, mediator, address } = token;
const options = isEIP1193(ethersProvider)
? undefined
: { gasPrice: getGasPrice(chainId) };
const { mode, mediator, address } = token;
switch (mode) {
case 'erc677': {
const abi = ['function transferAndCall(address, uint256, bytes)'];
const tokenContract = new Contract(address, abi, signer);
return options
? tokenContract.transferAndCall(mediator, amount, receiver, options)
: tokenContract.transferAndCall(mediator, amount, receiver);
return tokenContract.transferAndCall(mediator, amount, receiver);
}
case 'dedicated-erc20': {
const abi = ['function relayTokens(address, uint256)'];
const mediatorContract = new Contract(mediator, abi, signer);
return options
? mediatorContract.relayTokens(receiver, amount, options)
: mediatorContract.relayTokens(receiver, amount);
return mediatorContract.relayTokens(receiver, amount);
}
case 'erc20':
default: {
const abi = ['function relayTokens(address, address, uint256)'];
const mediatorContract = new Contract(mediator, abi, signer);
return options
? mediatorContract.relayTokens(token.address, receiver, amount, options)
: mediatorContract.relayTokens(token.address, receiver, amount);
return mediatorContract.relayTokens(token.address, receiver, amount);
}
}
};

View File

@ -87,9 +87,7 @@ export const uniqueTokens = list => {
export const formatValue = (num, dec) => {
const str = utils.formatUnits(num, dec);
if (str.length > 50) {
const expStr = Number(str)
.toExponential()
.replace(/e\+?/, ' x 10^');
const expStr = Number(str).toExponential().replace(/e\+?/, ' x 10^');
const split = expStr.split(' x 10^');
const first = Number(split[0]).toLocaleString('en', {
maximumFractionDigits: 4,

View File

@ -1,14 +1,13 @@
import { BigNumber, Contract } from 'ethers';
import { ADDRESS_ZERO, REVERSE_BRIDGE_ENABLED } from './constants';
import { getGasPrice } from './gasPrice';
import { getMediatorAddress, isxDaiChain, logError } from './helpers';
import {
getOverriddenMediator,
getOverriddenMode,
isOverridden,
} from './overrides';
import { getEthersProvider, isEIP1193 } from './providers';
import { getEthersProvider } from './providers';
export const fetchAllowance = async (
{ mediator, address },
@ -100,17 +99,12 @@ export const fetchTokenDetails = async token => {
export const approveToken = async (
ethersProvider,
{ chainId, address, mediator },
{ address, mediator },
amount,
) => {
const abi = ['function approve(address, uint256)'];
const options = isEIP1193(ethersProvider)
? undefined
: { gasPrice: getGasPrice(chainId) };
const tokenContract = new Contract(address, abi, ethersProvider.getSigner());
return options
? tokenContract.approve(mediator, amount.toString(), options)
: tokenContract.approve(mediator, amount.toString());
return tokenContract.approve(mediator, amount);
};
export const fetchTokenBalance = async (token, account) => {