Evm: Update signer to produce well formed txs for Oasis (#535)

Author: barnjamin

core/base/src/constants/rpc.ts

@@ -51,6 +51,7 @@ const rpcConfig = [[
     ["Fantom",          "https://rpc.ankr.com/fantom_testnet"],
     ["Celo",            "https://alfajores-forno.celo-testnet.org"],
     ["Solana",          "https://api.devnet.solana.com"],
+    ["Oasis",           "https://testnet.emerald.oasis.io"],
     ["Moonbeam",        "https://rpc.api.moonbase.moonbeam.network"],
     ["Sui",             "https://fullnode.testnet.sui.io"],
     ["Aptos",           "https://fullnode.testnet.aptoslabs.com/v1"],

examples/src/createWrapped.ts

@@ -9,25 +9,16 @@ import { getSigner } from "./helpers/index.js";
   const wh = await wormhole("Testnet", [evm, solana]);
 
   // Original Token to Attest
-  // const token: TokenId = Wormhole.chainAddress(
-  //   "Solana",
-  //   "9rU2jFrzA5zDDmt9yR7vEABvXCUNJ1YgGigdTb9oCaTv",
-  // );
-  const token: TokenId = Wormhole.chainAddress(
-    "Avalanche",
-    "0x3bE4bce46442F5E85c47257145578E724E40cF97",
-  );
 
   // grab context and signer
-  const origChain = wh.getChain(token.chain);
+  const origChain = wh.getChain("Oasis");
+  const token = await origChain.getNativeWrappedTokenId();
   const { signer: origSigner } = await getSigner(origChain);
 
   // Note: if the VAA is not produced before the attempt to retrieve it times out
   // you should set this value to the txid logged in the previous run
   let txid = undefined;
   // txid = "0x55127b9c8af46aaeea9ef28d8bf91e1aff920422fc1c9831285eb0f39ddca2fe";
-  // txid = "FPNHIFFUZDVPT5SATZQZZ7DFGZMPCCHEFBCB5EZQJV4RRK3ZYTVA";
-  // txid = "GWZU432ERFU3NES4MA7IAAP6DX73F5VRSSIWGJVC5JRHOH6UMWEQ";
 
   if (!txid) {
     // create attestation from origin chain, the same VAA
@@ -57,7 +48,7 @@ import { getSigner } from "./helpers/index.js";
   // Check if its attested and if not
   // submit the attestation to the token bridge on the
   // destination chain
-  const chain = "Algorand";
+  const chain = "Sepolia";
   const destChain = wh.getChain(chain);
   const { signer } = await getSigner(destChain);
 
@@ -94,4 +85,4 @@ import { getSigner } from "./helpers/index.js";
   }
 
   console.log("Wrapped: ", await waitForIt());
-})();
+})().catch((e) => console.error(e));

examples/src/helpers/helpers.ts

@@ -58,7 +58,9 @@ export async function getSigner<N extends Network, C extends Chain>(
       signer = await cosmwasm.getSigner(await chain.getRpc(), getEnv("COSMOS_MNEMONIC"));
       break;
     case "Evm":
-      signer = await evm.getSigner(await chain.getRpc(), getEnv("ETH_PRIVATE_KEY"));
+      signer = await evm.getSigner(await chain.getRpc(), getEnv("ETH_PRIVATE_KEY"), {
+        debug: true,
+      });
       break;
     case "Algorand":
       signer = await algorand.getSigner(await chain.getRpc(), getEnv("ALGORAND_MNEMONIC"));

examples/src/tokenBridge.ts

@@ -41,7 +41,7 @@ import { SignerStuff, getSigner, waitLog } from "./helpers/index.js";
   // Note: The Token bridge will dedust past 8 decimals
   // this means any amount specified past that point will be returned
   // to the caller
-  const amt = "0.001";
+  const amt = "0.05";
 
   // With automatic set to true, perform an automatic transfer. This will invoke a relayer
   // contract intermediary that knows to pick up the transfers

platforms/evm/src/signer.ts

@@ -89,34 +89,52 @@ export class EvmNativeSigner<N extends Network, C extends EvmChains = EvmChains>
   }
 
   async sign(tx: UnsignedTransaction<N, C>[]): Promise<SignedTx[]> {
+    const chain = this.chain();
+
     const signed = [];
 
     // default gas limit
     const gasLimit = this.opts?.maxGasLimit ?? 500_000n;
 
+    let gasPrice = 100_000_000_000n; // 100gwei
     let maxFeePerGas = 1_500_000_000n; // 1.5gwei
     let maxPriorityFeePerGas = 100_000_000n; // 0.1gwei
+
     // Celo does not support this call
-    if (this.chain() !== 'Celo') {
+    if (chain !== 'Celo') {
       const feeData = await this._signer.provider!.getFeeData();
+      gasPrice = feeData.gasPrice ?? gasPrice;
       maxFeePerGas = feeData.maxFeePerGas ?? maxFeePerGas;
       maxPriorityFeePerGas =
         feeData.maxPriorityFeePerGas ?? maxPriorityFeePerGas;
     }
 
+    // Oasis throws malformed errors unless we
+    // set it to use legacy transaction parameters
+    const gasOpts =
+      chain === 'Oasis'
+        ? {
+            gasLimit,
+            gasPrice: gasPrice,
+            // Hardcode type
+            type: 0,
+          }
+        : {
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+            gasLimit,
+          };
+
     for (const txn of tx) {
       const { transaction, description } = txn;
       if (this.opts?.debug)
         console.log(`Signing: ${description} for ${this.address()}`);
 
       const t: TransactionRequest = {
         ...transaction,
-        ...{
-          maxFeePerGas,
-          maxPriorityFeePerGas,
-          gasLimit,
-          nonce: await this._signer.getNonce(),
-        },
+        ...gasOpts,
+        from: this.address(),
+        nonce: await this._signer.getNonce(),
       };
 
       // try {