add EssentialWeb3Transaction; fix tronweb with backward compatibility

allbridge-io · Jan 14, 2025 · 812996f · 812996f
1 parent 9fe61fa
commit 812996f
Show file tree

Hide file tree

Showing 16 changed files with 6,911 additions and 5,037 deletions.
diff --git a/examples/pnpm-lock.yaml b/examples/pnpm-lock.yaml
diff --git a/examples/src/examples/bridge/trx/trx-build-send-tx-gas-fee-with-stables.ts b/examples/src/examples/bridge/trx/trx-build-send-tx-gas-fee-with-stables.ts
@@ -4,6 +4,7 @@ import {
   FeePaymentMethod,
   Messenger,
   nodeRpcUrlsDefault,
+  RawTronTransaction,
 } from "@allbridge/bridge-core-sdk";
 import { getEnvVar } from "../../../utils/env";
 import { ensure } from "../../../utils/utils";
@@ -32,10 +33,10 @@ const main = async () => {
   //check if sending tokens already approved
   if (!(await sdk.bridge.checkAllowance({ token: sourceToken, owner: fromAddress, amount: amountToSendFloat }))) {
     // authorize the bridge to transfer tokens from sender's address
-    const rawTransactionApprove = await sdk.bridge.rawTxBuilder.approve({
+    const rawTransactionApprove = (await sdk.bridge.rawTxBuilder.approve({
       token: sourceToken,
       owner: fromAddress,
-    });
+    })) as RawTronTransaction;
     const approveReceipt = await sendTrxRawTransaction(rawTransactionApprove);
     console.log("Approve transaction receipt", JSON.stringify(approveReceipt, null, 2));
   }
@@ -60,7 +61,7 @@ const main = async () => {
     gasFeePaymentMethod: FeePaymentMethod.WITH_STABLECOIN,
     fee: gasFeeAmount.int,
   };
-  const rawTransactionTransfer = await sdk.bridge.rawTxBuilder.send(params);
+  const rawTransactionTransfer = (await sdk.bridge.rawTxBuilder.send(params)) as RawTronTransaction;
 
   const transferReceipt = await sendTrxRawTransaction(rawTransactionTransfer);
   console.log("Transfer tokens transaction receipt:", transferReceipt);

diff --git a/examples/src/examples/bridge/trx/trx-build-send-tx.ts b/examples/src/examples/bridge/trx/trx-build-send-tx.ts
@@ -1,4 +1,10 @@
-import { AllbridgeCoreSdk, ChainSymbol, Messenger, nodeRpcUrlsDefault } from "@allbridge/bridge-core-sdk";
+import {
+  AllbridgeCoreSdk,
+  ChainSymbol,
+  Messenger,
+  nodeRpcUrlsDefault,
+  RawTronTransaction,
+} from "@allbridge/bridge-core-sdk";
 import * as dotenv from "dotenv";
 import { getEnvVar } from "../../../utils/env";
 import { ensure } from "../../../utils/utils";
@@ -25,23 +31,23 @@ const main = async () => {
   //check if sending tokens already approved
   if (!(await sdk.bridge.checkAllowance({ token: sourceToken, owner: fromAddress, amount: amount }))) {
     // authorize the bridge to transfer tokens from sender's address
-    const rawTransactionApprove = await sdk.bridge.rawTxBuilder.approve({
+    const rawTransactionApprove = (await sdk.bridge.rawTxBuilder.approve({
       token: sourceToken,
       owner: fromAddress,
-    });
+    })) as RawTronTransaction;
     const approveReceipt = await sendTrxRawTransaction(rawTransactionApprove);
     console.log("Approve transaction receipt", JSON.stringify(approveReceipt, null, 2));
   }
 
   // initiate transfer
-  const rawTransactionTransfer = await sdk.bridge.rawTxBuilder.send({
+  const rawTransactionTransfer = (await sdk.bridge.rawTxBuilder.send({
     amount: amount,
     fromAccountAddress: fromAddress,
     toAccountAddress: toAddress,
     sourceToken: sourceToken,
     destinationToken: destinationToken,
     messenger: Messenger.ALLBRIDGE,
-  });
+  })) as RawTronTransaction;
 
   const transferReceipt = await sendTrxRawTransaction(rawTransactionTransfer);
   console.log("Transfer tokens transaction receipt:", transferReceipt);

diff --git a/examples/src/examples/bridge/trx/trx-build-swap-tx.ts b/examples/src/examples/bridge/trx/trx-build-swap-tx.ts
@@ -1,4 +1,10 @@
-import { AllbridgeCoreSdk, ChainSymbol, SwapParams, nodeRpcUrlsDefault } from "@allbridge/bridge-core-sdk";
+import {
+  AllbridgeCoreSdk,
+  ChainSymbol,
+  SwapParams,
+  nodeRpcUrlsDefault,
+  RawTronTransaction,
+} from "@allbridge/bridge-core-sdk";
 import * as dotenv from "dotenv";
 import { getEnvVar } from "../../../utils/env";
 import { ensure } from "../../../utils/utils";
@@ -25,10 +31,10 @@ const main = async () => {
   //check if sending tokens already approved
   if (!(await sdk.bridge.checkAllowance({ token: sourceToken, owner: fromAddress, amount: amount }))) {
     // authorize the bridge to transfer tokens from sender's address
-    const rawTransactionApprove = await sdk.bridge.rawTxBuilder.approve({
+    const rawTransactionApprove = (await sdk.bridge.rawTxBuilder.approve({
       token: sourceToken,
       owner: fromAddress,
-    });
+    })) as RawTronTransaction;
     const approveReceipt = await sendTrxRawTransaction(rawTransactionApprove);
     console.log("Approve transaction receipt", JSON.stringify(approveReceipt, null, 2));
   }
@@ -42,11 +48,11 @@ const main = async () => {
     destinationToken: destinationToken,
     minimumReceiveAmount: await sdk.getAmountToBeReceived(amount, sourceToken, destinationToken),
   };
-  const rawTransactionTransfer = await sdk.bridge.rawTxBuilder.send(swapParams);
+  const rawTransactionTransfer = (await sdk.bridge.rawTxBuilder.send(swapParams)) as RawTronTransaction;
 
   console.log(`Sending ${amount} ${sourceToken.symbol}`);
   const txReceipt = await sendTrxRawTransaction(rawTransactionTransfer);
-  console.log("tx id:", txReceipt.txid);
+  console.log("txReceipt:", txReceipt);
 };
 
 main()

diff --git a/examples/src/examples/liquidity-pool/trx/trx-build-claim-rewards-tx.ts b/examples/src/examples/liquidity-pool/trx/trx-build-claim-rewards-tx.ts
@@ -21,7 +21,7 @@ const main = async () => {
   })) as RawTronTransaction;
 
   const txReceipt = await sendTrxRawTransaction(rawTransactionDeposit);
