Replace deprecated js-stellar-wallets + update @stellar/stellar-sdk (#…

…347) * Replaced deprecated js-stellar-wallets package * Replaced deprecated js-stellar-wallets package * Replace stellar-sdk with @stellar/stellar-sdk
stellar · May 15, 2024 · 6e1c8ee · 6e1c8ee
1 parent 3ecdbe9
commit 6e1c8ee
Show file tree

Hide file tree

Showing 47 changed files with 517 additions and 539 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,6 @@
   },
   "dependencies": {
     "demo-wallet-shared": "^1.0.0",
-    "npm-run-all": "^4.1.5",
-    "stellar-sdk": "^11.0.1"
+    "npm-run-all": "^4.1.5"
   }
 }
diff --git a/packages/demo-wallet-client/package.json b/packages/demo-wallet-client/package.json
@@ -22,7 +22,7 @@
     "@stellar/design-system": "^0.8.1",
     "@stellar/frontend-helpers": "^2.1.4",
     "@stellar/prettier-config": "^1.0.1",
-    "@stellar/wallet-sdk": "^0.11.0-beta.1",
+    "@stellar/stellar-sdk": "^12.0.0-rc.2",
     "@svgr/webpack": "^8.1.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
@@ -46,7 +46,6 @@
     "react-router-dom": "^6.15.0",
     "redux": "^4.2.1",
     "sass": "^1.69.7",
-    "stellar-sdk": "^11.0.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "styled-components": "^6.0.7",

diff --git a/packages/demo-wallet-client/src/components/CustodialFields/index.tsx b/packages/demo-wallet-client/src/components/CustodialFields/index.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { Checkbox, Input } from "@stellar/design-system";
 import { useDispatch } from "react-redux";
-import { Memo, StrKey, Keypair } from "stellar-sdk";
+import { Memo, StrKey, Keypair } from "@stellar/stellar-sdk";
 
 import { updateCustodialAction, resetCustodialAction } from "ducks/custodial";
 import "./styles.scss";

diff --git a/packages/demo-wallet-client/src/components/SendPayment.tsx b/packages/demo-wallet-client/src/components/SendPayment.tsx
@@ -7,8 +7,7 @@ import {
   TextLink,
   Modal,
 } from "@stellar/design-system";
-import { DataProvider } from "@stellar/wallet-sdk";
-import { StrKey } from "stellar-sdk";
+import { StrKey } from "@stellar/stellar-sdk";
 
 import { ErrorMessage } from "components/ErrorMessage";
 import { fetchAccountAction } from "ducks/account";
@@ -18,6 +17,7 @@ import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkCon
 import { useRedux } from "hooks/useRedux";
 import { AppDispatch } from "config/store";
 import { ActionStatus, Asset, AssetType } from "types/types";
