@haven_ai/signer 0.1.37-alpha.0 → 0.2.0-alpha.0

package/dist/index.cjs

@@ -503,10 +503,12 @@ async function loadSignerCredentials(path = process.env.HAVEN_CREDENTIALS) {
   if (path) return loadFromFile(path);
   const envKey = stringField(process.env.HAVEN_DELEGATE_KEY);
   if (envKey) {
+    const accountAddress = readAccountAddressEnv(process.env);
     return {
       delegateKey: envKey,
       agentId: stringField(process.env.HAVEN_AGENT_ID),
-      safeAddress: stringField(process.env.HAVEN_SAFE_ADDRESS),
+      accountAddress,
+      safeAddress: accountAddress,
       chainId: chainIdField(process.env.HAVEN_CHAIN_ID, "HAVEN_CHAIN_ID"),
       network: stringField(process.env.HAVEN_NETWORK),
       x402BindingSigner: stringField(process.env.HAVEN_X402_BINDING_SIGNER)
@@ -536,10 +538,12 @@ async function loadFromFile(path) {
   if (!delegateKey) {
     throw new Error("Haven credentials are missing delegate_key \u2014 the edge signer needs it to sign.");
   }
+  const accountAddress = readAccountAddressField(raw);
   return {
     delegateKey,
     agentId: stringField(raw.agent_id ?? raw.agentId),
-    safeAddress: stringField(raw.safe_address ?? raw.safeAddress),
+    accountAddress,
+    safeAddress: accountAddress,
     chainId: chainIdField(raw.chain_id ?? raw.chainId, "chain_id"),
     network: stringField(raw.network),
     x402BindingSigner: stringField(
@@ -548,6 +552,12 @@ async function loadFromFile(path) {
     sourcePath: path
   };
 }
+function readAccountAddressField(raw) {
+  return stringField(raw.account_address ?? raw.safe_address ?? raw.safeAddress);
+}
+function readAccountAddressEnv(env) {
+  return stringField(env.HAVEN_ACCOUNT_ADDRESS ?? env.HAVEN_WALLET_ADDRESS ?? env.HAVEN_SAFE_ADDRESS);
+}
 function stringField(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
@@ -1233,7 +1243,7 @@ async function writeAckFile(path$1, hash) {
   );
 }
 var SIGNER_NAME = "@haven_ai/signer";
-var SIGNER_VERSION = "0.1.37-alpha.0";
+var SIGNER_VERSION = "0.2.0-alpha.0";
 async function resolveEdgeSigner(options = {}) {
   const { signer } = await resolveSignerRuntime(options);
   return signer;
@@ -1272,7 +1282,7 @@ function buildSignerMcpServer(signer, options = {}) {
     audit: {
       auditPath: options.auditPath ?? defaultSigningAuditPath(credentialsPath),
       delegateAddress: signer.delegateAddress,
-      safeAddress: options.credentials?.safeAddress,
+      safeAddress: options.credentials?.accountAddress ?? options.credentials?.safeAddress,
       chainId: options.credentials?.chainId
     },
     // #1263: the payment_id signing path — the ONLY network call this server
@@ -1322,7 +1332,7 @@ async function runSignerConsentGate(signer, credentials, options) {
   return ensureSignerConsent(
     {
       delegateAddress: signer.delegateAddress,
-      safeAddress: credentials?.safeAddress,
+      safeAddress: credentials?.accountAddress ?? credentials?.safeAddress,
       agentId: credentials?.agentId,
       chainId: credentials?.chainId,
       network: credentials?.network,
@@ -1362,6 +1372,8 @@ exports.defaultSigningAuditPath = defaultSigningAuditPath;
 exports.ensureSignerConsent = ensureSignerConsent;
 exports.hashPayloadForAudit = hashPayloadForAudit;
 exports.loadSignerCredentials = loadSignerCredentials;
+exports.readAccountAddressEnv = readAccountAddressEnv;
+exports.readAccountAddressField = readAccountAddressField;
 exports.renderSignerConsentBlock = renderSignerConsentBlock;
 exports.resolveEdgeSigner = resolveEdgeSigner;
 exports.resolveSignerRuntime = resolveSignerRuntime;