@agoric/orchestration 0.1.1-dev-699cb28.0.699cb28 → 0.1.1-dev-eb52bc3.0.eb52bc3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-699cb28.0.699cb28",
+  "version": "0.1.1-dev-eb52bc3.0.eb52bc3",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -35,18 +35,18 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-dev-699cb28.0.699cb28",
-    "@agoric/cosmic-proto": "0.4.1-dev-699cb28.0.699cb28",
-    "@agoric/ertp": "0.16.3-dev-699cb28.0.699cb28",
-    "@agoric/internal": "0.3.3-dev-699cb28.0.699cb28",
-    "@agoric/network": "0.1.1-dev-699cb28.0.699cb28",
-    "@agoric/notifier": "0.6.3-dev-699cb28.0.699cb28",
-    "@agoric/store": "0.9.3-dev-699cb28.0.699cb28",
-    "@agoric/time": "0.3.3-dev-699cb28.0.699cb28",
-    "@agoric/vat-data": "0.5.3-dev-699cb28.0.699cb28",
-    "@agoric/vow": "0.1.1-dev-699cb28.0.699cb28",
-    "@agoric/zoe": "0.26.3-dev-699cb28.0.699cb28",
-    "@agoric/zone": "0.2.3-dev-699cb28.0.699cb28",
+    "@agoric/async-flow": "0.1.1-dev-eb52bc3.0.eb52bc3",
+    "@agoric/cosmic-proto": "0.4.1-dev-eb52bc3.0.eb52bc3",
+    "@agoric/ertp": "0.16.3-dev-eb52bc3.0.eb52bc3",
+    "@agoric/internal": "0.3.3-dev-eb52bc3.0.eb52bc3",
+    "@agoric/network": "0.1.1-dev-eb52bc3.0.eb52bc3",
+    "@agoric/notifier": "0.6.3-dev-eb52bc3.0.eb52bc3",
+    "@agoric/store": "0.9.3-dev-eb52bc3.0.eb52bc3",
+    "@agoric/time": "0.3.3-dev-eb52bc3.0.eb52bc3",
+    "@agoric/vat-data": "0.5.3-dev-eb52bc3.0.eb52bc3",
+    "@agoric/vow": "0.1.1-dev-eb52bc3.0.eb52bc3",
+    "@agoric/zoe": "0.26.3-dev-eb52bc3.0.eb52bc3",
+    "@agoric/zone": "0.2.3-dev-eb52bc3.0.eb52bc3",
     "@cosmjs/encoding": "^0.36.0",
     "@endo/base64": "^1.1.1",
     "@endo/common": "^1.4.0",
@@ -61,9 +61,9 @@
     "bs58": "^6.0.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-699cb28.0.699cb28",
-    "@agoric/vats": "0.15.2-dev-699cb28.0.699cb28",
-    "@agoric/xsnap": "0.14.3-dev-699cb28.0.699cb28",
+    "@agoric/swingset-liveslots": "0.10.3-dev-eb52bc3.0.eb52bc3",
+    "@agoric/vats": "0.15.2-dev-eb52bc3.0.eb52bc3",
+    "@agoric/xsnap": "0.14.3-dev-eb52bc3.0.eb52bc3",
     "@chain-registry/client": "^1.53.194",
     "@cosmjs/amino": "^0.36.0",
     "@cosmjs/proto-signing": "^0.36.0",
@@ -100,5 +100,5 @@
   "typeCoverage": {
     "atLeast": 96.68
   },
-  "gitHead": "699cb2821a0724432ffd6363819f05f20a588f4e"
+  "gitHead": "eb52bc371f1d95f517989c49cf30633ba50d9d41"
 }

package/src/utils/address.d.ts

@@ -11,8 +11,6 @@ export const DEFAULT_ICQ_VERSION: "icq-1";
 export function makeICQChannelAddress(controllerConnectionId: IBCConnectionID, version?: string): RemoteIbcAddress;
 export function findAddressField(remoteAddressString: RemoteIbcAddress): CosmosChainAddress["value"] | undefined;
 export function getBech32Prefix(address: Bech32Address | string): string;
-export function sameEvmAddress(a: EvmAddress, b: EvmAddress | undefined): boolean;
-export function isEvmAddressShape(x: unknown): x is EvmAddress;
 export function coerceAccountId(idArg: AccountIdArg): AccountId;
 export function parseAccountIdArg(idArg: AccountIdArg): Caip10Record;
 export function parseAccountId(accountId: AccountId): Caip10Record;
