@openzeppelin/relayer-plugin-channels 0.15.0 → 0.16.0

package/dist/plugin/fee.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fee.d.ts","sourceRoot":"","sources":["../../src/plugin/fee.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,WAAW,EAAE,GAAG,EAAqB,MAAM,sBAAsB,CAAC;AAG3E,MAAM,WAAW,aAAa;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,YAAY,GAAG,MAAM,GAAG,SAAS,CAUhF;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAYzF;AASD,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,aAAa,GAAG,MAAM,CAoBpH"}
+{"version":3,"file":"fee.d.ts","sourceRoot":"","sources":["../../src/plugin/fee.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,WAAW,EAAE,GAAG,EAAqB,MAAM,sBAAsB,CAAC;AAG3E,MAAM,WAAW,aAAa;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,YAAY,GAAG,MAAM,GAAG,SAAS,CAUhF;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAYzF;AASD,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,aAAa,GAAG,MAAM,CAgCpH"}

package/dist/plugin/fee.js

@@ -63,7 +63,14 @@ function calculateMaxFee(transaction, limitedContracts, fees) {
     }
     const contractId = getContractIdFromTransaction(transaction);
     const inclusionFee = getInclusionFee(contractId, limitedContracts, fees);
-    const fee = resourceFee > 0n ? resourceFee + BigInt(inclusionFee) : BigInt(constants_1.FEE.NON_SOROBAN_FEE + inclusionFee);
-    console.debug(`[channels] Calculated max_fee: ${Number(fee)} stroops (resourceFee: ${resourceFee}, inclusionFee: ${inclusionFee})`);
+    const computedFee = resourceFee > 0n ? resourceFee + BigInt(inclusionFee) : BigInt(constants_1.FEE.NON_SOROBAN_FEE + inclusionFee);
+    const innerTxFee = BigInt(transaction.fee);
+    // Safety floor: fee bump max_fee must always cover the actual inner transaction fee.
+    // This protects against upstream fee-field mismatches that can produce a larger inner fee.
+    const fee = computedFee >= innerTxFee ? computedFee : innerTxFee + BigInt(inclusionFee);
+    if (fee !== computedFee) {
+        console.warn(`[channels] Fee mismatch detected: computed=${computedFee}, innerTxFee=${innerTxFee}. Using max_fee=${fee}`);
+    }
+    console.debug(`[channels] Calculated max_fee: ${Number(fee)} stroops (resourceFee: ${resourceFee}, inclusionFee: ${inclusionFee}, innerTxFee: ${innerTxFee})`);
     return Number(fee);
 }

