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

package/dist/index.d.cts

@@ -772,7 +772,7 @@ declare function renderSignerConsentBlock(input: SignerConsentInput, hash: strin
 declare function ensureSignerConsent(input: SignerConsentInput, options?: SignerConsentOptions): Promise<SignerConsentDecision>;
 
 declare const SIGNER_NAME = "@haven_ai/signer";
-declare const SIGNER_VERSION = "0.0.0-dev.202609250651.afc2091";
+declare const SIGNER_VERSION = "0.0.0-dev.202609250737.3bd5a51";
 interface SignerOptions {
     /** Path to a Haven credential JSON file (delegate_key is read from it). */
     credentialsPath?: string;

package/dist/index.d.ts

@@ -772,7 +772,7 @@ declare function renderSignerConsentBlock(input: SignerConsentInput, hash: strin
 declare function ensureSignerConsent(input: SignerConsentInput, options?: SignerConsentOptions): Promise<SignerConsentDecision>;
 
 declare const SIGNER_NAME = "@haven_ai/signer";
-declare const SIGNER_VERSION = "0.0.0-dev.202609250651.afc2091";
+declare const SIGNER_VERSION = "0.0.0-dev.202609250737.3bd5a51";
 interface SignerOptions {
     /** Path to a Haven credential JSON file (delegate_key is read from it). */
     credentialsPath?: string;

package/dist/index.js

@@ -1,7 +1,7 @@
 import { randomUUID, createHash } from 'crypto';
 import { recoverTypedDataAddress, hashTypedData, hashMessage } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { createNextStepBuilder, addressFromKey, HavenSigningError, buildSweepTypedData, selectStandardPaymentOption, HavenApiError, toStandardPaymentRequirements, decodeBase64Json, encodeBase64Json, x402V2PaymentEnvelope, isSettlementChildTypedData, chainIdForNetwork, verifySettlementChild, buildSweepAuthorizationMessage, verifySignature, x402AuthorizationAmount, SignerRefusalCode, connectorRerunCommand, SIGNER_UPDATE_FALLBACK, HavenUnsupportedSignerVersionError, buildX402ExpectedMessage, DIRECT_SIGN_CONTEXT_VERSION, AgentPaymentNextAction, HavenError, AgentPaymentFailureCode, isSupportedNodeVersion, unsupportedNodeVersionMessage, isPackedUserOperationTypedData, assertUserOpTypedDataBinding, HavenUserOpBindingError, HavenTypedDataRefusedError, assertBoundDirectPaymentUserOp as assertBoundDirectPaymentUserOp$1 } from '@haven_ai/sdk/edge';
+import { createNextStepBuilder, addressFromKey, HavenSigningError, buildSweepTypedData, selectStandardPaymentOption, HavenApiError, toStandardPaymentRequirements, decodeBase64Json, encodeBase64Json, x402V2PaymentEnvelope, isSettlementChildTypedData, chainIdForNetwork, assertOwnSettlementChild, isPackedUserOperationTypedData, assertUserOpTypedDataBinding, assertBoundDirectPaymentUserOp, assertFundingLegPaysDelegate, HavenTypedDataRefusedError, buildSweepAuthorizationMessage, verifySignature, x402AuthorizationAmount, SignerRefusalCode, connectorRerunCommand, SIGNER_UPDATE_FALLBACK, HavenUnsupportedSignerVersionError, buildX402ExpectedMessage, DIRECT_SIGN_CONTEXT_VERSION, AgentPaymentNextAction, HavenError, AgentPaymentFailureCode, isSupportedNodeVersion, unsupportedNodeVersionMessage, HavenUserOpBindingError } from '@haven_ai/sdk/edge';
 export { deriveDelegateAccountAddress } from '@haven_ai/sdk/edge';
 import { stat, lstat, chmod, readFile, mkdir, rename, appendFile, writeFile } from 'fs/promises';
 import { resolve, dirname, join } from 'path';
@@ -60,7 +60,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,
@@ -70,7 +70,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(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(
@@ -895,9 +909,9 @@ var HavenTypedDataNotAllowedError = class extends HavenTypedDataRefusedError {
     });
   }
 };
-function assertBoundDirectPaymentUserOp(typedData, delegateAddress) {
+function assertBoundDirectPaymentUserOp2(typedData, delegateAddress) {
   try {
-    assertBoundDirectPaymentUserOp$1(typedData, delegateAddress);
+    assertBoundDirectPaymentUserOp(typedData, delegateAddress);
   } catch (err) {
     if (err instanceof HavenTypedDataRefusedError && !(err instanceof HavenTypedDataNotAllowedError)) {
       throw new HavenTypedDataNotAllowedError(err.message);
@@ -1095,7 +1109,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 {
@@ -1209,7 +1233,7 @@ function createToolHandlers(signer, options = {}) {
             }
             throw err;
           }
-          assertBoundDirectPaymentUserOp(typedData, signer.delegateAddress);
+          assertBoundDirectPaymentUserOp2(typedData, signer.delegateAddress);
           const signature = await signer.signDelegationTypedData(typedData);
           await auditSigning("haven_sign", hashTypedData(typedData));
           return { signature };
@@ -1576,7 +1600,7 @@ async function writeAckFile(path, hash) {
   );
 }
 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 resolveEdgeSigner(options = {}) {
   const { signer } = await resolveSignerRuntime(options);
   return signer;