+import { fetchAccountDetails } from "helpers/fetchAccountDetails";
 
 export const SendPayment = ({
   asset,
@@ -75,13 +75,9 @@ export const SendPayment = ({
       return;
     }
 
-    const dataProvider = new DataProvider({
-      serverUrl: getNetworkConfig().url,
-      accountOrKey: destination,
-      networkPassphrase: getNetworkConfig().network,
-    });
-
-    setIsDestinationFunded(await dataProvider.isAccountFunded());
+    setIsDestinationFunded(
+      Boolean(await fetchAccountDetails(getNetworkConfig().url, destination)),
+    );
   };
 
   const handleSubmit = () => {

diff --git a/packages/demo-wallet-client/src/components/Sep8Send/Sep8Approval.tsx b/packages/demo-wallet-client/src/components/Sep8Send/Sep8Approval.tsx
@@ -1,21 +1,21 @@
 import { useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
-import { StrKey } from "stellar-sdk";
+import { StrKey } from "@stellar/stellar-sdk";
 import {
   Button,
   InfoBlock,
   Input,
   TextLink,
   Modal,
 } from "@stellar/design-system";
-import { DataProvider } from "@stellar/wallet-sdk";
 import { ErrorMessage } from "components/ErrorMessage";
 import { CSS_MODAL_PARENT_ID } from "demo-wallet-shared/build/constants/settings";
 import {
   sep8ClearErrorAction,
   sep8ReviseTransactionAction,
 } from "ducks/sep8Send";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
+import { fetchAccountDetails } from "helpers/fetchAccountDetails";
 import { useRedux } from "hooks/useRedux";
 import { AppDispatch } from "config/store";
 import { ActionStatus, Sep8Step } from "types/types";
@@ -71,13 +71,9 @@ export const Sep8Approval = ({ onClose }: { onClose: () => void }) => {
       return;
     }
 
-    const dataProvider = new DataProvider({
-      serverUrl: getNetworkConfig().url,
-      accountOrKey: destination,
-      networkPassphrase: getNetworkConfig().network,
-    });
-
-    setIsDestinationFunded(await dataProvider.isAccountFunded());
+    setIsDestinationFunded(
+      Boolean(await fetchAccountDetails(getNetworkConfig().url, destination)),
+    );
   };
 
   const renderApprovePayment = () => (

diff --git a/packages/demo-wallet-client/src/components/Sep8Send/Sep8Review.tsx b/packages/demo-wallet-client/src/components/Sep8Send/Sep8Review.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
-import { Transaction, TransactionBuilder } from "stellar-sdk";
+import { Transaction, TransactionBuilder } from "@stellar/stellar-sdk";
 import { Button, Checkbox, Modal, Heading3 } from "@stellar/design-system";
 import { ErrorMessage } from "components/ErrorMessage";
 import { Json } from "components/Json";

diff --git a/packages/demo-wallet-client/src/components/SettingsHandler.tsx b/packages/demo-wallet-client/src/components/SettingsHandler.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
 import { useDispatch } from "react-redux";
-import { Keypair } from "stellar-sdk";
+import { Keypair } from "@stellar/stellar-sdk";
 import { fetchAccountAction } from "ducks/account";
 import { fetchClaimableBalancesAction } from "ducks/claimableBalances";
 import { updateSettingsAction } from "ducks/settings";

diff --git a/packages/demo-wallet-client/src/components/WarningBanner.tsx b/packages/demo-wallet-client/src/components/WarningBanner.tsx
@@ -1,4 +1,4 @@
-import { Networks } from "stellar-sdk";
+import { Networks } from "@stellar/stellar-sdk";
 import { StatusBar } from "@stellar/design-system";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
 

diff --git a/packages/demo-wallet-client/src/ducks/account.ts b/packages/demo-wallet-client/src/ducks/account.ts
@@ -1,16 +1,20 @@
 import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { DataProvider, Types } from "@stellar/wallet-sdk";
-import { getCatchError } from "@stellar/frontend-helpers";
-import { Keypair } from "stellar-sdk";
+import { Keypair } from "@stellar/stellar-sdk";
 
 import { RootState } from "config/store";
 import { getErrorMessage } from "demo-wallet-shared/build/helpers/getErrorMessage";
 import { getErrorString } from "demo-wallet-shared/build/helpers/getErrorString";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
 import { log } from "demo-wallet-shared/build/helpers/log";
-import { ActionStatus, RejectMessage, AccountInitialState } from "types/types";
-
-interface UnfundedAccount extends Types.AccountDetails {
+import { fetchAccountDetails } from "helpers/fetchAccountDetails";
+import {
+  ActionStatus,
+  RejectMessage,
+  AccountInitialState,
+  AccountDetails,
+} from "types/types";
+
+interface UnfundedAccount extends AccountDetails {
   id: string;
 }
 
@@ -20,18 +24,14 @@ interface AccountKeyPair {
 }
 
 interface AccountActionBaseResponse {
-  data: Types.AccountDetails | UnfundedAccount;
+  data: AccountDetails | UnfundedAccount;
   isUnfunded: boolean;
 }
 
 interface FetchAccountActionResponse extends AccountActionBaseResponse {
   secretKey: string;
 }
 
-interface ResponseError extends Error {
-  isUnfunded?: boolean;
-}
-
 export const fetchAccountAction = createAsyncThunk<
   FetchAccountActionResponse,
   AccountKeyPair,
@@ -41,13 +41,7 @@ export const fetchAccountAction = createAsyncThunk<
   async ({ publicKey, secretKey }, { rejectWithValue }) => {
     const networkConfig = getNetworkConfig();
 
-    const dataProvider = new DataProvider({
-      serverUrl: networkConfig.url,
-      accountOrKey: publicKey,
-      networkPassphrase: networkConfig.network,
-    });
-
-    let stellarAccount: Types.AccountDetails | null = null;
+    let stellarAccount: AccountDetails | null = null;
     let isUnfunded = false;
 
     log.request({
@@ -56,28 +50,26 @@ export const fetchAccountAction = createAsyncThunk<
     });
 
     try {
-      stellarAccount = await dataProvider.fetchAccountDetails();
-    } catch (e) {
-      const error: ResponseError = getCatchError(e);
+      stellarAccount = await fetchAccountDetails(networkConfig.url, publicKey);
 
-      if (error.isUnfunded) {
+      if (!stellarAccount) {
         log.instruction({ title: `Account is not funded` });
 
         stellarAccount = {
           id: publicKey,
         } as UnfundedAccount;
 
         isUnfunded = true;
-      } else {
-        const errorMessage = getErrorString(error);
-        log.error({
-          title: `Fetching account \`${publicKey}\` failed`,
-          body: errorMessage,
-        });
-        return rejectWithValue({
-          errorString: errorMessage,
-        });
       }
+    } catch (e) {
+      const errorMessage = getErrorString(e);
+      log.error({
+        title: `Fetching account \`${publicKey}\` failed`,
+        body: errorMessage,
+      });
+      return rejectWithValue({
+        errorString: errorMessage,
+      });
     }
 
     log.response({
@@ -122,15 +114,17 @@ export const fundTestnetAccount = createAsyncThunk<
 
   const networkConfig = getNetworkConfig();
 
-  const dataProvider = new DataProvider({
-    serverUrl: networkConfig.url,
-    accountOrKey: publicKey,
-    networkPassphrase: networkConfig.network,
-  });
-
   try {
     await fetch(`https://friendbot.stellar.org?addr=${publicKey}`);
-    const stellarAccount = await dataProvider.fetchAccountDetails();
+
+    const stellarAccount = await fetchAccountDetails(
+      networkConfig.url,
+      publicKey,
+    );
+
+    if (!stellarAccount) {
+      throw Error(`Error fetching account: ${publicKey}`);
+    }
 
     log.response({
       title: "The friendbot funded account",

diff --git a/packages/demo-wallet-client/src/ducks/allAssets.ts b/packages/demo-wallet-client/src/ducks/allAssets.ts
@@ -1,5 +1,4 @@
 import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { Types } from "@stellar/wallet-sdk";
 
 import { RootState } from "config/store";
 import { accountSelector } from "ducks/account";
@@ -11,7 +10,10 @@ import { log } from "demo-wallet-shared/build/helpers/log";
 import { getAssetData } from "demo-wallet-shared/build/helpers/getAssetData";
 import { searchKeyPairStringToArray } from "demo-wallet-shared/build/helpers/searchKeyPairStringToArray";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
-import { XLM_NATIVE_ASSET } from "demo-wallet-shared/build/types/types";
+import {
+  BalanceMap,
+  XLM_NATIVE_ASSET,
+} from "demo-wallet-shared/build/types/types";
 import {
   ActionStatus,
   RejectMessage,
@@ -22,7 +24,7 @@ import {
 
 type IncludeAssetOverridesProps = {
   assets: Asset[];
-  balances?: Types.BalanceMap;
+  balances?: BalanceMap;
   assetCategory: AssetCategory;
   assetOverrides: Asset[];
 };

diff --git a/packages/demo-wallet-client/src/ducks/claimableBalances.ts b/packages/demo-wallet-client/src/ducks/claimableBalances.ts
@@ -1,5 +1,5 @@
 import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { Horizon } from "stellar-sdk";
+import { Horizon } from "@stellar/stellar-sdk";
 import { RootState } from "config/store";
 import { getErrorMessage } from "demo-wallet-shared/build/helpers/getErrorMessage";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";

diff --git a/packages/demo-wallet-client/src/ducks/sendPayment.ts b/packages/demo-wallet-client/src/ducks/sendPayment.ts
@@ -1,5 +1,5 @@
 import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { Horizon } from "stellar-sdk";
+import { Horizon } from "@stellar/stellar-sdk";
 import { RootState } from "config/store";
 import { settingsSelector } from "ducks/settings";
 import { getErrorString } from "demo-wallet-shared/build/helpers/getErrorString";

diff --git a/packages/demo-wallet-client/src/ducks/sep8Send.ts b/packages/demo-wallet-client/src/ducks/sep8Send.ts
@@ -1,4 +1,4 @@
-import { Horizon } from "stellar-sdk";
+import { Horizon } from "@stellar/stellar-sdk";
 import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
 import { RootState } from "config/store";
 import { settingsSelector } from "ducks/settings";

diff --git a/packages/demo-wallet-client/src/helpers/fetchAccountDetails.ts b/packages/demo-wallet-client/src/helpers/fetchAccountDetails.ts
@@ -0,0 +1,39 @@
+import { makeDisplayableBalances } from "./makeDisplayableBalances";
+import { AccountDetails } from "types/types";
+
+export const fetchAccountDetails = async (
+  networkUrl: string,
+  publicKey: string,
+): Promise<AccountDetails | null> => {
+  try {
+    const url = `${networkUrl}/accounts/${publicKey}`;
+
+    const request = await fetch(url);
+    const accountSummary = await request.json();
+
+    if (!accountSummary.account_id) {
+      return null;
+    }
+
+    const balances = makeDisplayableBalances(accountSummary);
+    const sponsor = accountSummary.sponsor
+      ? { sponsor: accountSummary.sponsor }
+      : {};
+
+    return {
+      ...sponsor,
+      id: accountSummary.id,
+      subentryCount: accountSummary.subentry_count,
+      sponsoredCount: accountSummary.num_sponsored,
+      sponsoringCount: accountSummary.num_sponsoring,
+      inflationDestination: accountSummary.inflation_destination,
+      thresholds: accountSummary.thresholds,
+      signers: accountSummary.signers,
+      flags: accountSummary.flags,
+      sequenceNumber: accountSummary.sequence,
+      balances,
+    };
+  } catch (err) {
+    throw err;
+  }
+};