Release/5.6.0

@shared/api/helpers/soroban.ts

@@ -0,0 +1,27 @@
+import { xdr, Address, ScInt, scValToBigInt } from "soroban-client";
+
+export const accountIdentifier = (account: string) =>
+  new Address(account).toScVal();
+
+export const valueToI128String = (value: xdr.ScVal) =>
+  scValToBigInt(value).toString();
+
+// How do we decode these in a more generic way?
+export const decodei128 = (b64: string) => {
+  const value = xdr.ScVal.fromXDR(b64, "base64");
+  try {
+    return valueToI128String(value);
+  } catch (error) {
+    console.error(error);
+    return 0;
+  }
+};
+
+export const decodeStr = (b64: string) =>
+  xdr.ScVal.fromXDR(b64, "base64").str().toString();
+
+export const decodeU32 = (b64: string) =>
+  xdr.ScVal.fromXDR(b64, "base64").u32();
+
+export const numberToI128 = (value: number): xdr.ScVal =>
+  new ScInt(value).toI128();

@shared/api/internal.ts

@@ -19,7 +19,8 @@ import {
   MAINNET_NETWORK_DETAILS,
   DEFAULT_NETWORKS,
   NetworkDetails,
-  SOROBAN_RPC_URLS,
+  NETWORKS,
+  SOROBAN_RPC_URLS
 } from "../constants/stellar";
 import { SERVICE_TYPES } from "../constants/services";
 import { APPLICATION_STATE } from "../constants/applicationState";
