Updates soroban-client version, updates use of helpers

package.json

@@ -98,12 +98,12 @@
   },
   "dependencies": {
     "@stellar/design-system": "^1.0.0-beta.12",
-    "@stellar/freighter-api": "^1.4.0",
+    "@stellar/freighter-api": "1.7.0",
     "bignumber.js": "^9.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.14.1",
-    "soroban-client": "0.10.1",
+    "soroban-client": "1.0.0-beta.2",
     "stellar-wallets-kit": "github:Creit-Tech/Stellar-Wallets-Kit"
   }
 }

src/components/atomic-swap/exchange.tsx

@@ -6,6 +6,7 @@ import {
   MemoType,
   Operation,
   SorobanDataBuilder,
+  SorobanRpc,
   Transaction,
   TransactionBuilder,
   xdr,
@@ -160,7 +161,9 @@ export const Exchange = (props: ExchangeProps) => {
             props.networkDetails.networkPassphrase,
           ) as Transaction<Memo<MemoType>, Operation[]>;
 
-          const txSim = await server.simulateTransaction(tx);
+          const txSim = (await server.simulateTransaction(
+            tx,
+          )) as SorobanRpc.SimulateTransactionSuccessResponse;
 
           const preparedTransaction = assembleTransaction(
             tx,
@@ -173,11 +176,9 @@ export const Exchange = (props: ExchangeProps) => {
             "base64",
           );
 
-          const finalTransaction = TransactionBuilder.cloneFrom(
-            preparedTransaction,
-          )
+          const finalTx = preparedTransaction
             .setSorobanData(
-              new SorobanDataBuilder(txSim.transactionData)
+              new SorobanDataBuilder(txSim.transactionData.build())
                 .setFootprint(
                   originalFootprintXDR.readOnly(),
                   originalFootprintXDR.readWrite(),
@@ -187,7 +188,7 @@ export const Exchange = (props: ExchangeProps) => {
             .build();
 
           const _signedXdr = await signTx(
-            finalTransaction.toXDR(),
+            finalTx.toXDR(),
             props.pubKey,
             props.swkKit,
           );
@@ -199,7 +200,9 @@ export const Exchange = (props: ExchangeProps) => {
               server,
             );
 
-            setTxResultXDR(result);
+            if (result) {
+              setTxResultXDR(result.toXDR().toString());
+            }
             setIsSubmitting(false);
 
             setStepCount((stepCount + 1) as StepCount);
@@ -294,7 +297,10 @@ export const Exchange = (props: ExchangeProps) => {
               bc.postMessage({
                 type: ChannelMessageType.ContractID,
                 data: {
-                  baseTx: preparedTransaction.toEnvelope().toXDR("base64"),
+                  baseTx: preparedTransaction
+                    .build()
+                    .toEnvelope()
+                    .toXDR("base64"),
                   contractID,
                 },
               });

src/helpers/network.ts

@@ -1,8 +1,10 @@
 import {
   StellarWalletsKit,
-  IStellarWalletsKitSignParams,
+  // IStellarWalletsKitSignParams,
 } from "stellar-wallets-kit";
 
+import { signAuthEntry } from "@stellar/freighter-api";
+
 export interface NetworkDetails {
   network: string;
   networkUrl: string;
@@ -17,15 +19,16 @@ export const FUTURENET_DETAILS = {
 };
 
 export const signData = async (
-  blob: string,
+  entryXdr: string,
   publicKey: string,
   kit: StellarWalletsKit,
 ) => {
-  const { signedXDR } = await kit.sign({
-    blob,
-    publicKey,
-  } as any as IStellarWalletsKitSignParams);
-  return signedXDR;
+  // TODO: go back to using kit once auth entry PR lands
+  console.log(kit);
+  const signedEntry = await signAuthEntry(entryXdr, {
+    accountToSign: publicKey,
+  });
+  return signedEntry;
 };
 
 export const signTx = async (

src/helpers/sign-auth-entry.ts

@@ -0,0 +1,67 @@
+import {
+  Address,
+  StrKey,
+  xdr,
+  nativeToScVal,
+  Keypair,
+  hash,
+} from "soroban-client";
+
+// This can be replaced with the same helper in the sdk when it lands
+// https://github.com/stellar/js-stellar-base/pull/678
+
+export async function authorizeEntry(
+  entry: xdr.SorobanAuthorizationEntry,
+  signer: (input: Buffer) => Promise<Buffer>,
+  validUntilLedgerSeq: any,
+  networkPassphrase: string,
+) {
+  // no-op
+  if (
+    entry.credentials().switch() !==
+    xdr.SorobanCredentialsType.sorobanCredentialsAddress()
+  ) {
+    return entry;
+  }
+
+  /** @type {xdr.SorobanAddressCredentials} */
+  const addrAuth = entry.credentials().address();
+  addrAuth.signatureExpirationLedger(validUntilLedgerSeq);
+
+  const networkId = hash(Buffer.from(networkPassphrase));
+  const preimage = xdr.HashIdPreimage.envelopeTypeSorobanAuthorization(
+    new xdr.HashIdPreimageSorobanAuthorization({
+      networkId,
+      nonce: addrAuth.nonce(),
+      invocation: entry.rootInvocation(),
+      signatureExpirationLedger: addrAuth.signatureExpirationLedger(),
+    }),
+  );
+
+  const signature = await signer(preimage.toXDR());
+  const publicKey = Address.fromScAddress(addrAuth.address()).toString();
+
+  if (
+    !Keypair.fromPublicKey(publicKey).verify(hash(preimage.toXDR()), signature)
+  ) {
+    throw new Error(`signature doesn't match payload`);
+  }
+
+  const sigScVal = nativeToScVal(
+    {
+      public_key: StrKey.decodeEd25519PublicKey(publicKey),
+      signature,
+    },
+    {
+      // force the keys to be interpreted as symbols (expected for
+      // Soroban [contracttype]s)
+      type: {
+        public_key: ["symbol", null],
+        signature: ["symbol", null],
+      } as any,
+    },
+  );
+
+  addrAuth.signature(sigScVal);
+  return entry;
+}