From eaebdbb80e5ebb150c7d018dbfcbceab6d9c2bc5 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Thu, 3 Aug 2023 15:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9eth=E8=BD=AC=E8=B4=A6?=
 =?UTF-8?q?=E7=9A=84gas=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/chain/BlockChain.ts   | 3 ++-
 src/chain/ERC20Reactor.ts | 2 ++
 src/chain/allchain.ts     | 2 +-
 src/common/Constants.ts   | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/chain/BlockChain.ts b/src/chain/BlockChain.ts
index 1b19ccc..598cabd 100644
--- a/src/chain/BlockChain.ts
+++ b/src/chain/BlockChain.ts
@@ -14,6 +14,7 @@ import assert from 'assert'
 import { IPriceData } from 'structs/PriceData'
 import { IChainData } from 'structs/ChainData'
 import { PriceSvr } from 'service/price.service'
+import { CHAIN_GAS_BOOST } from 'common/Constants'
 
 @singleton
 export class BlockChain {
@@ -121,7 +122,7 @@ export class BlockChain {
     return this.web3.eth.sendTransaction({
       from,
       to,
-      gas: 21000,
+      gas: (gas * CHAIN_GAS_BOOST) | 0,
       value: amountToSend,
     })
   }
diff --git a/src/chain/ERC20Reactor.ts b/src/chain/ERC20Reactor.ts
index e20645a..5c4fd84 100644
--- a/src/chain/ERC20Reactor.ts
+++ b/src/chain/ERC20Reactor.ts
@@ -5,6 +5,7 @@ import { Contract } from 'web3-eth-contract'
 import { Account } from 'web3-core'
 import { AllChains } from './allchain'
 import { HttpRetryProvider } from './HttpRetryProvider'
+import { CHAIN_GAS_BOOST } from 'common/Constants'
 
 const abiFt = require('abis/ERC20.json').abi
 export class ERC20Reactor {
@@ -150,6 +151,7 @@ export class ERC20Reactor {
       from === this.account.address
         ? await contract.methods.transfer(to, amountBN).estimateGas()
         : await contract.methods.transferFrom(from, to, amountBN).estimateGas()
+    gasEstimate = (gasEstimate * CHAIN_GAS_BOOST) | 0
     if (estimate) {
       return gasEstimate
     }
diff --git a/src/chain/allchain.ts b/src/chain/allchain.ts
index ef84e25..4aa0136 100644
--- a/src/chain/allchain.ts
+++ b/src/chain/allchain.ts
@@ -210,7 +210,7 @@ export const AllChains = [
   {
     name: 'Arbitrum One',
     type: 'Mainnet',
-    rpc: 'https://endpoints.omniatech.io/v1/arbitrum/one/public|https://rpc.ankr.com/arbitrum',
+    rpc: 'https://arb1.arbitrum.io/rpc',
     id: 42161,
     network: 'ARBITRUM',
     symbol: 'ETH',
diff --git a/src/common/Constants.ts b/src/common/Constants.ts
index a3dfa70..aa74409 100644
--- a/src/common/Constants.ts
+++ b/src/common/Constants.ts
@@ -11,3 +11,5 @@ export const CONFIRM_MAIL_HTML = `
 <p>点击链接进入确认页面, 如果无法跳转, 就复制链接, 电脑上直接用浏览器打开, 手机上使用MetaMask的浏览器打开</p>
 <p><a href="{{link}}" target="_blank">{{link2}}</a></p>
 `
+
+export const CHAIN_GAS_BOOST = 1.3