@@ -636,7 +637,17 @@ export const submitFreighterSorobanTransaction = async ({
     console.error(e);
   }
 
-  const server = new SorobanClient.Server(SOROBAN_RPC_URLS.FUTURENET!, {
+  if (!networkDetails.sorobanRpcUrl && networkDetails.network !== NETWORKS.FUTURENET) {
+    throw new Error("soroban rpc not supported")
+  }
+
+  // TODO: after enough time has passed to assume most clients have ran
+  // the migrateSorobanRpcUrlNetworkDetails migration, remove and use networkDetails.sorobanRpcUrl
+  const serverUrl = !networkDetails.sorobanRpcUrl
+    ? SOROBAN_RPC_URLS[NETWORKS.FUTURENET]!
+    : networkDetails.sorobanRpcUrl
+
+  const server = new SorobanClient.Server(serverUrl, {
     allowHttp: true,
   });
 

@shared/api/types.ts

@@ -48,6 +48,7 @@ export interface Response {
   isValidatingSafeAssetsEnabled: boolean;
   isExperimentalModeEnabled: boolean;
   networkDetails: NetworkDetails;
+  sorobanRpcUrl: string;
   networksList: NetworkDetails[];
   allAccounts: Array<Account>;
   accountName: string;

@shared/constants/stellar.ts

@@ -33,6 +33,7 @@ export interface NetworkDetails {
   networkUrl: string;
   networkPassphrase: string;
   friendbotUrl?: string;
+  sorobanRpcUrl?: string
 }
 
 export const MAINNET_NETWORK_DETAILS: NetworkDetails = {

@shared/helpers/types.ts

@@ -0,0 +1,2 @@
+
+export type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] }

extension/src/background/helpers/dataStorage.ts

@@ -7,6 +7,7 @@ import {
   NETWORKS,
   TESTNET_NETWORK_DETAILS,
   FUTURENET_NETWORK_DETAILS,
+  SOROBAN_RPC_URLS,
 } from "@shared/constants/stellar";
 
 interface SetItemParams {
@@ -105,3 +106,23 @@ export const migrateFriendBotUrlNetworkDetails = async () => {
 
   await localStore.setItem(NETWORKS_LIST_ID, migratedNetworkList);
 };
+
+export const migrateSorobanRpcUrlNetworkDetails = async () => {
+  const localStore = dataStorageAccess(browserLocalStorage);
+
+  const networksList: NetworkDetails[] =
+    (await localStore.getItem(NETWORKS_LIST_ID)) || DEFAULT_NETWORKS;
+
+  const migratedNetworkList = networksList.map((network) => {
+    if (network.network === NETWORKS.FUTURENET) {
+      return {
+        ...FUTURENET_NETWORK_DETAILS,
+        sorobanRpcUrl: SOROBAN_RPC_URLS[NETWORKS.FUTURENET]
+      }
+    }
+
+    return network;
+  });
+
+  await localStore.setItem(NETWORKS_LIST_ID, migratedNetworkList);
+}

extension/src/background/index.ts

@@ -13,6 +13,7 @@ import { timeoutAccountAccess } from "./ducks/session";
 import {
   migrateFriendBotUrlNetworkDetails,
   normalizeMigratedData,
+  migrateSorobanRpcUrlNetworkDetails
 } from "./helpers/dataStorage";
 
 export const initContentScriptMessageListener = () => {
@@ -56,6 +57,7 @@ export const initInstalledListener = () => {
   });
   browser?.runtime?.onInstalled.addListener(normalizeMigratedData);
   browser?.runtime?.onInstalled.addListener(migrateFriendBotUrlNetworkDetails);
+  browser?.runtime?.onInstalled.addListener(migrateSorobanRpcUrlNetworkDetails);
 };
 
 export const initAlarmListener = (sessionStore: Store) => {

extension/src/popup/SorobanContext.tsx

@@ -2,7 +2,10 @@ import React from "react";
 import { useSelector } from "react-redux";
 import * as SorobanClient from "soroban-client";
 
-import { NETWORKS, SOROBAN_RPC_URLS } from "@shared/constants/stellar";
+import {
+  SOROBAN_RPC_URLS,
+  NETWORKS
+} from "@shared/constants/stellar";
 
 import { settingsNetworkDetailsSelector } from "./ducks/settings";
 
@@ -28,14 +31,16 @@ export const SorobanProvider = ({
   pubKey: string;
 }) => {
   const networkDetails = useSelector(settingsNetworkDetailsSelector);
-  const serverUrl = SOROBAN_RPC_URLS[networkDetails.network as NETWORKS];
 
-  let server: SorobanContextInterface["server"];
-  let newTxBuilder: SorobanContextInterface["newTxBuilder"];
+  let server: SorobanContextInterface['server']
+  let newTxBuilder: SorobanContextInterface['newTxBuilder']
+  if (!networkDetails.sorobanRpcUrl && networkDetails.network === NETWORKS.FUTURENET) {
+    // TODO: after enough time has passed to assume most clients have ran
+    // the migrateSorobanRpcUrlNetworkDetails migration, remove and use networkDetails.sorobanRpcUrl
+    const serverUrl = SOROBAN_RPC_URLS[NETWORKS.FUTURENET]!
 
-  if (serverUrl) {
     server = new SorobanClient.Server(serverUrl, {
-      allowHttp: networkDetails.networkUrl.startsWith("http://"),
+      allowHttp: serverUrl.startsWith("http://"),
     });
 
     newTxBuilder = async (fee = SorobanClient.BASE_FEE) => {
@@ -45,8 +50,20 @@ export const SorobanProvider = ({
         networkPassphrase: networkDetails.networkPassphrase,
       });
     };
-  }
+  } else if (networkDetails.sorobanRpcUrl) {
+    server = new SorobanClient.Server(networkDetails.sorobanRpcUrl, {
+      allowHttp: networkDetails.sorobanRpcUrl.startsWith("http://"),
+    });
 
+    newTxBuilder = async (fee = SorobanClient.BASE_FEE) => {
+      const sourceAccount = await server!.getAccount(pubKey);
+      return new SorobanClient.TransactionBuilder(sourceAccount, {
+        fee,
+        networkPassphrase: networkDetails.networkPassphrase,
+      });
+    };
+  }
+
   return (
     <SorobanContext.Provider value={{ server, newTxBuilder }}>
       {children}