Update stellar-sdk + remove soroban-client

package.json

@@ -64,8 +64,7 @@
     "regenerator-runtime": "^0.13.9",
     "route-recognizer": "^0.3.4",
     "solar-stellarorg": "git+https://github.com/stellar/solar-stellarorg#master",
-    "soroban-client": "^1.0.0-beta.2",
-    "stellar-sdk": "^11.0.0-beta.4",
+    "stellar-sdk": "^11.0.0-beta.6",
     "typescript": "^4.5.5",
     "uri-templates": "^0.2.0",
     "urijs": "^1.16.0"

src/actions/xdrViewer.js

@@ -1,5 +1,4 @@
 import * as StellarSdk from "stellar-sdk";
-import * as SorobanSdk from "soroban-client";
 import axios from "axios";
 import { FETCH_SEQUENCE_FAIL } from "actions/transactionBuilder";
 import { SIGNATURE } from "../constants/signature";
@@ -44,12 +43,13 @@ export function fetchSigners(
   networkPassphrase,
   isSoroban = false,
 ) {
-  const sdk = isSoroban ? SorobanSdk : StellarSdk;
-
   return (dispatch) => {
     dispatch({ type: FETCHED_SIGNERS.PENDING });
     try {
-      let tx = new sdk.TransactionBuilder.fromXDR(input, networkPassphrase);
+      let tx = new StellarSdk.TransactionBuilder.fromXDR(
+        input,
+        networkPassphrase,
+      );
 
       // Extract all source accounts from transaction (base transaction, and all operations)
       let sourceAccounts = {};
@@ -58,7 +58,7 @@ export function fetchSigners(
       // inner signatures in a fee bump transaction
       let groupedSignatures = [];
 
-      if (tx instanceof sdk.FeeBumpTransaction) {
+      if (tx instanceof StellarSdk.FeeBumpTransaction) {
         sourceAccounts[
           convertMuxedAccountToEd25519Account(tx.feeSource)
         ] = true;
@@ -117,12 +117,16 @@ export function fetchSigners(
                 // tx hash in signatures array, so we can ignore pre-authorized transactions here.
                 switch (signer.type) {
                   case "sha256_hash":
-                    const hashXSigner = sdk.StrKey.decodeSha256Hash(signer.key);
-                    const hashXSignature = sdk.hash(sigObj.sig);
+                    const hashXSigner = StellarSdk.StrKey.decodeSha256Hash(
+                      signer.key,
+                    );
+                    const hashXSignature = StellarSdk.hash(sigObj.sig);
                     isValid = hashXSigner.equals(hashXSignature);
                     break;
                   case "ed25519_public_key":
-                    const keypair = sdk.Keypair.fromPublicKey(signer.key);
+                    const keypair = StellarSdk.Keypair.fromPublicKey(
+                      signer.key,
+                    );
                     isValid = keypair.verify(txHash, sigObj.sig);
                     break;
                 }

src/components/TxSubmitterResult.tsx

@@ -1,6 +1,5 @@
 import { useReducer } from "react";
 import {
-  Server,
   TransactionBuilder,
   AccountRequiresMemoError,
   BadResponseError,
@@ -29,7 +28,10 @@ const initialState = {
 
 const reducer = (
   state: any,
-  action: { type: ACTIONS; payload?: Horizon.SubmitTransactionResponse },
+  action: {
+    type: ACTIONS;
+    payload?: Horizon.HorizonApi.SubmitTransactionResponse;
+  },
 ) => {
   switch (action.type) {
     case ACTIONS.submit:
@@ -83,7 +85,9 @@ export const TxSubmitterResult = ({
                 txXdr,
                 networkPassphrase,
               );
-              const server = new Server(horizonURL, { appName: "Laboratory" });
+              const server = new Horizon.Server(horizonURL, {
+                appName: "Laboratory",
+              });
               server.submitTransaction(transaction).then(
                 (res) => {
                   dispatch({ type: ACTIONS.success, payload: res });
@@ -123,7 +127,7 @@ const Response = ({
   result_xdr,
   result_meta_xdr,
   fee_meta_xdr,
-}: ResponseProps & Horizon.TransactionResponse) => (
+}: ResponseProps & Horizon.HorizonApi.TransactionResponse) => (
   <div className="XdrViewer__submit so-back TransactionSubmitter__result">
     <div className="so-chunk">
       <h3

src/constants/network.js

@@ -1,11 +1,10 @@
 import { Networks } from "stellar-sdk";
-import { Networks as SorobanNetworks } from "soroban-client";
 
 const NETWORK = {
   available: {
     futurenet: {
       horizonURL: "https://horizon-futurenet.stellar.org",
-      networkPassphrase: SorobanNetworks.FUTURENET,
+      networkPassphrase: Networks.FUTURENET,
     },
     test: {
       horizonURL: "https://horizon-testnet.stellar.org",

src/helpers/Libify.js

@@ -9,7 +9,6 @@
 // the best choice since source code differs based on content.
 
 import * as Sdk from "stellar-sdk";
-import * as SorobanSdk from "soroban-client";
 import defaults from "lodash/defaults";
 import each from "lodash/each";
 import has from "lodash/has";
@@ -881,15 +880,14 @@ Libify.signTransaction = function (
   ledgerWalletSigs,
   isSoroban = false,
 ) {
-  const sdk = isSoroban ? SorobanSdk : Sdk;
   let validSecretKeys = [];
   let validPreimages = [];
   for (let i = 0; i < signers.length; i++) {
     let signer = signers[i];
     if (signer !== null && !isUndefined(signer) && signer !== "") {
       // Signer
       if (signer.charAt(0) == "S") {
-        if (!sdk.StrKey.isValidEd25519SecretSeed(signer)) {
+        if (!Sdk.StrKey.isValidEd25519SecretSeed(signer)) {
           return {
             message: "One of secret keys is invalid",
           };
@@ -907,13 +905,13 @@ Libify.signTransaction = function (
     }
   }
 
-  let newTx = sdk.TransactionBuilder.fromXDR(txXdr, networkPassphrase);
+  let newTx = Sdk.TransactionBuilder.fromXDR(txXdr, networkPassphrase);
   let existingSigs = newTx.signatures.length;
   let addedSigs = 0;
 
   each(validSecretKeys, (signer) => {
     addedSigs++;
-    newTx.sign(sdk.Keypair.fromSecret(signer));
+    newTx.sign(Sdk.Keypair.fromSecret(signer));
   });
   each(validPreimages, (signer) => {
     addedSigs++;

src/helpers/extrapolateFromXdr.js

@@ -10,7 +10,6 @@
 // - object: typed values always with a type and value `{type: 'code', value: 'Foo();'}`
 
 import * as StellarSdk from "stellar-sdk";
-import * as SorobanSdk from "soroban-client";
 import isArray from "lodash/isArray";
 import isString from "lodash/isString";
 import functionsIn from "lodash/functionsIn";
@@ -22,17 +21,10 @@ export default function extrapolateFromXdr(input, type, isSoroban = false) {
   // TODO: input validation
 
   let xdr, StrKey, Keypair, Operation;
-  if (isSoroban) {
-    xdr = SorobanSdk.xdr;
-    StrKey = SorobanSdk.StrKey;
-    Keypair = SorobanSdk.Keypair;
-    Operation = SorobanSdk.Operation;
-  } else {
-    xdr = StellarSdk.xdr;
-    StrKey = StellarSdk.StrKey;
-    Keypair = StellarSdk.Keypair;
-    Operation = StellarSdk.Operation;
-  }
+  xdr = StellarSdk.xdr;
+  StrKey = StellarSdk.StrKey;
+  Keypair = StellarSdk.Keypair;
+  Operation = StellarSdk.Operation;
 
   function buildTreeFromObject(object, anchor, name) {
     anchor.type = name;

src/helpers/validateTxXdr.ts

@@ -1,13 +1,9 @@
 import trim from "lodash/trim";
 import * as StellarSdk from "stellar-sdk";
-import * as SorobanSdk from "soroban-client";
 import { validateBase64 } from "./validateBase64";
 
-export const validateTxXdr = (input: string, isSoroban = false) => {
+export const validateTxXdr = (input: string) => {
   let xdr = StellarSdk.xdr;
-  if (isSoroban) {
-    xdr = SorobanSdk.xdr;
-  }
   input = trim(input);
 
   let base64Validation = validateBase64(input);

src/views/TransactionSigner.tsx

@@ -1,6 +1,5 @@
 import { useDispatch } from "react-redux";
 import * as StellarSdk from "stellar-sdk";
-import * as SorobanSdk from "soroban-client";
 import { isConnected } from "@stellar/freighter-api";
 import isUndefined from "lodash/isUndefined";
 import map from "lodash/map";
@@ -44,16 +43,10 @@ export const TransactionSigner = () => {
   const networkPassphrase = network.current.networkPassphrase;
   const isSoroban = useIsSoroban();
 
-  let TransactionBuilder, FeeBumpTransaction, Networks;
-  if (isSoroban) {
-    TransactionBuilder = SorobanSdk.TransactionBuilder;
-    FeeBumpTransaction = SorobanSdk.FeeBumpTransaction;
-    Networks = SorobanSdk.Networks;
-  } else {
-    TransactionBuilder = StellarSdk.TransactionBuilder;
-    FeeBumpTransaction = StellarSdk.FeeBumpTransaction;
-    Networks = StellarSdk.Networks;
-  }
+  let TransactionBuilder, FeeBumpTransaction, Networks: any;
+  TransactionBuilder = StellarSdk.TransactionBuilder;
+  FeeBumpTransaction = StellarSdk.FeeBumpTransaction;
+  Networks = StellarSdk.Networks;
 
   const {
     xdr,
@@ -65,7 +58,7 @@ export const TransactionSigner = () => {
   } = transactionSigner;
   let content;
 
-  if (validateTxXdr(xdr, isSoroban).result !== "success") {
+  if (validateTxXdr(xdr).result !== "success") {
     content = (
       <div className="so-back">
         <div className="so-chunk">
@@ -389,7 +382,7 @@ export const TransactionSigner = () => {
                   <MultiPicker
                     component={SecretKeyPicker}
                     value={signers}
-                    onUpdate={(value: string) => dispatch(setSecrets(value))}
+                    onUpdate={(value) => dispatch(setSecrets(value))}
                   />
                 </OptionsTablePair>
                 <OptionsTablePair label="BIP Path">

src/views/XdrViewer.tsx

@@ -1,6 +1,5 @@
 import { useDispatch } from "react-redux";
 import * as StellarSdk from "stellar-sdk";
-import * as SorobanSdk from "soroban-client";
 import debounce from "lodash/debounce";
 import functions from "lodash/functions";
 import indexOf from "lodash/indexOf";
@@ -33,10 +32,9 @@ export const XdrViewer = () => {
   const { fetchedSigners, input, type } = xdrViewer;
   const { horizonURL, networkPassphrase } = network.current;
   const isSoroban = useIsSoroban();
-  const sdk = isSoroban ? SorobanSdk : StellarSdk;
   // Array of all the xdr types. Then, the most common ones appear at the top
   // again for convenience
-  let xdrTypes = functions(sdk.xdr).sort();
+  let xdrTypes = functions(StellarSdk.xdr).sort();
   xdrTypes = [
     "TransactionEnvelope",
     "TransactionResult",