-  console.log("Token claim rewards:", txReceipt.txid);
+  console.log("Token claim rewards txReceipt:", txReceipt);
 };
 
 main()

diff --git a/examples/src/examples/liquidity-pool/trx/trx-build-deposit-tx.ts b/examples/src/examples/liquidity-pool/trx/trx-build-deposit-tx.ts
@@ -23,7 +23,7 @@ const main = async () => {
   })) as RawTronTransaction;
 
   const txReceipt = await sendTrxRawTransaction(rawTransactionDeposit);
-  console.log("Token deposit:", txReceipt.txid);
+  console.log("Token deposit txReceipt:", txReceipt);
 };
 
 main()

diff --git a/examples/src/examples/liquidity-pool/trx/trx-build-withdraw-tx.ts b/examples/src/examples/liquidity-pool/trx/trx-build-withdraw-tx.ts
@@ -23,7 +23,7 @@ const main = async () => {
   })) as RawTronTransaction;
 
   const txReceipt = await sendTrxRawTransaction(rawTransactionDeposit);
-  console.log("Token withdraw:", txReceipt.txid);
+  console.log("Token withdraw txReceipt:", txReceipt);
 };
 
 main()

diff --git a/package.json b/package.json
@@ -110,7 +110,8 @@
     "timed-cache": "^2.0.0",
     "tronweb": "^6.0.0",
     "web3": "^4.16.0",
-    "web3-eth-contract": "^4.7.2"
+    "web3-eth-contract": "^4.7.2",
+    "web3-types": "^1.10.0"
   },
   "jest": {
     "transform": {
@@ -122,5 +123,6 @@
     "transformIgnorePatterns": [
       "<rootDir>/node_modules/.pnpm/(?!(timed-cache))"
     ]
-  }
+  },
+  "packageManager": "[email protected]+sha256.9bee59c7313a216722c079c1e22160dea7f88df4e0c3450b1d7b01b882336c6a"
 }