From f471161512545a5ab14f71327adc16e0e1de062a Mon Sep 17 00:00:00 2001
From: cby3149 <cby3149@gmail.com>
Date: Mon, 6 Mar 2023 12:31:02 -0800
Subject: [PATCH] Fix gasLimit for unstaking and earn page

---
 .../boba/gateway/src/services/networkService.js     | 13 ++++++++++++-
 ..._0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/boba/gateway/src/services/networkService.js b/packages/boba/gateway/src/services/networkService.js
index a91102777a..8d0e7fb980 100644
--- a/packages/boba/gateway/src/services/networkService.js
+++ b/packages/boba/gateway/src/services/networkService.js
@@ -2671,6 +2671,16 @@ class NetworkService {
   async withdrawLiquidity(currency, value_Wei_String, L1orL2Pool) {
 
     try {
+      const estimateGas = await (L1orL2Pool === 'L1LP'
+        ? this.L1LPContract
+        : this.L2LPContract
+      ).estimateGas.withdrawLiquidity(
+        value_Wei_String,
+        currency,
+        this.account,
+        { from: this.account }
+      )
+      const blockGasLimit = (await this.provider.getBlock('latest')).gasLimit
       const TX = await (L1orL2Pool === 'L1LP'
         ? this.L1LPContract
         : this.L2LPContract
@@ -2679,7 +2689,8 @@ class NetworkService {
       .withdrawLiquidity(
         value_Wei_String,
         currency,
-        this.account
+        this.account,
+        { gasLimit: estimateGas.mul(2).gt(blockGasLimit) ? blockGasLimit : estimateGas.mul(2) }
       )
       await TX.wait()
       return TX
diff --git a/packages/boba/register/addresses/addressesMainnet_0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json b/packages/boba/register/addresses/addressesMainnet_0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json
index 3eb5d5cf8c..15653e90b5 100644
--- a/packages/boba/register/addresses/addressesMainnet_0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json
+++ b/packages/boba/register/addresses/addressesMainnet_0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json
@@ -3,6 +3,8 @@
   "OVM_L1CrossDomainMessenger":"0x12Acf6E3ca96A60fBa0BBFd14D2Fe0EB6ae47820",
   "Proxy__L1CrossDomainMessenger": "0x6D4528d192dB72E282265D6092F4B872f9Dff69e",
   "Proxy__L1StandardBridge":"0xdc1664458d2f0B6090bEa60A8793A4E66c2F1c00",
+  "TK_L1ETH": "0x0000000000000000000000000000000000000000",
+  "TK_L2ETH": "0x4200000000000000000000000000000000000006",
   "TK_L1OMG": "0xd26114cd6EE289AccF82350c8d8487fedB8A0C07",
   "TK_L2OMG": "0xe1E2ec9a85C607092668789581251115bCBD20de",
   "TK_L1USDT": "0xdac17f958d2ee523a2206206994597c13d831ec7",