package/dist/plugin/simulation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simulation.d.ts","sourceRoot":"","sources":["../../src/plugin/simulation.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAsB,GAAG,EAAE,WAAW,EAAsB,GAAG,EAAE,MAAM,sBAAsB,CAAC;AACrG,OAAO,EAAgD,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGlG,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,yEAAyE;IACzE,UAAU,EAAE,OAAO,CAAC;IACpB,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,YAAY,EAAE,GAAG,CAAC,GAAG,CAAC,8BAA8B,CAAC;CACtD;AAOD;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,CAAC,YAAY,EACtB,IAAI,EAAE,GAAG,CAAC,yBAAyB,EAAE,GAAG,SAAS,EACjD,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,gBAAgB,CAAC,CAiF3B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,GAAG,CAAC,YAAY,EACtB,IAAI,EAAE,GAAG,CAAC,yBAAyB,EAAE,GAAG,SAAS,EACjD,OAAO,EAAE,cAAc,EACvB,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,8BAA8B,EACjD,kCAAkC,GAAE,MAA0D,GAC7F,WAAW,CAgDb;AA4CD,0FAA0F;AAC1F,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAe1D"}
+{"version":3,"file":"simulation.d.ts","sourceRoot":"","sources":["../../src/plugin/simulation.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAsB,GAAG,EAAE,WAAW,EAAsB,GAAG,EAAE,MAAM,sBAAsB,CAAC;AACrG,OAAO,EAAgD,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGlG,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,yEAAyE;IACzE,UAAU,EAAE,OAAO,CAAC;IACpB,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,YAAY,EAAE,GAAG,CAAC,GAAG,CAAC,8BAA8B,CAAC;CACtD;AAOD;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,CAAC,YAAY,EACtB,IAAI,EAAE,GAAG,CAAC,yBAAyB,EAAE,GAAG,SAAS,EACjD,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,gBAAgB,CAAC,CAiF3B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,GAAG,CAAC,YAAY,EACtB,IAAI,EAAE,GAAG,CAAC,yBAAyB,EAAE,GAAG,SAAS,EACjD,OAAO,EAAE,cAAc,EACvB,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,8BAA8B,EACjD,kCAAkC,GAAE,MAA0D,GAC7F,WAAW,CA+Fb;AA4CD,0FAA0F;AAC1F,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAe1D"}

package/dist/plugin/simulation.js

@@ -105,32 +105,81 @@ async function simulateTransaction(func, auth, sourceAddress, relayer, networkPa
  * obtained simulation result.  No additional network calls are made.
  */
 function buildWithChannel(func, auth, channel, networkPassphrase, simResult, minSignatureExpirationLedgerBuffer = constants_1.SIMULATION.MIN_SIGNATURE_EXPIRATION_LEDGER_BUFFER) {
-    // Fail fast: reject auth entries whose signatureExpirationLedger is too close
-    // to latestLedger before doing any assembly work.
+    if (!simResult.transactionData) {
+        throw (0, relayer_sdk_1.pluginError)('Simulation response missing transactionData', {
+            code: 'SIMULATION_INVALID_RESPONSE',
+            status: constants_1.HTTP_STATUS.BAD_GATEWAY,
+        });
+    }
+    // Parse sorobanData from the simulation result
+    let sorobanData;
+    try {
+        sorobanData = stellar_sdk_1.xdr.SorobanTransactionData.fromXDR(simResult.transactionData, 'base64');
+    }
+    catch (err) {
+        throw (0, relayer_sdk_1.pluginError)('Failed to parse simulation transactionData', {
+            code: 'SIMULATION_INVALID_RESPONSE',
+            status: constants_1.HTTP_STATUS.BAD_GATEWAY,
+            details: { message: err instanceof Error ? err.message : String(err) },
+        });
+    }
+    // Resolve auth: use caller-provided auth if present, otherwise fall back to simulation auth
+    let resolvedAuth;
+    if (auth && auth.length > 0) {
+        resolvedAuth = auth;
+    }
+    else {
+        try {
+            resolvedAuth = (simResult.results?.[0]?.auth ?? []).map((a) => stellar_sdk_1.xdr.SorobanAuthorizationEntry.fromXDR(a, 'base64'));
+        }
+        catch (err) {
+            throw (0, relayer_sdk_1.pluginError)('Failed to parse simulation auth entries', {
+                code: 'SIMULATION_INVALID_RESPONSE',
+                status: constants_1.HTTP_STATUS.BAD_GATEWAY,
+                details: { message: err instanceof Error ? err.message : String(err) },
+            });
+        }
+    }
+    // Validate resolved auth expiry before doing any assembly work.
     if (simResult.latestLedger) {
-        validateAuthExpiry(auth, simResult.latestLedger, minSignatureExpirationLedgerBuffer);
+        validateAuthExpiry(resolvedAuth, simResult.latestLedger, minSignatureExpirationLedgerBuffer);
     }
     const now = Math.floor(Date.now() / 1000);
-    console.debug(`[channels] Building tx: channel=${channel.address}, seq=${channel.sequence}, auth_count=${auth?.length ?? 0}`);
-    // Build inner transaction (source = channel)
+    console.debug(`[channels] Building tx: channel=${channel.address}, seq=${channel.sequence}, auth_count=${resolvedAuth.length}`);
+    // Build the transaction directly with sorobanData instead of using rpc.assembleTransaction().
+    //
+    // Why: stellar-base >=14.1.0 changed TransactionBuilder.build() to automatically add
+    // sorobanData.resourceFee() to the transaction fee (stellar/js-stellar-base#761).
+    // However, rpc.assembleTransaction() was not updated for this change — it still computes
+    // fee = classicFee + minResourceFee before calling cloneFrom/build, so build() then adds
+    // resourceFee a second time:
+    //
+    //   assembleTransaction path (broken with >=14.1.0):
+    //     baseFee = classicFee(100) + minResourceFee(25102) = 25202
+    //     build() adds resourceFee(25102) → final fee = 50304  (double-counted!)
+    //
+    //   Direct build path (correct):
+    //     baseFee = classicFee(100)
+    //     build() adds resourceFee(25102) → final fee = 25202  (correct)
+    //
+    // By passing sorobanData directly to TransactionBuilder, build() adds the resourceFee
+    // exactly once. This approach also removes the assembleTransaction network-format
+    // dependency and gives us explicit control over auth resolution.
     const transaction = new stellar_sdk_1.TransactionBuilder(new stellar_sdk_1.Account(channel.address, channel.sequence), {
         fee: constants_1.SIMULATION.DEFAULT_FEE,
         networkPassphrase,
         timebounds: { minTime: constants_1.SIMULATION.MIN_TIME_BOUND, maxTime: now + constants_1.SIMULATION.MAX_TIME_BOUND_OFFSET_SECONDS },
+        sorobanData,
     })
         .addOperation(stellar_sdk_1.Operation.invokeHostFunction({
         func,
-        auth,
-        // No explicit source: default to transaction source (channel account)
+        auth: resolvedAuth,
     }))
         .build();
     try {
-        console.debug(`[channels] Pre-assembly: tx.fee=${transaction.fee}, simResult.minResourceFee=${simResult.minResourceFee}, simResult._parsed=${simResult._parsed}`);
-        // Use SDK's assembleTransaction to apply the cached simulation results
-        const prepared = stellar_sdk_1.rpc.assembleTransaction(transaction, simResult).build();
-        const resourceFee = prepared.toEnvelope().v1().tx().ext().sorobanData()?.resourceFee();
-        console.debug(`[channels] Post-assembly: prepared.fee=${prepared.fee}, resourceFee=${resourceFee}`);
-        return prepared;
+        const resourceFee = transaction.toEnvelope().v1().tx().ext().sorobanData()?.resourceFee();
+        console.debug(`[channels] Assembly complete: fee=${transaction.fee}, resourceFee=${resourceFee}`);
+        return transaction;
     }
     catch (err) {
         console.error(`[channels] Assembly error: ${err instanceof Error ? err.message : String(err)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/relayer-plugin-channels",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "OpenZeppelin Relayer Plugin for Stellar Channel Accounts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",