Move Util Function Broadcast out of Adapter (#100)

src/beta.ts

@@ -8,7 +8,12 @@ import {
   serializeSignature,
   serializeTransaction,
 } from "viem";
-import { addSignature, populateTx, toPayload } from "./utils/transaction";
+import {
+  addSignature,
+  populateTx,
+  relaySignedTransaction,
+  toPayload,
+} from "./utils/transaction";
 import { NearEthTxData, RecoveryData } from "./types";
 import { NearEthAdapter } from "./chains/ethereum";
 import { Web3WalletTypes } from "@walletconnect/web3wallet";
@@ -164,7 +169,7 @@ export class Beta {
     if (transaction) {
       const signedTx = addSignature({ transaction, signature });
       // Returns relayed transaction hash (without waiting for confirmation).
-      return this.adapter.relaySignedTransaction(signedTx, false);
+      return relaySignedTransaction(signedTx, false);
     }
     return serializeSignature(signature);
   }

src/chains/ethereum.ts

@@ -9,22 +9,19 @@ import {
   hashTypedData,
   TypedData,
   TypedDataDefinition,
-  parseTransaction,
-  keccak256,
 } from "viem";
 import {
   BaseTx,
   AdapterParams,
   FunctionCallTransaction,
   TxPayload,
-  TransactionWithSignature,
   SignArgs,
   MpcContract,
   Network,
   buildTxPayload,
-  addSignature,
   populateTx,
   toPayload,
+  broadcastSignedTransaction,
 } from "..";
 import { Beta } from "../beta";
 
@@ -97,7 +94,7 @@ export class NearEthAdapter {
       signArgs,
       nearGas
     );
-    return this.relayTransaction({ transaction, signature });
+    return broadcastSignedTransaction({ transaction, signature });
   }
 
   /**
@@ -146,17 +143,6 @@ export class NearEthAdapter {
     );
   }
 
-  /**
-   * Relays valid representation of signed transaction to Etherem mempool for execution.
-   *
-   * @param {TransactionWithSignature} tx - Signed Ethereum transaction.
-   * @returns Hash of relayed transaction.
-   */
-  async relayTransaction(tx: TransactionWithSignature): Promise<Hash> {
-    const signedTx = addSignature(tx);
-    return this.relaySignedTransaction(signedTx);
-  }
-
   /**
    * Builds a complete, unsigned transaction (with nonce, gas estimates, current prices)
    * and payload bytes in preparation to be relayed to Near MPC contract.
@@ -190,30 +176,6 @@ export class NearEthAdapter {
     return serializeTransaction(transaction);
   }
 
-  /**
-   * Relays signed transaction to Ethereum mem-pool for execution.
-   * @param serializedTransaction - Signed Ethereum transaction.
-   * @returns Transaction Hash of relayed transaction.
-   */
-  async relaySignedTransaction(
-    serializedTransaction: Hex,
-    wait: boolean = true
-  ): Promise<Hash> {
-    const tx = parseTransaction(serializedTransaction);
-    const network = Network.fromChainId(tx.chainId!);
-    if (wait) {
-      const hash = await network.client.sendRawTransaction({
-        serializedTransaction,
-      });
-      console.log(`Transaction Confirmed: ${network.scanUrl}/tx/${hash}`);
-      return hash;
-    } else {
-      network.client.sendRawTransaction({
-        serializedTransaction,
-      });
-      return keccak256(serializedTransaction);
-    }
-  }
   // Below code is inspired by https://github.com/Connor-ETHSeoul/near-viem
 
   async signTypedData<

src/index.ts

@@ -31,7 +31,7 @@ interface SetupConfig {
   accountId: string;
   mpcContractId: string;
   network?: NearConfig;
-  privateKey?: string;
+  privateKey?: `ed25519:${string}` | `secp256k1:${string}`;
   derivationPath?: string;
 }
 

src/utils/transaction.ts

@@ -1,4 +1,5 @@
 import {
+  Hash,
   Hex,
   PublicClient,
   TransactionSerializable,
@@ -69,3 +70,41 @@ export function addSignature({
   };
   return serializeTransaction(signedTx);
 }
+
+/**
+ * Relays signed transaction to Ethereum mem-pool for execution.
+ * @param serializedTransaction - Signed Ethereum transaction.
+ * @returns Transaction Hash of relayed transaction.
+ */
+export async function relaySignedTransaction(
+  serializedTransaction: Hex,
+  wait: boolean = true
+): Promise<Hash> {
+  const tx = parseTransaction(serializedTransaction);
+  const network = Network.fromChainId(tx.chainId!);
+  if (wait) {
+    const hash = await network.client.sendRawTransaction({
+      serializedTransaction,
+    });
+    console.log(`Transaction Confirmed: ${network.scanUrl}/tx/${hash}`);
+    return hash;
+  } else {
+    network.client.sendRawTransaction({
+      serializedTransaction,
+    });
+    return keccak256(serializedTransaction);
+  }
+}
+
+/**
+ * Relays valid representation of signed transaction to Etherem mempool for execution.
+ *
+ * @param {TransactionWithSignature} tx - Signed Ethereum transaction.
+ * @returns Hash of relayed transaction.
+ */
+export async function broadcastSignedTransaction(
+  tx: TransactionWithSignature
+): Promise<Hash> {
+  const signedTx = addSignature(tx);
+  return relaySignedTransaction(signedTx);
+}