@@ -44,9 +42,11 @@ import type { Bech32Address } from '../types.js';
 import type { IBCConnectionID } from '@agoric/network/ibc';
 import type { RemoteIbcAddress } from '@agoric/network/ibc';
 import type { CosmosChainAddress } from '../types.js';
-import type { Address as EvmAddress } from 'viem';
+import { sameEvmAddress } from './evm-address.js';
+import { isEvmAddressShape } from './evm-address.js';
 import type { AccountIdArg } from '../orchestration-api.js';
 import type { AccountId } from '../orchestration-api.js';
 import type { Caip10Record } from '../orchestration-api.js';
 import type { CaipChainId } from '../types.js';
+export { sameEvmAddress, isEvmAddressShape };
 //# sourceMappingURL=address.d.ts.map

package/src/utils/address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AA4OA;;;;;;GAMG;AACH,6CAHW,MAAM,GACJ,QAAQ,OAAO,IAAI,aAAa,CAM5C;AA3NM,wDALI,eAAe,0BACf,eAAe,6CACf,qBAAqB,GACnB,gBAAgB,CA4B5B;AAGD,kCAAmC,OAAO,CAAC;AAOpC,8DAJI,eAAe,YACf,MAAM,GACJ,gBAAgB,CAa5B;AAaM,sDAJI,gBAAgB,GAEd,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAYnD;AAaM,yCAHI,aAAa,GAAG,MAAM,GACpB,MAAM,CAQlB;AASM,kCAJI,UAAU,KACV,UAAU,GAAG,SAAS,GACpB,OAAO,CAEwD;AAUrE,qCAHI,OAAO,GACL,CAAC,IAAI,UAAU,CAG6B;AAYlD,uCAJI,YAAY,GAEV,SAAS,CAQrB;AAUM,yCAJI,YAAY,GAEV,YAAY,CAaxB;AASM,0CAHI,SAAS,GACP,YAAY,CAaxB;AAUM,6CAJI,YAAY,GAEV,WAAW,CAKvB;AASM,yCAJI,MAAM,GACJ,OAAO,CAkBnB;AAwBM,uDAFI,MAAM,+BAOhB;AAWM,8CAJI,SAAS,GACP,UAAU,CAatB;;;;;;;;;;;;;;;;;;;;;mCAnRgE,aAAa;qCAF1B,qBAAqB;sCAArB,qBAAqB;wCAER,aAAa;2CADtC,MAAM;kCAEU,yBAAyB;+BAAzB,yBAAyB;kCAAzB,yBAAyB;iCADhB,aAAa"}
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AA4NA;;;;;;GAMG;AACH,6CAHW,MAAM,GACJ,QAAQ,OAAO,IAAI,aAAa,CAM5C;AA1MM,wDALI,eAAe,0BACf,eAAe,6CACf,qBAAqB,GACnB,gBAAgB,CA4B5B;AAGD,kCAAmC,OAAO,CAAC;AAOpC,8DAJI,eAAe,YACf,MAAM,GACJ,gBAAgB,CAa5B;AAaM,sDAJI,gBAAgB,GAEd,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAYnD;AAaM,yCAHI,aAAa,GAAG,MAAM,GACpB,MAAM,CAQlB;AAeM,uCAJI,YAAY,GAEV,SAAS,CAQrB;AAUM,yCAJI,YAAY,GAEV,YAAY,CAaxB;AASM,0CAHI,SAAS,GACP,YAAY,CAaxB;AAUM,6CAJI,YAAY,GAEV,WAAW,CAKvB;AASM,yCAJI,MAAM,GACJ,OAAO,CAkBnB;AAwBM,uDAFI,MAAM,+BAOhB;AAWM,8CAJI,SAAS,GACP,UAAU,CAatB;;;;;;;;;;;;;;;;;;;;;mCAlQgE,aAAa;qCAF1B,qBAAqB;sCAArB,qBAAqB;wCAER,aAAa;+BAL5B,kBAAkB;kCAAlB,kBAAkB;kCAMZ,yBAAyB;+BAAzB,yBAAyB;kCAAzB,yBAAyB;iCADhB,aAAa"}

package/src/utils/address.js

@@ -2,6 +2,7 @@ import { encodeRemoteIbcAddress } from '@agoric/network/ibc/utils.js';
 import { fromBech32, fromHex } from '@cosmjs/encoding';
 import { Fail, q } from '@endo/errors';
 import bs58 from 'bs58';
