@stellar/typescript-wallet-sdk 1.1.2 → 1.1.3

package/lib/walletSdk/Exceptions/index.d.ts

@@ -54,3 +54,6 @@ export declare class WithdrawalTxNotPendingUserTransferStartError extends Error
 export declare class WithdrawalTxMissingMemoError extends Error {
     constructor();
 }
+export declare class WithdrawalTxMemoError extends Error {
+    constructor();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar/typescript-wallet-sdk",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "engines": {
     "node": ">=18"
   },
@@ -40,7 +40,7 @@
     "jws": "^4.0.0",
     "lodash": "^4.17.21",
     "query-string": "^7.1.3",
-    "stellar-sdk": "^10.4.1",
+    "stellar-sdk": "^11.0.0-beta.3",
     "stream-http": "^3.2.0",
     "url": "^0.11.0",
     "util": "^0.12.5",

package/src/walletSdk/Exceptions/index.ts

@@ -146,3 +146,10 @@ export class WithdrawalTxMissingMemoError extends Error {
     Object.setPrototypeOf(this, WithdrawalTxMissingMemoError.prototype);
   }
 }
+
+export class WithdrawalTxMemoError extends Error {
+  constructor() {
+    super(`Error parsing withdrawal transaction memo`);
+    Object.setPrototypeOf(this, WithdrawalTxMemoError.prototype);
+  }
+}

package/src/walletSdk/Horizon/Transaction/TransactionBuilder.ts

@@ -14,6 +14,7 @@ import {
   InsufficientStartingBalanceError,
   WithdrawalTxMissingMemoError,
   WithdrawalTxNotPendingUserTransferStartError,
+  WithdrawalTxMemoError,
 } from "../../Exceptions";
 import { IssuedAssetId, StellarAssetId } from "../../Asset";
 import { WithdrawTransaction, TransactionStatus } from "../../Types";
@@ -129,9 +130,21 @@ export class TransactionBuilder {
       throw new WithdrawalTxMissingMemoError();
     }
 
-    return this.setMemo(
-      new Memo(transaction.withdraw_memo_type, transaction.withdraw_memo),
-    ).transfer(
+    if (transaction.withdraw_memo_type === "hash") {
+      try {
+        const buffer = Buffer.from(transaction.withdraw_memo, "base64");
+        const memo = Memo.hash(buffer.toString("hex"));
+        this.setMemo(memo);
+      } catch {
+        throw new WithdrawalTxMemoError();
+      }
+    } else {
+      this.setMemo(
+        new Memo(transaction.withdraw_memo_type, transaction.withdraw_memo),
+      );
+    }
+
+    return this.transfer(
       transaction.withdraw_anchor_account,
       assetId,
       transaction.amount_in,

package/test/stellar.test.ts

@@ -36,7 +36,7 @@ describe("Stellar", () => {
     } catch (e) {
       await axios.get("https://friendbot.stellar.org/?addr=" + kp.publicKey);
     }
-  });
+  }, 10000);
   it("should create and submit a transaction", async () => {
     const now = Math.floor(Date.now() / 1000) - 5;
 
@@ -198,32 +198,53 @@ describe("Stellar", () => {
     kp.sign(tx);
   });
   it("should transfer withdrawal transaction", async () => {
-    const walletTransaction = {
-      id: "db15d166-5a5e-4d5c-ba5d-271c32cd8cf0",
-      kind: "withdrawal",
-      status: TransactionStatus.pending_user_transfer_start,
-      amount_in: "50.55",
-      withdraw_memo_type: "text",
-      withdraw_memo: "the withdraw memo",
-      withdraw_anchor_account:
-        "GCSGSR6KQQ5BP2FXVPWRL6SWPUSFWLVONLIBJZUKTVQB5FYJFVL6XOXE",
-    } as WithdrawTransaction;
+    const memoExamples = [
+      {
+        type: "text",
+        value: "example text",
+      },
+      {
+        type: "id",
+        value: "12345",
+      },
+      {
+        type: "hash",
+        value: "AAAAAAAAAAAAAAAAAAAAAMAP+8deo0TViBD09TfOBY0=",
+      },
+      {
+        type: "hash",
+        value: "MV9b23bQeMQ7isAGTkoBZGErH853yGk0W/yUx1iU7dM=",
+      },
+    ];
 
-    const asset = new IssuedAssetId(
-      "USDC",
-      "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-    );
+    for (const memoExample of memoExamples) {
+      const walletTransaction = {
+        id: "db15d166-5a5e-4d5c-ba5d-271c32cd8cf0",
+        kind: "withdrawal",
+        status: TransactionStatus.pending_user_transfer_start,
+        amount_in: "50.55",
+        withdraw_memo_type: memoExample.type,
+        withdraw_memo: memoExample.value,
+        withdraw_anchor_account:
+          "GCSGSR6KQQ5BP2FXVPWRL6SWPUSFWLVONLIBJZUKTVQB5FYJFVL6XOXE",
+      } as WithdrawTransaction;
 
-    const txBuilder = await stellar.transaction({
-      sourceAddress: kp,
-      baseFee: 100,
-    });
+      const asset = new IssuedAssetId(
+        "USDC",
+        "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
+      );
 
-    const txn = txBuilder
-      .transferWithdrawalTransaction(walletTransaction, asset)
-      .build();
-    expect(txn).toBeTruthy();
-  });
+      const txBuilder = await stellar.transaction({
+        sourceAddress: kp,
+        baseFee: 100,
+      });
+
+      const txn = txBuilder
+        .transferWithdrawalTransaction(walletTransaction, asset)
+        .build();
+      expect(txn).toBeTruthy();
+    }
+  }, 20000);
 });
 
 describe("Asset", () => {