From 2adbec8c77b08fb6e33907a31a06c1336981769c Mon Sep 17 00:00:00 2001
From: javiersuweijie <javier.su.weijie@gmail.com>
Date: Mon, 26 Aug 2024 14:34:32 +0800
Subject: [PATCH] fix: classic gas issues

---
 eth/package-lock.json |  6 ++++--
 eth/package.json      |  2 +-
 eth/src/Relayer.ts    | 32 +++++++++++++++++++++++++-------
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/eth/package-lock.json b/eth/package-lock.json
index ef1f0f6..eaa17af 100644
--- a/eth/package-lock.json
+++ b/eth/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-dynamodb": "^3.16.0",
-        "@terra-money/terra.js": "^3.0.0",
+        "@terra-money/terra.js": "3.1.9",
         "axios": "^0.26.1",
         "bech32": "^2.0.0",
         "bignumber.js": "^9.0.1",
@@ -3134,7 +3134,9 @@
       }
     },
     "node_modules/@terra-money/terra.js": {
-      "version": "3.1.10",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@terra-money/terra.js/-/terra.js-3.1.9.tgz",
+      "integrity": "sha512-JulSvOHLM56fL7s+cIjIbZeWPBluq883X1soWxA4TG5rKkDythT/DHeLXr3jP5Ld/26VENPSg6lNvK7cEYKpiw==",
       "license": "MIT",
       "dependencies": {
         "@classic-terra/terra.proto": "^1.1.0",
diff --git a/eth/package.json b/eth/package.json
index 219e692..bb6db38 100644
--- a/eth/package.json
+++ b/eth/package.json
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.16.0",
-    "@terra-money/terra.js": "^3.0.0",
+    "@terra-money/terra.js": "3.1.9",
     "axios": "^0.26.1",
     "bech32": "^2.0.0",
     "bignumber.js": "^9.0.1",
diff --git a/eth/src/Relayer.ts b/eth/src/Relayer.ts
index 919a712..61505cd 100644
--- a/eth/src/Relayer.ts
+++ b/eth/src/Relayer.ts
@@ -11,6 +11,8 @@ import {
   Coin,
   Tx,
   TxInfo,
+  Fee,
+  Coins,
 } from '@terra-money/terra.js';
 import { MonitoringData } from 'Monitoring';
 import axios from 'axios';
@@ -32,6 +34,12 @@ const TERRA_GAS_PRICE_END_POINT = process.env
 const TERRA_GAS_PRICE_DENOM = process.env.TERRA_GAS_PRICE_DENOM as string;
 const TERRA_GAS_ADJUSTMENT = process.env.TERRA_GAS_ADJUSTMENT as string;
 const TERRA_DONATION = process.env.TERRA_DONATION as string;
+const TERRA_TAX_RATE = parseFloat(
+  (process.env.TERRA_TAX_RATE as string) || '0'
+);
+const TERRA_SEND_GAS = parseInt(
+  (process.env.TERRA_SEND_GAS as string) || '1000000'
+);
 
 export interface RelayDataRaw {
   tx: string;
@@ -56,6 +64,7 @@ export class Relayer {
       chainID: TERRA_CHAIN_ID,
       gasPrices: TERRA_GAS_PRICE,
       gasAdjustment: TERRA_GAS_ADJUSTMENT,
+      isClassic: false,
     });
 
     this.Wallet = new Wallet(
@@ -72,6 +81,7 @@ export class Relayer {
     monitoringDatas: MonitoringData[],
     sequence: number
   ): Promise<RelayData | null> {
+    let amount, denom;
     const msgs: Msg[] = monitoringDatas.reduce(
       (msgs: Msg[], data: MonitoringData) => {
         const fromAddr = this.Wallet.key.accAddress;
@@ -86,11 +96,11 @@ export class Relayer {
           return msgs;
         }
 
-        const amount = data.amount.slice(0, data.amount.length - 12);
+        amount = data.amount.slice(0, data.amount.length - 12);
         const info = data.terraAssetInfo;
 
         if (info.denom) {
-          const denom = info.denom;
+          denom = info.denom;
 
           msgs.push(new MsgSend(fromAddr, toAddr, [new Coin(denom, amount)]));
         } else if (info.contract_address && !info.is_eth_asset) {
@@ -137,15 +147,23 @@ export class Relayer {
     }
 
     // if something wrong, pass undefined to use default gas
-    const gasPrices = await this.loadGasPrice(
-      TERRA_GAS_PRICE_END_POINT,
-      TERRA_GAS_PRICE_DENOM
-    ).catch(() => undefined);
+    // const gasPrices = await this.loadGasPrice(
+    //   TERRA_GAS_PRICE_END_POINT,
+    //   TERRA_GAS_PRICE_DENOM
+    // ).catch(() => undefined);
+
+    let fees = Coins.fromString(TERRA_GAS_PRICE)
+      .mul(TERRA_SEND_GAS)
+      .toIntCeilCoins();
+    const tax = new Coins([new Coin(denom, amount)])
+      .mul(TERRA_TAX_RATE)
+      .toIntCeilCoins();
+    fees = fees.add(tax);
 
     const tx = await this.Wallet.createAndSignTx({
       msgs,
       sequence,
-      gasPrices,
+      fee: new Fee(TERRA_SEND_GAS, fees),
     });
 
     const txHash = await this.LCDClient.tx.hash(tx);