mppx 0.6.16 → 0.6.17

package/src/tempo/server/Charge.test.ts

@@ -4268,9 +4268,17 @@ describe('tempo', () => {
         ],
       })
 
+      let challengeNonce = 0
       const httpServer = await Http.createServer(async (req, res) => {
+        // This replay check requires distinct challenge IDs. Default expires can collide
+        // when the paired 402s are issued in the same millisecond.
         const result = await Mppx_server.toNodeListener(
-          chargeServer.charge({ amount: '1', currency: asset, recipient: accounts[0].address }),
+          chargeServer.charge({
+            amount: '1',
+            currency: asset,
+            expires: new Date(Date.now() + 300_000 + challengeNonce++).toISOString(),
+            recipient: accounts[0].address,
+          }),
         )(req, res)
         if (result.status === 402) return
         res.end('OK')
@@ -4339,9 +4347,17 @@ describe('tempo', () => {
         ],
       })
 
+      let challengeNonce = 0
       const httpServer = await Http.createServer(async (req, res) => {
+        // This replay check requires distinct challenge IDs. Default expires can collide
+        // when the paired 402s are issued in the same millisecond.
         const result = await Mppx_server.toNodeListener(
-          chargeServer.charge({ amount: '1', currency: asset, recipient: accounts[0].address }),
+          chargeServer.charge({
+            amount: '1',
+            currency: asset,
+            expires: new Date(Date.now() + 300_000 + challengeNonce++).toISOString(),
+            recipient: accounts[0].address,
+          }),
         )(req, res)
         if (result.status === 402) return
         res.end('OK')

package/src/tempo/server/Session.ts

@@ -432,6 +432,7 @@ export async function settle(
     ...(options?.feePayer && options?.account
       ? { feePayer: options.feePayer, account: options.account }
       : { account: options?.account }),
+    candidateFeeTokens: [channel.token],
   })
 
   await store.updateChannel(channelId, (current) => {
@@ -965,6 +966,7 @@ async function handleClose(
 
     txHash = await closeOnChain(client, methodDetails.escrowContract, voucher, {
       ...(feePayer && account ? { feePayer, account } : { account }),
+      candidateFeeTokens: [channel.token],
     })
   } catch (error) {
     if (pendingCloseMarked) {

package/src/tempo/server/internal/html/node_modules/.bin/mppx

@@ -0,0 +1,22 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/home/runner/work/mppx/mppx/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/home/runner/work/mppx/mppx/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../mppx/dist/bin.js" "$@"
+else
+  exec node  "$basedir/../mppx/dist/bin.js" "$@"
+fi
+# cmd-shim-target=/home/runner/work/mppx/mppx/src/tempo/server/internal/html/node_modules/mppx/dist/bin.js

package/src/tempo/server/internal/html/node_modules/.bin/mppx.src

@@ -10,12 +10,13 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/mppx/mppx/src/node_modules:/home/runner/work/mppx/mppx/node_modules:/home/runner/work/mppx/node_modules:/home/runner/work/node_modules:/home/runner/node_modules:/home/node_modules:/node_modules:/home/runner/work/mppx/mppx/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/home/runner/work/mppx/mppx/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/home/runner/work/mppx/mppx/src/node_modules:/home/runner/work/mppx/mppx/node_modules:/home/runner/work/mppx/node_modules:/home/runner/work/node_modules:/home/runner/node_modules:/home/node_modules:/node_modules:/home/runner/work/mppx/mppx/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/home/runner/work/mppx/mppx/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
   exec "$basedir/node"  "$basedir/../mppx/src/bin.ts" "$@"
 else
   exec node  "$basedir/../mppx/src/bin.ts" "$@"
 fi
+# cmd-shim-target=/home/runner/work/mppx/mppx/src/tempo/server/internal/html/node_modules/mppx/src/bin.ts