@haven_ai/signer 0.0.0-dev.202609250651.afc2091 → 0.0.0-dev.202609250737.3bd5a51

package/dist/cli.js

@@ -2,7 +2,7 @@
 import { randomUUID, createHash } from 'crypto';
 import { readFile, mkdir, writeFile, stat, lstat, rename, appendFile, chmod } from 'fs/promises';
 import { resolve, dirname, join } from 'path';
-import { createNextStepBuilder, isSupportedNodeVersion, unsupportedNodeVersionMessage, addressFromKey, HavenSigningError, buildSweepTypedData, selectStandardPaymentOption, HavenApiError, toStandardPaymentRequirements, decodeBase64Json, encodeBase64Json, x402V2PaymentEnvelope, isSettlementChildTypedData, chainIdForNetwork, verifySettlementChild, connectorRerunCommand, buildSweepAuthorizationMessage, verifySignature, x402AuthorizationAmount, SignerRefusalCode, SIGNER_UPDATE_FALLBACK, HavenUnsupportedSignerVersionError, buildX402ExpectedMessage, DIRECT_SIGN_CONTEXT_VERSION, HavenError, AgentPaymentFailureCode, AgentPaymentNextAction, HavenTypedDataRefusedError, isPackedUserOperationTypedData, assertUserOpTypedDataBinding, HavenUserOpBindingError, assertBoundDirectPaymentUserOp as assertBoundDirectPaymentUserOp$1 } from '@haven_ai/sdk/edge';
+import { createNextStepBuilder, isSupportedNodeVersion, unsupportedNodeVersionMessage, addressFromKey, HavenSigningError, buildSweepTypedData, selectStandardPaymentOption, HavenApiError, toStandardPaymentRequirements, decodeBase64Json, encodeBase64Json, x402V2PaymentEnvelope, isSettlementChildTypedData, chainIdForNetwork, assertOwnSettlementChild, isPackedUserOperationTypedData, assertUserOpTypedDataBinding, assertBoundDirectPaymentUserOp as assertBoundDirectPaymentUserOp$1, assertFundingLegPaysDelegate, HavenTypedDataRefusedError, connectorRerunCommand, buildSweepAuthorizationMessage, verifySignature, x402AuthorizationAmount, SignerRefusalCode, SIGNER_UPDATE_FALLBACK, HavenUnsupportedSignerVersionError, buildX402ExpectedMessage, DIRECT_SIGN_CONTEXT_VERSION, HavenError, AgentPaymentFailureCode, AgentPaymentNextAction, HavenUserOpBindingError } from '@haven_ai/sdk/edge';
 import { recoverTypedDataAddress, hashTypedData, hashMessage } from 'viem';
 import { z as z$1 } from 'zod/v3';
 import { z } from 'zod';
@@ -632,7 +632,17 @@ var toolDescriptions = {
   haven_sign_sweep_delegate: SIGN_SWEEP_DELEGATE_DESCRIPTION
 };
 async function signFundingLeg(signer, expected, typedData) {
-  return signer.signX402FundingTypedData(typedData, expected);
+  try {
+    return await signer.signX402FundingTypedData(typedData, expected);
+  } catch (err) {
+    if (err instanceof HavenTypedDataRefusedError && !(err instanceof HavenTypedDataNotAllowedError)) {
+      throw new HavenTypedDataNotAllowedError(err.message);
+    }
+    if (err instanceof HavenUserOpBindingError) {
+      throw new HavenUserOpBindingRefusedError(err.message);
+    }
+    throw err;
+  }
 }
 function toExpectedX402(raw) {
   return {
@@ -1220,7 +1230,7 @@ function createEdgeSigner(delegateKey, options = {}) {
             `Refusing to sign the x402 settlement child: this signer cannot map the network '${expected.network}' to a chain id, so it cannot check which chain the child is scoped to. Update @haven_ai/signer.`
           );
         }
-        verifySettlementChild(typedData, {
+        assertOwnSettlementChild(typedData, {
           merchantTo: expected.merchantTo,
           amount: expected.amount,
           asset: expected.asset,
@@ -1230,7 +1240,21 @@ function createEdgeSigner(delegateKey, options = {}) {
           // signed another" class this file exists to catch (#1455 review).
           chainId: settlementChainId,
           expiresAt: expected.expiresAt
+        }, delegateAddress);
+      } else if (isPackedUserOperationTypedData(typedData)) {
+        assertUserOpTypedDataBinding(typedData, expected.payloadHash);
+        assertBoundDirectPaymentUserOp$1(typedData, delegateAddress);
+        assertFundingLegPaysDelegate(typedData, {
+          delegateAddress,
+          asset: expected.asset,
+          amount: expected.amount
         });
+      } else {
+        throw new HavenTypedDataRefusedError(
+          `This signer's x402 arm signs only a funding-leg PackedUserOperation or an erc7710 settlement Delegation; this typed data is '${String(
+            typedData.primaryType
+          )}'. Refusing, even though its digest is bound by the expected context.`
+        );
       }
       const account = privateKeyToAccount(delegateKey);
       const signature = await account.signTypedData(
@@ -1637,7 +1661,7 @@ async function warnIfCredentialFilePermissive(path, log = (message) => process.s
 
 // src/server.ts
 var SIGNER_NAME = "@haven_ai/signer";
-var SIGNER_VERSION = "0.0.0-dev.202609250651.afc2091";
+var SIGNER_VERSION = "0.0.0-dev.202609250737.3bd5a51";
 async function resolveSignerRuntime(options = {}) {
   assertSupportedNodeVersion(options.nodeVersion);
   if (options.delegateKey) {