+import { isEvmAddressShape, sameEvmAddress } from './evm-address.js';
 
 /**
  * @import {IBCConnectionID, RemoteIbcAddress} from '@agoric/network/ibc';
@@ -117,25 +118,8 @@ export const getBech32Prefix = address => {
   return address.slice(0, split);
 };
 
-/**
- * Compare two EVM addresses for equality, case-insensitive.
- *
- * @param {EvmAddress} a
- * @param {EvmAddress | undefined} b
- * @returns {boolean}
- */
-export const sameEvmAddress = (a, b) => a.toLowerCase() === b?.toLowerCase();
+export { sameEvmAddress, isEvmAddressShape };
 harden(sameEvmAddress);
-
-/**
- * Whether `x` has the shape of an EVM address: `0x` followed by 40 hex
- * digits, in any casing (an EIP-55 checksum is not verified).
- *
- * @param {unknown} x
- * @returns {x is EvmAddress}
- */
-export const isEvmAddressShape = x =>
-  typeof x === 'string' && /^0x[0-9a-fA-F]{40}$/u.test(x);
 harden(isEvmAddressShape);
 
 /**

package/src/utils/eip712-messages.js

@@ -35,7 +35,7 @@ import {
   makeWitness,
   PermitTransferFromTypeParams,
 } from './permit2.js';
-import { isEvmAddressShape, sameEvmAddress } from './address.js';
+import { isEvmAddressShape, sameEvmAddress } from './evm-address.js';
 import { normalizeAndValidateEIP712Data } from './viem-utils/eip712-normalize.js';
 
 ;                                                                    

package/src/utils/evm-address.d.ts

@@ -0,0 +1,4 @@
+export function sameEvmAddress(a: EvmAddress, b: EvmAddress | undefined): boolean;
+export function isEvmAddressShape(x: unknown): x is EvmAddress;
+import type { Address as EvmAddress } from 'viem';
+//# sourceMappingURL=evm-address.d.ts.map

package/src/utils/evm-address.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"evm-address.d.ts","sourceRoot":"","sources":["evm-address.js"],"names":[],"mappings":"AAiBO,kCAJI,UAAU,KACV,UAAU,GAAG,SAAS,GACpB,OAAO,CAEwD;AASrE,qCAHI,OAAO,GACL,CAAC,IAAI,UAAU,CAG6B;2CApBjB,MAAM"}

package/src/utils/evm-address.js

@@ -0,0 +1,28 @@
+/**
+ * @file EVM address helpers with no runtime dependencies, so that modules
+ * meant to also run outside of a locked-down (SES) environment, such as the
+ * EIP-712 message helpers, can use them.
+ */
+
+/**
+ * @import {Address as EvmAddress} from 'viem';
+ */
+
+/**
+ * Compare two EVM addresses for equality, case-insensitive.
+ *
+ * @param {EvmAddress} a
+ * @param {EvmAddress | undefined} b
+ * @returns {boolean}
+ */
+export const sameEvmAddress = (a, b) => a.toLowerCase() === b?.toLowerCase();
+
+/**
+ * Whether `x` has the shape of an EVM address: `0x` followed by 40 hex
+ * digits, in any casing (an EIP-55 checksum is not verified).
+ *
+ * @param {unknown} x
+ * @returns {x is EvmAddress}
+ */
+export const isEvmAddressShape = x =>
+  typeof x === 'string' && /^0x[0-9a-fA-F]{40}$/u.test(x);

package/src/utils/meta.d.ts

@@ -0,0 +1,31 @@
+/**
+ * @file Helpers for quoting or describing values in e.g. error messages
+ * and test descriptions.
+ */
+/**
+ * Quotes and escapes an identifier (a struct/field type or field name) for
+ * embedding in an error message. Escaping via `JSON.stringify` happens
+ * *after* truncating and covers the whole (possibly-annotated) result, so
+ * an embedded quote, backslash, or newline in the identifier can't break
+ * out of the message's own quoting, and the `(N chars total)` annotation
+ * can't itself get chopped off by a later truncation step (there isn't
+ * one).
+ */
+export declare const quoteName: (str: string) => string;
+/**
+ * Quotes and escapes each name in `names` (see `quoteName`) and joins them
+ * for an error message -- bounding not just each individual name's length
+ * but also, since attacker-controlled data can make the *list itself*
+ * arbitrarily long (e.g. very many extra fields on a struct), the number of
+ * items included. Cuts off whole items rather than slicing the joined
+ * string's raw characters, so the result can never end mid-quote the way
+ * `truncate`-ing an already-joined-and-quoted string could.
+ */
+export declare const quoteNameList: (names: readonly string[]) => string;
+/**
+ * A short, bounded description of a value for error messages. Only
+ * `string`/`number`/`bigint` can be arbitrarily long themselves; anything
+ * else is described by shape/type rather than rendered.
+ */
+export declare const describeValue: (value: unknown) => string;
+//# sourceMappingURL=meta.d.ts.map

