@stellar-broker/client 0.6.14 → 0.8.0

package/src/tx-processor.js

@@ -1,8 +1,6 @@
-import {hash, nativeToScVal, StrKey, TransactionBuilder, xdr} from '@stellar/stellar-sdk'
+import {authorizeEntry, TransactionBuilder} from '@stellar/stellar-sdk'
 import errors from './errors.js'
 
-const networkIdCache = {}
-
 /**
  * @param {StellarBrokerClient} client
  * @param {{xdr: string, hash: string, networkFee: string, [confirmed]: boolean}} txRequest
@@ -12,7 +10,7 @@ export async function processTxRequest(client, txRequest) {
     //parse incoming transaction
     let tx
     try {
-        tx = TransactionBuilder.fromXDR(txRequest.xdr, client.network)
+        tx = TransactionBuilder.fromXdr(txRequest.xdr, client.network)
     } catch (e) {
         throw errors.invalidSwapTx()
     }
@@ -27,7 +25,7 @@ export async function processTxRequest(client, txRequest) {
             //sign auth
             await authorizeInvocation(client, tx)
             tx = await signTx(client, tx)
-            return tx.toXDR()//wait for the signed tx from the server to wrap it with fee bump tx
+            return tx.toXdr()//wait for the signed tx from the server to wrap it with fee bump tx
         }
     } else {
         //sign transaction
@@ -38,50 +36,26 @@ export async function processTxRequest(client, txRequest) {
     //sign fee bump wrapper tx
     wrapped = await signTx(client, wrapped)
     //respond with signed transaction
-    return wrapped.toXDR()
+    return wrapped.toXdr()
 }
 
 /**
+ * Sign trader's Soroban authorization entry
  * @param {StellarBrokerClient} client
  * @param {TransactionI} tx
- * @return {Promise<TransactionI>}
+ * @return {Promise}
  * @private
  */
 async function authorizeInvocation(client, tx) {
-    //from https://github.com/stellar/js-stellar-base/blob/e3d6fc3351e7d242b374c7c6057668366364a279/src/auth.js#L97
-    const auth = tx.operations[0].auth[0]
-    /** @type {xdr.SorobanAddressCredentials} */
-    const addrAuth = auth.credentials().address()
-    addrAuth.signatureExpirationLedger(tx.ledgerBounds.maxLedger + 1)
-    let networkId = networkIdCache[tx.networkPassphrase]
-    if (!networkId) {
-        networkId = networkIdCache[tx.networkPassphrase] = hash(Buffer.from(tx.networkPassphrase))
-    }
-    const preimage = xdr.HashIdPreimage.envelopeTypeSorobanAuthorization(
-        new xdr.HashIdPreimageSorobanAuthorization({
-            networkId,
-            nonce: addrAuth.nonce(),
-            invocation: auth.rootInvocation(),
-            signatureExpirationLedger: addrAuth.signatureExpirationLedger()
-        })
-    )
-    const payload = hash(preimage.toXDR())
-    const signature = await client.authorization.authorize(payload)
-    const publicKey = StrKey.encodeEd25519PublicKey(addrAuth.address().accountId().value())
-    const sigScVal = nativeToScVal(
-        {
-            public_key: StrKey.decodeEd25519PublicKey(publicKey),
-            signature
-        },
-        {
-            type: {
-                public_key: ['symbol', null],
-                signature: ['symbol', null]
-            }
-        }
-    )
-
-    addrAuth.signature(xdr.ScVal.scvVec([sigScVal]))
+    //the operation shares its auth array with the transaction envelope, so the signed entry replaces the original one
+    const {auth} = tx.operations[0]
+    //SDK builds the signature payload for both legacy (v1) and CAP-71 (v2) address credentials,
+    //and verifies that the signature matches the trader account
+    auth[0] = await authorizeEntry(auth[0],
+        (preimage, payload) => client.authorization.authorize(payload),
+        tx.ledgerBounds.maxLedger + 1,
+        tx.networkPassphrase,
+        client.trader)
 }
 
 /**
@@ -94,7 +68,7 @@ function signTx(client, tx) {
     return client.authorization.authorize(tx)
         .then(tx => {
             if (typeof tx === 'string') { //normalize response
-                tx = TransactionBuilder.fromXDR(tx, client.network)
+                tx = TransactionBuilder.fromXdr(tx, client.network)
             }
             if (!tx || tx.signatures?.length < 1)
                 throw new Error(`Transaction was not signed`)