Set type 0 for legacy transaction (#1111)

ava-labs · Dec 13, 2023 · 01483f3 · 01483f3
1 parent 09cd8b3
commit 01483f3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/packages/core-mobile/app/screens/rpc/util/txToCustomEvmTx.ts b/packages/core-mobile/app/screens/rpc/util/txToCustomEvmTx.ts
@@ -10,7 +10,7 @@ export async function txToCustomEvmTx(
   from: string
   to: string
   value: BigNumberish | undefined
-  maxFeePerGas: bigint
+  gasPrice: bigint
 }> {
   if (!txParams) {
     throw new Error('params is malformed')
@@ -31,7 +31,7 @@ export async function txToCustomEvmTx(
   const gasLimit = Number(gas)
 
   return {
-    maxFeePerGas: sureGasPrice,
+    gasPrice: sureGasPrice,
     gasLimit: gasLimit,
     to,
     from,

diff --git a/packages/core-mobile/app/seedless/services/wallet/SeedlessWallet.ts b/packages/core-mobile/app/seedless/services/wallet/SeedlessWallet.ts
@@ -253,13 +253,13 @@ export default class SeedlessWallet implements Wallet {
       { provider }
     )
 
-    // seedless signer expects maxFeePerGas instead of gasPrice for EVM transactions
-    const nomalizedTx = { ...transaction }
-    if (transaction.gasPrice && !transaction.maxFeePerGas) {
-      nomalizedTx.maxFeePerGas = transaction.gasPrice
+    // set type 0 to indicate legacy transaction, since mobile doesn't support EIP-1559 yet
+    const legacyTx = {
+      ...transaction,
+      type: 0
     }
 
-    return signer.signTransaction(nomalizedTx)
+    return signer.signTransaction(legacyTx)
   }
 
   public async getPublicKey(): Promise<PubKeyType> {

diff --git a/packages/core-mobile/app/services/send/SendServiceEVM.ts b/packages/core-mobile/app/services/send/SendServiceEVM.ts
@@ -132,7 +132,7 @@ export class SendServiceEVM implements SendServiceHelper {
           ...unsignedTx,
           chainId,
           gasLimit,
-          maxFeePerGas: sendState.gasPrice,
+          gasPrice: sendState.gasPrice,
           nonce
         }
       })

diff --git a/...mobile/app/store/walletConnectV2/handlers/eth_sendTransaction/eth_sendTransaction.test.ts b/...mobile/app/store/walletConnectV2/handlers/eth_sendTransaction/eth_sendTransaction.test.ts
@@ -267,7 +267,7 @@ describe('eth_sendTransaction handler', () => {
           chainId: mockNetwork.chainId,
           data: '0x10000',
           gasLimit: 256,
-          maxFeePerGas: BigInt(testData.txParams.gasPrice),
+          gasPrice: BigInt(testData.txParams.gasPrice),
           to: testData.txParams.to,
           value: testData.txParams.value
         },
@@ -313,7 +313,7 @@ describe('eth_sendTransaction handler', () => {
           chainId: mockNetwork.chainId,
           data: '0x10000',
           gasLimit: 256,
-          maxFeePerGas: BigInt(testData.txParams.gasPrice),
+          gasPrice: BigInt(testData.txParams.gasPrice),
           to: testData.txParams.to,
           value: testData.txParams.value
         },

diff --git a/...core-mobile/app/store/walletConnectV2/handlers/eth_sendTransaction/eth_sendTransaction.ts b/...core-mobile/app/store/walletConnectV2/handlers/eth_sendTransaction/eth_sendTransaction.ts
@@ -137,7 +137,7 @@ class EthSendTransactionHandler
         {
           nonce,
           chainId: network.chainId,
-          maxFeePerGas: evmParams.maxFeePerGas,
+          gasPrice: evmParams.gasPrice,
           gasLimit: evmParams.gasLimit,
           data: evmParams.data,
           to: params.to,