package/src/utils/meta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["meta.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA+BH;;;;;;;;GAQG;AACH,eAAO,MAAM,SAAS,GAAI,KAAK,MAAM,KAAG,MAAuC,CAAC;AAEhF;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,SAAS,MAAM,EAAE,KAAG,MAIxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,OAAO,KAAG,MAqB9C,CAAC"}

package/src/utils/meta.js

@@ -0,0 +1,87 @@
+/**
+ * @file Helpers for quoting or describing values in e.g. error messages
+ * and test descriptions.
+ */
+
+const MAX_DESCRIBED_LENGTH = 100;
+const MAX_DESCRIBED_ITEMS = 10;
+
+/**
+ * Slices `str` to at most `MAX_DESCRIBED_LENGTH` characters, appending
+ * `...` if it was cut. Bounds length only -- doesn't escape or annotate;
+ * `truncate` and `describeValue`'s string case each build on this
+ * differently (an appended `(N chars total)` annotation, or JSON escaping,
+ * respectively), so the raw slicing lives in one place.
+ */
+const truncateRaw = (str        )         =>
+  str.length > MAX_DESCRIBED_LENGTH
+    ? `${str.slice(0, MAX_DESCRIBED_LENGTH)}...`
+    : str;
+
+/**
+ * Bounds a string embedded in an error message -- `message` (and, in
+ * 'throw' mode, `types`) can come from an untrusted source, so a field
+ * name, value, or joined list of them could otherwise be arbitrarily large.
+ * Bounds length only, and doesn't escape the result -- see `quoteName` for
+ * a quoted-and-escaped identifier suitable for embedding directly in a
+ * message (manually wrapping this in literal quotes instead is unsafe: an
+ * embedded quote character in `str` would break out of them).
+ */
+const truncate = (str        )         =>
+  str.length > MAX_DESCRIBED_LENGTH
+    ? `${truncateRaw(str)}(${str.length} chars total)`
+    : str;
+
+/**
+ * Quotes and escapes an identifier (a struct/field type or field name) for
+ * embedding in an error message. Escaping via `JSON.stringify` happens
+ * *after* truncating and covers the whole (possibly-annotated) result, so
+ * an embedded quote, backslash, or newline in the identifier can't break
+ * out of the message's own quoting, and the `(N chars total)` annotation
+ * can't itself get chopped off by a later truncation step (there isn't
+ * one).
+ */
+export const quoteName = (str        )         => JSON.stringify(truncate(str));
+
+/**
+ * Quotes and escapes each name in `names` (see `quoteName`) and joins them
+ * for an error message -- bounding not just each individual name's length
+ * but also, since attacker-controlled data can make the *list itself*
+ * arbitrarily long (e.g. very many extra fields on a struct), the number of
+ * items included. Cuts off whole items rather than slicing the joined
+ * string's raw characters, so the result can never end mid-quote the way
+ * `truncate`-ing an already-joined-and-quoted string could.
+ */
+export const quoteNameList = (names                   )         => {
+  const shown = names.slice(0, MAX_DESCRIBED_ITEMS).map(quoteName).join(', ');
+  const omitted = names.length - MAX_DESCRIBED_ITEMS;
+  return omitted > 0 ? `${shown}, and ${omitted} more` : shown;
+};
+
+/**
+ * A short, bounded description of a value for error messages. Only
+ * `string`/`number`/`bigint` can be arbitrarily long themselves; anything
+ * else is described by shape/type rather than rendered.
+ */
+export const describeValue = (value         )         => {
+  if (value === null) return 'null';
+  if (typeof value === 'string') {
+    if (value.length > MAX_DESCRIBED_LENGTH) {
+      // The `(N chars total)` annotation goes *outside* the JSON-quoted,
+      // truncated value (unlike `quoteName`), so it reads as metadata about
+      // the value rather than part of it.
+      return `${JSON.stringify(truncateRaw(value))}(${value.length} chars total)`;
+    }
+    return JSON.stringify(value);
+  }
+  // Truncate the digits *before* appending the `n` suffix -- appending
+  // first and truncating the combined string risks slicing the `n` itself
+  // off a long enough value, leaving output that no longer looks like a
+  // bigint.
+  if (typeof value === 'bigint') return `${truncate(`${value}`)}n`;
+  if (typeof value === 'number') return truncate(String(value));
+  if (value instanceof Uint8Array)
+    return `a Uint8Array with ${value.length} byte(s)`;
+  if (Array.isArray(value)) return `an array with ${value.length} element(s)`;
+  return `a ${typeof value}`;
+};

