refactor

coinbase · Aug 11, 2024 · dc4bae3 · dc4bae3
1 parent 92e831e
commit dc4bae3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 33 deletions.
diff --git a/src/coinbase/transaction.ts b/src/coinbase/transaction.ts
@@ -8,7 +8,7 @@ import { parseUnsignedPayload } from "./utils";
  */
 export class Transaction {
   private model: TransactionModel;
-  private raw?: viem.Transaction;
+  private raw?: viem.TransactionSerializable;
   private signed: boolean | undefined;
 
   /**
@@ -107,22 +107,23 @@ export class Transaction {
    * @throws {InvalidUnsignedPayload} If the Unsigned Payload is invalid.
    * @returns The ethers.js Transaction object
    */
-  rawTransaction(): viem.Transaction {
+  rawTransaction(): viem.TransactionSerializable {
     if (this.raw) {
       return this.raw;
     }
     const parsedPayload = parseUnsignedPayload(this.getUnsignedPayload());
-    const transaction = {} as viem.Transaction;
-    transaction.chainId = Number(parsedPayload.chainId);
-    transaction.nonce = Number(parsedPayload.nonce);
-    transaction.maxPriorityFeePerGas = BigInt(parsedPayload.maxPriorityFeePerGas);
-    transaction.maxFeePerGas = BigInt(parsedPayload.maxFeePerGas);
-    // TODO: Handle multiple currencies.
-    transaction.gas = BigInt(parsedPayload.gas);
-    transaction.to = parsedPayload.to;
-    transaction.value = BigInt(parsedPayload.value);
-    transaction.input = parsedPayload.input;
-
+    const transaction: viem.TransactionSerializable = {
+      chainId: Number(parsedPayload.chainId),
+      data: parsedPayload.input,
+      nonce: Number(parsedPayload.nonce),
+      maxPriorityFeePerGas: BigInt(parsedPayload.maxPriorityFeePerGas),
+      maxFeePerGas: BigInt(parsedPayload.maxFeePerGas),
+      // TODO: Handle multiple currencies.
+      gas: BigInt(parsedPayload.gas),
+      to: parsedPayload.to,
+      value: BigInt(parsedPayload.value),
+    };
+
     this.raw = transaction;
     return this.raw;
   }

diff --git a/src/coinbase/transfer.ts b/src/coinbase/transfer.ts
@@ -13,7 +13,7 @@ import { parseUnsignedPayload } from "./utils";
  */
 export class Transfer {
   private model: TransferModel;
-  private transaction?: viem.Transaction;
+  private transaction?: viem.TransactionSerializable;
 
   /**
    * Private constructor to prevent direct instantiation outside of the factory methods.
@@ -136,22 +136,23 @@ export class Transfer {
    * @returns The ethers.js Transaction object.
    * @throws (InvalidUnsignedPayload) If the Unsigned Payload is invalid.
    */
-  public getTransaction(): viem.Transaction {
+  public getTransaction(): viem.TransactionSerializable {
     if (this.transaction) return this.transaction;
 
-    const transaction = {} as viem.Transaction;
-
+
     const parsedPayload = parseUnsignedPayload(this.getUnsignedPayload());
-
-    transaction.chainId = Number(parsedPayload.chainId);
-    transaction.nonce = Number(parsedPayload.nonce);
-    transaction.maxPriorityFeePerGas = BigInt(parsedPayload.maxPriorityFeePerGas);
-    transaction.maxFeePerGas = BigInt(parsedPayload.maxFeePerGas);
-    transaction.gas = BigInt(parsedPayload.gas);
-    transaction.to = parsedPayload.to;
-    transaction.value = BigInt(parsedPayload.value);
-    transaction.input = parsedPayload.input;
-
+
+    const transaction: viem.TransactionSerializable = {
+      chainId: Number(parsedPayload.chainId),
+      data: parsedPayload.input,
+      nonce: Number(parsedPayload.nonce),
+      maxPriorityFeePerGas: BigInt(parsedPayload.maxPriorityFeePerGas),
+      maxFeePerGas: BigInt(parsedPayload.maxFeePerGas),
+      gas: BigInt(parsedPayload.gas),
+      to: parsedPayload.to,
+      value: BigInt(parsedPayload.value),
+    };
+
     this.transaction = transaction;
     return transaction;
   }
@@ -161,7 +162,7 @@ export class Transfer {
    *
    * @param transaction - The Signed Transaction.
    */
-  public setSignedTransaction(transaction: viem.Transaction): void {
+  public setSignedTransaction(transaction: viem.TransactionSerializable): void {
     this.transaction = transaction;
   }
 

diff --git a/src/tests/transaction_test.ts b/src/tests/transaction_test.ts
@@ -1,7 +1,7 @@
 import { Transaction as TransactionModel } from "../client/api";
 import { Transaction } from "./../coinbase/transaction";
 import { TransactionStatus } from "../coinbase/types";
-import { Transaction as Transaction_viem } from "viem";
+import { TransactionSerializable } from "viem";
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
 
 describe("Transaction", () => {
@@ -91,7 +91,7 @@ describe("Transaction", () => {
   });
 
   describe("#rawTransaction", () => {
-    let raw: Transaction_viem, rawPayload;
+    let raw: TransactionSerializable, rawPayload;
 
     beforeEach(() => {
       raw = transaction.rawTransaction();
@@ -127,7 +127,7 @@ describe("Transaction", () => {
     });
 
     it("should return the correct input", () => {
-      expect(raw.input).toEqual(rawPayload.input);
+      expect(raw.data).toEqual(rawPayload.input);
     });
 
     it("should return the same raw transaction when called multiple times", () => {

diff --git a/src/tests/transfer_test.ts b/src/tests/transfer_test.ts
@@ -100,7 +100,7 @@ describe("Transfer Class", () => {
   describe("#setSignedTransaction", () => {
     it("should return the unsigned payload", () => {
       const transfer = Transfer.fromModel(transferModel);
-      const transaction = {} as viem.Transaction;
+      const transaction: viem.TransactionSerializable = {};
       transfer.setSignedTransaction(transaction);
       expect(transfer.getTransaction()).toEqual(transaction);
     });
@@ -150,7 +150,7 @@ describe("Transfer Class", () => {
       expect(transaction.gas).toEqual(BigInt("0x5208"));
       expect(transaction.to).toEqual(VALID_TRANSFER_MODEL.destination.toLowerCase());
       expect(transaction.value).toEqual(BigInt(amount.toFixed(0)));
-      expect(transaction.input).toEqual("0x");
+      expect(transaction.data).toEqual("0x");
     });
   });