package/src/utils/permit2/signatureTransferHelpers.js

@@ -27,7 +27,7 @@ import {
   permitWitnessTransferFromTypes,
   TokenPermissionTypeParams,
 } from './signatureTransfer.js';
-import { isEvmAddressShape, sameEvmAddress } from '../address.js';
+import { isEvmAddressShape, sameEvmAddress } from '../evm-address.js';
 
 const PrimaryTypes = keyMirror({
   PermitBatchWitnessTransferFrom: null,

package/src/utils/viem-utils/eip712-normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eip712-normalize.d.ts","sourceRoot":"","sources":["eip712-normalize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiEG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,kBAAkB,EAAE,CAAC,CAAC;AAEjE,MAAM,MAAM,mCAAmC,GAAG;IAChD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,EAAE,WAAW,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,qBAAqB;IACrB,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IACzC;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,OAAO,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AA4CF;;;;;;;;;GASG;AACH,eAAO,MAAM,6BAA6B,QAAO,MACf,CAAC;AAEnC;;;;;GAKG;AACH,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAwFpD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAG,MAAM,GAAG,SAc5D,CAAC;AAeF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,wBAAwB,GACnC,WAAW,MAAM,EACjB,OAAO,OAAO,KACb,OAgFF,CAAC;AAwLF,eAAO,MAAM,8BAA8B,GACzC,OAAO,mCAAmC,EAC1C,UAAS,qCAA0C,KAClD,oCA+EF,CAAC"}
+{"version":3,"file":"eip712-normalize.d.ts","sourceRoot":"","sources":["eip712-normalize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiEG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,kBAAkB,EAAE,CAAC,CAAC;AAEjE,MAAM,MAAM,mCAAmC,GAAG;IAChD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,EAAE,WAAW,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,qBAAqB;IACrB,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IACzC;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,OAAO,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAuCF;;;;;;;;;GASG;AACH,eAAO,MAAM,6BAA6B,QAAO,MACf,CAAC;AAEnC;;;;;GAKG;AACH,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAIpD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAG,MAAM,GAAG,SAc5D,CAAC;AAeF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,wBAAwB,GACnC,WAAW,MAAM,EACjB,OAAO,OAAO,KACb,OAgFF,CAAC;AAwLF,eAAO,MAAM,8BAA8B,GACzC,OAAO,mCAAmC,EAC1C,UAAS,qCAA0C,KAClD,oCA+EF,CAAC"}

package/src/utils/viem-utils/eip712-normalize.js

@@ -65,16 +65,18 @@
  *   than converted to the equivalent hex string.
  */
                                                         
+import { isEvmAddressShape } from '../evm-address.js';
+import { describeValue, quoteName, quoteNameList } from '../meta.js';
 
-                                                                 
+;                                                                
 
-                                                   
+;                                                  
                                    
                      
                       
   
 
-                                                     
+;                                                    
                        
                                            
      
@@ -87,7 +89,7 @@
                                                        
   
 
-                                                    
+;                                                   
                                    
                      
   
@@ -107,11 +109,6 @@ const splitArrayType = (
   };
 };
 
-// Same shape as `isEvmAddressShape` in `../address.js`, duplicated rather
-// than imported: this module must have no runtime imports (see the module
-// doc comment; `eip712-normalize.xs.test.js` also evaluates its source
-// directly), and `address.js` has runtime dependencies of its own.
-const ADDRESS_REGEX = /^0x[a-fA-F0-9]{40}$/u;
 // Solidity `(u)int<M>`: (un)signed integer of `M` bits, `0 < M <= 256`,
 // `M % 8 === 0`. Unlike viem's `integerRegex` (utils/regex.ts), the width
 // is required: EIP-712 has no bare `uint`/`int` aliases, and viem and
@@ -157,90 +154,6 @@ export const EIP712_INTEGER_STRING_MAX_LENGTH = 100;
 // abitype types `(u)int<M>` values as `number` for `M <= 48`, else `bigint`.
 const MAX_NUMBER_INTEGER_BITS = 48;
 
-const MAX_DESCRIBED_LENGTH = 100;
-
-/**
- * Slices `str` to at most `MAX_DESCRIBED_LENGTH` characters, appending
- * `...` if it was cut. Bounds length only -- doesn't escape or annotate;
- * `truncate` and `describeValue`'s string case each build on this
- * differently (an appended `(N chars total)` annotation, or JSON escaping,
- * respectively), so the raw slicing lives in one place.
- */
-const truncateRaw = (str        )         =>
-  str.length > MAX_DESCRIBED_LENGTH
-    ? `${str.slice(0, MAX_DESCRIBED_LENGTH)}...`
-    : str;
-
-/**
- * Bounds a string embedded in an error message -- `message` (and, in
- * 'throw' mode, `types`) can come from an untrusted source, so a field
- * name, value, or joined list of them could otherwise be arbitrarily large.
- * Bounds length only, and doesn't escape the result -- see `quoteName` for
- * a quoted-and-escaped identifier suitable for embedding directly in a
- * message (manually wrapping this in literal quotes instead is unsafe: an
- * embedded quote character in `str` would break out of them).
- */
-const truncate = (str        )         =>
-  str.length > MAX_DESCRIBED_LENGTH
-    ? `${truncateRaw(str)}(${str.length} chars total)`
-    : str;
-
-/**
- * Quotes and escapes an identifier (a struct/field type or field name) for
- * embedding in an error message. Escaping via `JSON.stringify` happens
- * *after* truncating and covers the whole (possibly-annotated) result, so
- * an embedded quote, backslash, or newline in the identifier can't break
- * out of the message's own quoting, and the `(N chars total)` annotation
- * can't itself get chopped off by a later truncation step (there isn't
- * one).
- */
-const quoteName = (str        )         => JSON.stringify(truncate(str));
-
-const MAX_DESCRIBED_ITEMS = 10;
-
-/**
- * Quotes and escapes each name in `names` (see `quoteName`) and joins them
- * for an error message -- bounding not just each individual name's length
- * but also, since attacker-controlled data can make the *list itself*
- * arbitrarily long (e.g. very many extra fields on a struct), the number of
- * items included. Cuts off whole items rather than slicing the joined
- * string's raw characters, so the result can never end mid-quote the way
- * `truncate`-ing an already-joined-and-quoted string could.
- */
-const quoteNameList = (names                   )         => {
-  const shown = names.slice(0, MAX_DESCRIBED_ITEMS).map(quoteName).join(', ');
-  const omitted = names.length - MAX_DESCRIBED_ITEMS;
-  return omitted > 0 ? `${shown}, and ${omitted} more` : shown;
-};
-
-/**
- * A short, bounded description of a value for error messages. Only
- * `string`/`number`/`bigint` can be arbitrarily long themselves; anything
- * else is described by shape/type rather than rendered.
- */
-const describeValue = (value         )         => {
-  if (value === null) return 'null';
-  if (typeof value === 'string') {
-    if (value.length > MAX_DESCRIBED_LENGTH) {
-      // The `(N chars total)` annotation goes *outside* the JSON-quoted,
-      // truncated value (unlike `quoteName`), so it reads as metadata about
-      // the value rather than part of it.
-      return `${JSON.stringify(truncateRaw(value))}(${value.length} chars total)`;
-    }
-    return JSON.stringify(value);
-  }
-  // Truncate the digits *before* appending the `n` suffix -- appending
-  // first and truncating the combined string risks slicing the `n` itself
-  // off a long enough value, leaving output that no longer looks like a
-  // bigint.
-  if (typeof value === 'bigint') return `${truncate(`${value}`)}n`;
-  if (typeof value === 'number') return truncate(String(value));
-  if (value instanceof Uint8Array)
-    return `a Uint8Array with ${value.length} byte(s)`;
-  if (Array.isArray(value)) return `an array with ${value.length} element(s)`;
-  return `a ${typeof value}`;
-};
-
 /**
  * Parses an integer given in one of the JS representations accepted for an
  * EIP-712 `(u)int<M>` value: a `bigint`, a safe integer `number`, or a
@@ -320,7 +233,7 @@ export const normalizeEIP712Primitive = (
   const quotedType = quoteName(fieldType);
 
   if (fieldType === 'address') {
-    if (typeof value !== 'string' || !ADDRESS_REGEX.test(value)) {
+    if (!isEvmAddressShape(value)) {
       throw new Error(`Invalid EIP-712 address value: ${describeValue(value)}`);
     }
     return value;