ethagent 2.0.2 → 2.1.0

package/src/identity/registry/vault/constants.ts

@@ -0,0 +1,38 @@
+import { getAddress, keccak256, parseAbi, type Address, type Hex } from 'viem'
+
+export const VAULT_ABI = parseAbi([
+  'constructor(address registry, uint256 agentId)',
+  'function agentOwner(address registry, uint256 agentId) view returns (address)',
+  'function metadataOperators(address registry, uint256 agentId, address operator) view returns (bool)',
+  'function heldAgent() view returns (address registry, uint256 agentId, address owner)',
+  'function setMetadataOperator(address registry, uint256 agentId, address operator, bool approved)',
+  'function unwrap(address registry, uint256 agentId, address recipient)',
+  'function rotateAgentURI(address registry, uint256 agentId, string newURI)',
+  'event AgentDeposited(address indexed registry, uint256 indexed agentId, address indexed owner)',
+  'event AgentUnwrapped(address indexed registry, uint256 indexed agentId, address indexed recipient)',
+  'event MetadataOperatorChanged(address indexed registry, uint256 indexed agentId, address indexed operator, bool approved)',
+  'event AgentURIRotated(address indexed registry, uint256 indexed agentId, string newURI, address indexed signer)',
+])
+
+export const VAULT_ADDRESSES: Record<number, Address> = {
+}
+
+export function vaultAddressForChain(chainId: number): Address | undefined {
+  const address = VAULT_ADDRESSES[chainId]
+  return address ? getAddress(address) : undefined
+}
+
+export function resolveConfiguredVaultAddress(
+  operatorVaults: Readonly<Record<string, string>> | undefined,
+  chainId: number,
+): Address | undefined {
+  const fromConfig = operatorVaults?.[String(chainId)]
+  if (fromConfig) return getAddress(fromConfig)
+  return vaultAddressForChain(chainId)
+}
+
+export const VAULT_DEPLOY_BYTECODE: Hex = '0x608060405234801561001057600080fd5b5060405161090538038061090583398101604081905261002f91610058565b600080546001600160a01b0319166001600160a01b039390931692909217909155600155610092565b6000806040838503121561006b57600080fd5b82516001600160a01b038116811461008257600080fd5b6020939093015192949293505050565b610864806100a16000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80631c3bb2851161005b5780631c3bb2851461011157806324a3e2a1146101265780639a61ce8114610149578063b68f43451461015c57600080fd5b8063029ae47e146100825780631400a7e2146100b2578063150b7a02146100e5575b600080fd5b610095610090366004610602565b61016f565b6040516001600160a01b0390911681526020015b60405180910390f35b600254600354600454604080516001600160a01b03948516815260208101939093529216918101919091526060016100a9565b6100f86100f3366004610675565b61019a565b6040516001600160e01b031990911681526020016100a9565b61012461011f3660046106e4565b610293565b005b61013961013436600461073e565b610397565b60405190151581526020016100a9565b61012461015736600461077a565b6103d0565b61012461016a36600461073e565b6104a2565b600061017b83836105ab565b610186576000610193565b6004546001600160a01b03165b9392505050565b600080546001600160a01b0316331415806101b757506001548414155b156101d557604051639667ffdf60e01b815260040160405180910390fd5b6004546001600160a01b0316156101ff5760405163d5a8211560e01b815260040160405180910390fd5b60028054336001600160a01b0319918216179091556003859055600480549091166001600160a01b0387161790556005805460018101909155600003600019016102495760016005555b6040516001600160a01b03861690859033907f7b19af5fe09a0be4ed70b569401ce6fa0de072757b228cc2088350eccc2f987390600090a450630a85bd0160e11b95945050505050565b600061029f858561016f565b9050336001600160a01b038216148015906102c257506102c0858533610397565b155b156102e05760405163ea8e4eb560e01b815260040160405180910390fd5b604051630af28bd360e01b81526001600160a01b03861690630af28bd390610310908790879087906004016107f7565b600060405180830381600087803b15801561032a57600080fd5b505af115801561033e573d6000803e3d6000fd5b50505050336001600160a01b031684866001600160a01b03167fa455a129bb4260e5274d34dd213bcd11399667f80a0615e6cb375728d2e75a90868660405161038892919061081a565b60405180910390a45050505050565b60006103a384846105ab565b80156103c857506005546001600160a01b038316600090815260066020526040902054145b949350505050565b6103da848461016f565b6001600160a01b0316336001600160a01b03161461040b576040516330cd747160e01b815260040160405180910390fd5b8015610432576005546001600160a01b03831660009081526006602052604090205561044c565b6001600160a01b0382166000908152600660205260408120555b816001600160a01b031683856001600160a01b03167fea7d7802a5cc5520abde4345007961a980fcb27dca3030ca6aede6bdc58bd79e84604051610494911515815260200190565b60405180910390a450505050565b60006104ae848461016f565b9050336001600160a01b038216146104d9576040516330cd747160e01b815260040160405180910390fd5b600280546001600160a01b03199081169091556000600355600480549091168155604051632142170760e11b815230918101919091526001600160a01b038381166024830152604482018590528516906342842e0e90606401600060405180830381600087803b15801561054c57600080fd5b505af1158015610560573d6000803e3d6000fd5b50505050816001600160a01b031683856001600160a01b03167fa433e9204e6763dff9274d8c1febdbc7c60aa7d7e85c106d5b978372658438b860405160405180910390a450505050565b6004546000906001600160a01b0316158015906105d557506002546001600160a01b038481169116145b801561019357505060035414919050565b80356001600160a01b03811681146105fd57600080fd5b919050565b6000806040838503121561061557600080fd5b61061e836105e6565b946020939093013593505050565b60008083601f84011261063e57600080fd5b50813567ffffffffffffffff81111561065657600080fd5b60208301915083602082850101111561066e57600080fd5b9250929050565b60008060008060006080868803121561068d57600080fd5b610696866105e6565b94506106a4602087016105e6565b935060408601359250606086013567ffffffffffffffff8111156106c757600080fd5b6106d38882890161062c565b969995985093965092949392505050565b600080600080606085870312156106fa57600080fd5b610703856105e6565b935060208501359250604085013567ffffffffffffffff81111561072657600080fd5b6107328782880161062c565b95989497509550505050565b60008060006060848603121561075357600080fd5b61075c846105e6565b925060208401359150610771604085016105e6565b90509250925092565b6000806000806080858703121561079057600080fd5b610799856105e6565b9350602085013592506107ae604086016105e6565b9150606085013580151581146107c357600080fd5b939692955090935050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b8381526040602082015260006108116040830184866107ce565b95945050505050565b6020815260006103c86020830184866107ce56fea26469706673582212203c514f6e69c0746959c89bfc363da3784bb4420aa12883ab98363b28e6cd904a64736f6c63430008180033'
+
+export const VAULT_RUNTIME_BYTECODE: Hex = '0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80631c3bb2851161005b5780631c3bb2851461011157806324a3e2a1146101265780639a61ce8114610149578063b68f43451461015c57600080fd5b8063029ae47e146100825780631400a7e2146100b2578063150b7a02146100e5575b600080fd5b610095610090366004610602565b61016f565b6040516001600160a01b0390911681526020015b60405180910390f35b600254600354600454604080516001600160a01b03948516815260208101939093529216918101919091526060016100a9565b6100f86100f3366004610675565b61019a565b6040516001600160e01b031990911681526020016100a9565b61012461011f3660046106e4565b610293565b005b61013961013436600461073e565b610397565b60405190151581526020016100a9565b61012461015736600461077a565b6103d0565b61012461016a36600461073e565b6104a2565b600061017b83836105ab565b610186576000610193565b6004546001600160a01b03165b9392505050565b600080546001600160a01b0316331415806101b757506001548414155b156101d557604051639667ffdf60e01b815260040160405180910390fd5b6004546001600160a01b0316156101ff5760405163d5a8211560e01b815260040160405180910390fd5b60028054336001600160a01b0319918216179091556003859055600480549091166001600160a01b0387161790556005805460018101909155600003600019016102495760016005555b6040516001600160a01b03861690859033907f7b19af5fe09a0be4ed70b569401ce6fa0de072757b228cc2088350eccc2f987390600090a450630a85bd0160e11b95945050505050565b600061029f858561016f565b9050336001600160a01b038216148015906102c257506102c0858533610397565b155b156102e05760405163ea8e4eb560e01b815260040160405180910390fd5b604051630af28bd360e01b81526001600160a01b03861690630af28bd390610310908790879087906004016107f7565b600060405180830381600087803b15801561032a57600080fd5b505af115801561033e573d6000803e3d6000fd5b50505050336001600160a01b031684866001600160a01b03167fa455a129bb4260e5274d34dd213bcd11399667f80a0615e6cb375728d2e75a90868660405161038892919061081a565b60405180910390a45050505050565b60006103a384846105ab565b80156103c857506005546001600160a01b038316600090815260066020526040902054145b949350505050565b6103da848461016f565b6001600160a01b0316336001600160a01b03161461040b576040516330cd747160e01b815260040160405180910390fd5b8015610432576005546001600160a01b03831660009081526006602052604090205561044c565b6001600160a01b0382166000908152600660205260408120555b816001600160a01b031683856001600160a01b03167fea7d7802a5cc5520abde4345007961a980fcb27dca3030ca6aede6bdc58bd79e84604051610494911515815260200190565b60405180910390a450505050565b60006104ae848461016f565b9050336001600160a01b038216146104d9576040516330cd747160e01b815260040160405180910390fd5b600280546001600160a01b03199081169091556000600355600480549091168155604051632142170760e11b815230918101919091526001600160a01b038381166024830152604482018590528516906342842e0e90606401600060405180830381600087803b15801561054c57600080fd5b505af1158015610560573d6000803e3d6000fd5b50505050816001600160a01b031683856001600160a01b03167fa433e9204e6763dff9274d8c1febdbc7c60aa7d7e85c106d5b978372658438b860405160405180910390a450505050565b6004546000906001600160a01b0316158015906105d557506002546001600160a01b038481169116145b801561019357505060035414919050565b80356001600160a01b03811681146105fd57600080fd5b919050565b6000806040838503121561061557600080fd5b61061e836105e6565b946020939093013593505050565b60008083601f84011261063e57600080fd5b50813567ffffffffffffffff81111561065657600080fd5b60208301915083602082850101111561066e57600080fd5b9250929050565b60008060008060006080868803121561068d57600080fd5b610696866105e6565b94506106a4602087016105e6565b935060408601359250606086013567ffffffffffffffff8111156106c757600080fd5b6106d38882890161062c565b969995985093965092949392505050565b600080600080606085870312156106fa57600080fd5b610703856105e6565b935060208501359250604085013567ffffffffffffffff81111561072657600080fd5b6107328782880161062c565b95989497509550505050565b60008060006060848603121561075357600080fd5b61075c846105e6565b925060208401359150610771604085016105e6565b90509250925092565b6000806000806080858703121561079057600080fd5b610799856105e6565b9350602085013592506107ae604086016105e6565b9150606085013580151581146107c357600080fd5b939692955090935050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b8381526040602082015260006108116040830184866107ce565b95945050505050565b6020815260006103c86020830184866107ce56fea26469706673582212203c514f6e69c0746959c89bfc363da3784bb4420aa12883ab98363b28e6cd904a64736f6c63430008180033'
+
+export const VAULT_RUNTIME_BYTECODE_HASH: Hex = keccak256(VAULT_RUNTIME_BYTECODE)

package/src/identity/registry/{operatorVault → vault}/read.ts

@@ -1,11 +1,11 @@
 import { getAddress, parseAbi, parseAbiItem, type Address, type PublicClient } from 'viem'
-import { OPERATOR_VAULT_ABI } from './constants.js'
-import { delayMs, OPERATOR_VAULT_POLL_DELAY_MS, OPERATOR_VAULT_POLL_MAX_ATTEMPTS } from './bytecode.js'
+import { VAULT_ABI } from './constants.js'
+import { delayMs, VAULT_POLL_DELAY_MS, VAULT_POLL_MAX_ATTEMPTS } from './bytecode.js'
 
 const DISCOVER_LOG_WINDOW_MAX_ATTEMPTS = 3
 const DISCOVER_LOG_WINDOW_DELAY_MS = 2000
 
-export type OperatorVaultReadClient = Pick<PublicClient, 'readContract'>
+export type VaultReadClient = Pick<PublicClient, 'readContract'>
 
 const ERC721_OWNER_OF_ABI = parseAbi([
   'function ownerOf(uint256 tokenId) view returns (address)',
@@ -44,7 +44,7 @@ export async function discoverPriorVaultFromTokenOwner(
   try {
     vaultLevelOwner = await args.client.readContract({
       address: candidate,
-      abi: OPERATOR_VAULT_ABI,
+      abi: VAULT_ABI,
       functionName: 'agentOwner',
       args: [registryAddr, args.agentId],
     }) as Address
@@ -58,7 +58,7 @@ export async function discoverPriorVaultFromTokenOwner(
 }
 
 export type IsAgentInVaultArgs = {
-  client: OperatorVaultReadClient
+  client: VaultReadClient
   vaultAddress: Address
   registry: Address
   agentId: bigint
@@ -69,7 +69,7 @@ export async function isAgentInVault(
 ): Promise<{ inVault: boolean; ownerAddress?: Address }> {
   const owner = await args.client.readContract({
     address: getAddress(args.vaultAddress),
-    abi: OPERATOR_VAULT_ABI,
+    abi: VAULT_ABI,
     functionName: 'agentOwner',
     args: [getAddress(args.registry), args.agentId],
   }) as Address
@@ -83,8 +83,8 @@ export async function confirmAgentInVault(
   args: IsAgentInVaultArgs,
 ): Promise<{ inVault: true; ownerAddress: Address }> {
   let lastErr: unknown
-  for (let attempt = 0; attempt < OPERATOR_VAULT_POLL_MAX_ATTEMPTS; attempt++) {
-    if (attempt > 0) await delayMs(OPERATOR_VAULT_POLL_DELAY_MS)
+  for (let attempt = 0; attempt < VAULT_POLL_MAX_ATTEMPTS; attempt++) {
+    if (attempt > 0) await delayMs(VAULT_POLL_DELAY_MS)
     try {
       const status = await isAgentInVault(args)
       lastErr = undefined
@@ -97,7 +97,7 @@ export async function confirmAgentInVault(
   }
   if (lastErr) throw lastErr
   throw new Error(
-    `OperatorVault ${getAddress(args.vaultAddress)} does not hold agent token #${args.agentId.toString()} for registry ${getAddress(args.registry)} after the deposit-confirmation budget was exhausted. The deposit transaction may have been re-orged or applied to the wrong vault. Re-run the switch.`,
+    `Vault ${getAddress(args.vaultAddress)} does not hold agent token #${args.agentId.toString()} for registry ${getAddress(args.registry)} after the deposit-confirmation budget was exhausted. The deposit transaction may have been re-orged or applied to the wrong vault. Re-run the switch.`,
   )
 }
 
@@ -111,8 +111,8 @@ export async function confirmAgentWithdrawnFromVault(
   const recipient = getAddress(args.recipient)
   let lastErr: unknown
   let lastObserved: string | undefined
-  for (let attempt = 0; attempt < OPERATOR_VAULT_POLL_MAX_ATTEMPTS; attempt++) {
-    if (attempt > 0) await delayMs(OPERATOR_VAULT_POLL_DELAY_MS)
+  for (let attempt = 0; attempt < VAULT_POLL_MAX_ATTEMPTS; attempt++) {
+    if (attempt > 0) await delayMs(VAULT_POLL_DELAY_MS)
     try {
       const status = await isAgentInVault(args)
       const tokenOwner = await args.client.readContract({
@@ -135,7 +135,7 @@ export async function confirmAgentWithdrawnFromVault(
   }
   if (lastErr) throw lastErr
   throw new Error(
-    `OperatorVault ${getAddress(args.vaultAddress)} did not release agent token #${args.agentId.toString()} to ${recipient} after the withdraw-confirmation budget was exhausted. Last observed: ${lastObserved ?? 'unknown'}.`,
+    `Vault ${getAddress(args.vaultAddress)} did not release agent token #${args.agentId.toString()} to ${recipient} after the withdraw-confirmation budget was exhausted. Last observed: ${lastObserved ?? 'unknown'}.`,
   )
 }
 
@@ -218,7 +218,7 @@ export async function discoverVaultedTokens(
 }
 
 export type ReadMetadataOperatorsArgs = {
-  client: OperatorVaultReadClient
+  client: VaultReadClient
   vaultAddress: Address
   registry: Address
   agentId: bigint
@@ -233,7 +233,7 @@ export async function readMetadataOperators(
     try {
       const approved = await args.client.readContract({
         address: getAddress(args.vaultAddress),
-        abi: OPERATOR_VAULT_ABI,
+        abi: VAULT_ABI,
         functionName: 'metadataOperators',
         args: [getAddress(args.registry), args.agentId, getAddress(candidate)],
       }) as boolean

package/src/identity/registry/{operatorVault → vault}/transactions.ts

@@ -1,5 +1,5 @@
 import { encodeFunctionData, getAddress, parseAbi, type Address, type Hex } from 'viem'
-import { OPERATOR_VAULT_ABI } from './constants.js'
+import { VAULT_ABI } from './constants.js'
 
 const ERC721_SAFE_TRANSFER_ABI = parseAbi([
   'function safeTransferFrom(address from, address to, uint256 tokenId)',
@@ -35,7 +35,7 @@ export function encodeSetMetadataOperator(args: SetMetadataOperatorArgs): { to:
   return {
     to: getAddress(args.vaultAddress),
     data: encodeFunctionData({
-      abi: OPERATOR_VAULT_ABI,
+      abi: VAULT_ABI,
       functionName: 'setMetadataOperator',
       args: [getAddress(args.registry), args.agentId, getAddress(args.operator), args.approved],
     }),
@@ -53,7 +53,7 @@ export function encodeRotateAgentURI(args: RotateAgentURIArgs): { to: Address; d
   return {
     to: getAddress(args.vaultAddress),
     data: encodeFunctionData({
-      abi: OPERATOR_VAULT_ABI,
+      abi: VAULT_ABI,
       functionName: 'rotateAgentURI',
       args: [getAddress(args.registry), args.agentId, args.newURI],
     }),
@@ -73,9 +73,9 @@ export function encodeUnwrapAgent(
   return {
     to: getAddress(args.vaultAddress),
     data: encodeFunctionData({
-      abi: OPERATOR_VAULT_ABI,
+      abi: VAULT_ABI,
       functionName: 'unwrap',
-      args: [getAddress(args.registry), args.agentId, getAddress(args.recipient)],
+      args: [getAddress(args.registry), args.agentId, args.recipient],
     }),
   }
 }

package/src/identity/registry/vault.ts

@@ -0,0 +1,44 @@
+export {
+  VAULT_ABI,
+  VAULT_ADDRESSES,
+  VAULT_DEPLOY_BYTECODE,
+  VAULT_RUNTIME_BYTECODE,
+  VAULT_RUNTIME_BYTECODE_HASH,
+  vaultAddressForChain,
+  resolveConfiguredVaultAddress,
+} from './vault/constants.js'
+export {
+  VaultBytecodeMismatchError,
+  assertVaultBytecode,
+  formatVaultBytecodeMismatchDetail,
+} from './vault/bytecode.js'
+export type { AssertVaultBytecodeClient } from './vault/bytecode.js'
+export {
+  encodeDepositAgent,
+  encodeRotateAgentURI,
+  encodeSetMetadataOperator,
+  encodeUnwrapAgent,
+} from './vault/transactions.js'
+export type {
+  DepositAgentArgs,
+  RotateAgentURIArgs,
+  SetMetadataOperatorArgs,
+  UnwrapAgentArgs,
+} from './vault/transactions.js'
+export {
+  confirmAgentWithdrawnFromVault,
+  confirmAgentInVault,
+  discoverPriorVaultFromTokenOwner,
+  discoverVaultedTokens,
+  isAgentInVault,
+  readMetadataOperators,
+} from './vault/read.js'
+export type {
+  ConfirmAgentWithdrawnArgs,
+  DiscoverPriorVaultArgs,
+  DiscoverPriorVaultClient,
+  DiscoverVaultedTokensArgs,
+  IsAgentInVaultArgs,
+  VaultReadClient,
+  ReadMetadataOperatorsArgs,
+} from './vault/read.js'

package/src/identity/wallet/page/copy.ts

@@ -93,7 +93,7 @@ export const PURPOSE_COPY: Record<string, PurposeCopyEntry> = {
     flowTitle: "Operator Wallet Save",
     sign: { text: "Sign With Operator Wallet", hint: "Signs the encrypted snapshot for restore access." },
     prepare: { text: "Saving Snapshot...", hint: "Keep this page open." },
-    transaction: { text: "Use Operator Wallet", hint: "Rotates the ERC-8004 token URI through the OperatorVault." },
+    transaction: { text: "Use Operator Wallet", hint: "Rotates the ERC-8004 token URI through the Vault." },
   },
   "update-snapshot-connected": {
     flowTitle: "Save Snapshot",
@@ -196,7 +196,7 @@ export const PURPOSE_COPY: Record<string, PurposeCopyEntry> = {
   "sync-operator-vault": {
     flowTitle: "Owner Wallet Required",
     prepare: { text: "Preparing Vault Operator Update...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Updates the OperatorVault metadata-operator list so authorized operator wallets can rotate the agent URI." },
+    transaction: { text: "Use Owner Wallet", hint: "Updates the Vault metadata-operator list so authorized operator wallets can rotate the agent URI." },
   },
   "refetch-snapshot": {
     flowTitle: "Refetch Latest Snapshot",
@@ -219,39 +219,39 @@ export const PURPOSE_COPY: Record<string, PurposeCopyEntry> = {
     transaction: { text: "Use Sender Wallet", hint: "Submits one transaction to publish the transfer snapshot to the ERC-8004 token URI." },
   },
   "deploy-agent-vault": {
-    flowTitle: "Deploy OperatorVault",
+    flowTitle: "Deploy Vault",
     prepare: { text: "Preparing Vault Deploy...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Deploys the OperatorVault contract onchain. One-time setup per agent." },
-    errorContext: "While submitting the OperatorVault deploy",
+    transaction: { text: "Use Owner Wallet", hint: "Deploys the Vault contract onchain. One-time setup per agent." },
+    errorContext: "While submitting the Vault deploy",
   },
   "deposit-agent-vault": {
     flowTitle: "Deposit Token Into Vault",
     prepare: { text: "Preparing Vault Deposit...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Sends the agent token to the OperatorVault so the vault can save updates on your behalf." },
-    errorContext: "While submitting the OperatorVault deposit",
+    transaction: { text: "Use Owner Wallet", hint: "Sends the agent token to the Vault so the vault can save updates on your behalf." },
+    errorContext: "While submitting the Vault deposit",
   },
   "unwrap-agent-vault": {
     flowTitle: "Unwrap Token From Vault",
     prepare: { text: "Preparing Vault Unwrap...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Returns the agent token from the OperatorVault to your owner wallet." },
+    transaction: { text: "Use Owner Wallet", hint: "Returns the agent token from the Vault to your owner wallet." },
   },
   "rotate-agent-uri-vault-owner": {
     flowTitle: "Save Update Through Vault",
     sign: { text: "Sign With Owner Wallet", hint: "Approves the new snapshot before saving onchain. No token approval." },
     prepare: { text: "Preparing Update...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Saves your update onchain through the OperatorVault. The vault holds your token, so updates go through it." },
+    transaction: { text: "Use Owner Wallet", hint: "Saves your update onchain through the Vault. The vault holds your token, so updates go through it." },
   },
   "rotate-agent-uri-vault-operator": {
     flowTitle: "Save Update Through Vault",
     sign: { text: "Sign With Operator Wallet", hint: "Approves the new snapshot before saving onchain. No token approval." },
     prepare: { text: "Preparing Update...", hint: "Keep this page open." },
-    transaction: { text: "Use Operator Wallet", hint: "Rotates the ERC-8004 token URI through the OperatorVault. The vault holds your token, so the operator wallet calls the vault to publish." },
+    transaction: { text: "Use Operator Wallet", hint: "Rotates the ERC-8004 token URI through the Vault. The vault holds your token, so the operator wallet calls the vault to publish." },
   },
   "withdraw-vault": {
     flowTitle: "Withdraw Token From Vault",
     prepare: { text: "Preparing Token Withdrawal...", hint: "Keep this page open." },
     transaction: { text: "Use Owner Wallet", hint: "Temporarily returns the agent token from the vault to your owner wallet. Vault stays configured so you can redeposit later." },
-    errorContext: "While submitting the OperatorVault withdraw",
+    errorContext: "While submitting the Vault withdraw",
   },
   "register-root-commit": {
     flowTitle: "Commit ENS Name",

package/src/storage/config.ts

@@ -196,7 +196,7 @@ export async function saveConfigWithMerge(
   throw lastErr ?? new ConfigVersionStaleError(undefined, undefined)
 }
 
-export function getConfiguredOperatorVaultAddress(
+export function getConfiguredVaultAddress(
   config: EthagentConfig | null | undefined,
   chainId: number,
 ): string | undefined {
@@ -223,13 +223,13 @@ export function buildSeedConfigForIdentity(args: {
   }
 }
 
-export function setConfiguredOperatorVaultAddress(
+export function setConfiguredVaultAddress(
   config: EthagentConfig,
   chainId: number,
   vaultAddress: string,
 ): EthagentConfig {
   if (!config.erc8004) {
-    throw new Error('Cannot record OperatorVault address: erc8004 registry config is not set')
+    throw new Error('Cannot record Vault address: erc8004 registry config is not set')
   }
   return {
     ...config,

package/src/identity/registry/operatorVault/constants.ts

@@ -1,38 +0,0 @@
-import { getAddress, keccak256, parseAbi, type Address, type Hex } from 'viem'
-
-export const OPERATOR_VAULT_ABI = parseAbi([
-  'constructor(address registry, uint256 agentId)',
-  'function agentOwner(address registry, uint256 agentId) view returns (address)',
-  'function metadataOperators(address registry, uint256 agentId, address operator) view returns (bool)',
-  'function heldAgent() view returns (address registry, uint256 agentId, address owner)',
-  'function setMetadataOperator(address registry, uint256 agentId, address operator, bool approved)',
-  'function unwrap(address registry, uint256 agentId, address recipient)',
-  'function rotateAgentURI(address registry, uint256 agentId, string newURI)',
-  'event AgentDeposited(address indexed registry, uint256 indexed agentId, address indexed owner)',
-  'event AgentUnwrapped(address indexed registry, uint256 indexed agentId, address indexed recipient)',
-  'event MetadataOperatorChanged(address indexed registry, uint256 indexed agentId, address indexed operator, bool approved)',
-  'event AgentURIRotated(address indexed registry, uint256 indexed agentId, string newURI, address indexed signer)',
-])
-
-export const OPERATOR_VAULT_ADDRESSES: Record<number, Address> = {
-}
-
-export function operatorVaultAddressForChain(chainId: number): Address | undefined {
-  const address = OPERATOR_VAULT_ADDRESSES[chainId]
-  return address ? getAddress(address) : undefined
-}
-
-export function resolveConfiguredOperatorVaultAddress(
-  operatorVaults: Readonly<Record<string, string>> | undefined,
-  chainId: number,
-): Address | undefined {
-  const fromConfig = operatorVaults?.[String(chainId)]
-  if (fromConfig) return getAddress(fromConfig)
-  return operatorVaultAddressForChain(chainId)
-}
-
-export const OPERATOR_VAULT_DEPLOY_BYTECODE: Hex = '0x608060405234801561001057600080fd5b5060405161090538038061090583398101604081905261002f91610058565b600080546001600160a01b0319166001600160a01b039390931692909217909155600155610092565b6000806040838503121561006b57600080fd5b82516001600160a01b038116811461008257600080fd5b6020939093015192949293505050565b610864806100a16000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80631c3bb2851161005b5780631c3bb2851461011157806324a3e2a1146101265780639a61ce8114610149578063b68f43451461015c57600080fd5b8063029ae47e146100825780631400a7e2146100b2578063150b7a02146100e5575b600080fd5b610095610090366004610602565b61016f565b6040516001600160a01b0390911681526020015b60405180910390f35b600254600354600454604080516001600160a01b03948516815260208101939093529216918101919091526060016100a9565b6100f86100f3366004610675565b61019a565b6040516001600160e01b031990911681526020016100a9565b61012461011f3660046106e4565b610293565b005b61013961013436600461073e565b610397565b60405190151581526020016100a9565b61012461015736600461077a565b6103d0565b61012461016a36600461073e565b6104a2565b600061017b83836105ab565b610186576000610193565b6004546001600160a01b03165b9392505050565b600080546001600160a01b0316331415806101b757506001548414155b156101d557604051639667ffdf60e01b815260040160405180910390fd5b6004546001600160a01b0316156101ff5760405163d5a8211560e01b815260040160405180910390fd5b60028054336001600160a01b0319918216179091556003859055600480549091166001600160a01b0387161790556005805460018101909155600003600019016102495760016005555b6040516001600160a01b03861690859033907f7b19af5fe09a0be4ed70b569401ce6fa0de072757b228cc2088350eccc2f987390600090a450630a85bd0160e11b95945050505050565b600061029f858561016f565b9050336001600160a01b038216148015906102c257506102c0858533610397565b155b156102e05760405163ea8e4eb560e01b815260040160405180910390fd5b604051630af28bd360e01b81526001600160a01b03861690630af28bd390610310908790879087906004016107f7565b600060405180830381600087803b15801561032a57600080fd5b505af115801561033e573d6000803e3d6000fd5b50505050336001600160a01b031684866001600160a01b03167fa455a129bb4260e5274d34dd213bcd11399667f80a0615e6cb375728d2e75a90868660405161038892919061081a565b60405180910390a45050505050565b60006103a384846105ab565b80156103c857506005546001600160a01b038316600090815260066020526040902054145b949350505050565b6103da848461016f565b6001600160a01b0316336001600160a01b03161461040b576040516330cd747160e01b815260040160405180910390fd5b8015610432576005546001600160a01b03831660009081526006602052604090205561044c565b6001600160a01b0382166000908152600660205260408120555b816001600160a01b031683856001600160a01b03167fea7d7802a5cc5520abde4345007961a980fcb27dca3030ca6aede6bdc58bd79e84604051610494911515815260200190565b60405180910390a450505050565b60006104ae848461016f565b9050336001600160a01b038216146104d9576040516330cd747160e01b815260040160405180910390fd5b600280546001600160a01b03199081169091556000600355600480549091168155604051632142170760e11b815230918101919091526001600160a01b038381166024830152604482018590528516906342842e0e90606401600060405180830381600087803b15801561054c57600080fd5b505af1158015610560573d6000803e3d6000fd5b50505050816001600160a01b031683856001600160a01b03167fa433e9204e6763dff9274d8c1febdbc7c60aa7d7e85c106d5b978372658438b860405160405180910390a450505050565b6004546000906001600160a01b0316158015906105d557506002546001600160a01b038481169116145b801561019357505060035414919050565b80356001600160a01b03811681146105fd57600080fd5b919050565b6000806040838503121561061557600080fd5b61061e836105e6565b946020939093013593505050565b60008083601f84011261063e57600080fd5b50813567ffffffffffffffff81111561065657600080fd5b60208301915083602082850101111561066e57600080fd5b9250929050565b60008060008060006080868803121561068d57600080fd5b610696866105e6565b94506106a4602087016105e6565b935060408601359250606086013567ffffffffffffffff8111156106c757600080fd5b6106d38882890161062c565b969995985093965092949392505050565b600080600080606085870312156106fa57600080fd5b610703856105e6565b935060208501359250604085013567ffffffffffffffff81111561072657600080fd5b6107328782880161062c565b95989497509550505050565b60008060006060848603121561075357600080fd5b61075c846105e6565b925060208401359150610771604085016105e6565b90509250925092565b6000806000806080858703121561079057600080fd5b610799856105e6565b9350602085013592506107ae604086016105e6565b9150606085013580151581146107c357600080fd5b939692955090935050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b8381526040602082015260006108116040830184866107ce565b95945050505050565b6020815260006103c86020830184866107ce56fea2646970667358221220dd5405c74ca871baa3fc981f170a85015cbe31e79a0e1034acc7154f51ae011664736f6c63430008180033'
-
-export const OPERATOR_VAULT_RUNTIME_BYTECODE: Hex = '0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80631c3bb2851161005b5780631c3bb2851461011157806324a3e2a1146101265780639a61ce8114610149578063b68f43451461015c57600080fd5b8063029ae47e146100825780631400a7e2146100b2578063150b7a02146100e5575b600080fd5b610095610090366004610602565b61016f565b6040516001600160a01b0390911681526020015b60405180910390f35b600254600354600454604080516001600160a01b03948516815260208101939093529216918101919091526060016100a9565b6100f86100f3366004610675565b61019a565b6040516001600160e01b031990911681526020016100a9565b61012461011f3660046106e4565b610293565b005b61013961013436600461073e565b610397565b60405190151581526020016100a9565b61012461015736600461077a565b6103d0565b61012461016a36600461073e565b6104a2565b600061017b83836105ab565b610186576000610193565b6004546001600160a01b03165b9392505050565b600080546001600160a01b0316331415806101b757506001548414155b156101d557604051639667ffdf60e01b815260040160405180910390fd5b6004546001600160a01b0316156101ff5760405163d5a8211560e01b815260040160405180910390fd5b60028054336001600160a01b0319918216179091556003859055600480549091166001600160a01b0387161790556005805460018101909155600003600019016102495760016005555b6040516001600160a01b03861690859033907f7b19af5fe09a0be4ed70b569401ce6fa0de072757b228cc2088350eccc2f987390600090a450630a85bd0160e11b95945050505050565b600061029f858561016f565b9050336001600160a01b038216148015906102c257506102c0858533610397565b155b156102e05760405163ea8e4eb560e01b815260040160405180910390fd5b604051630af28bd360e01b81526001600160a01b03861690630af28bd390610310908790879087906004016107f7565b600060405180830381600087803b15801561032a57600080fd5b505af115801561033e573d6000803e3d6000fd5b50505050336001600160a01b031684866001600160a01b03167fa455a129bb4260e5274d34dd213bcd11399667f80a0615e6cb375728d2e75a90868660405161038892919061081a565b60405180910390a45050505050565b60006103a384846105ab565b80156103c857506005546001600160a01b038316600090815260066020526040902054145b949350505050565b6103da848461016f565b6001600160a01b0316336001600160a01b03161461040b576040516330cd747160e01b815260040160405180910390fd5b8015610432576005546001600160a01b03831660009081526006602052604090205561044c565b6001600160a01b0382166000908152600660205260408120555b816001600160a01b031683856001600160a01b03167fea7d7802a5cc5520abde4345007961a980fcb27dca3030ca6aede6bdc58bd79e84604051610494911515815260200190565b60405180910390a450505050565b60006104ae848461016f565b9050336001600160a01b038216146104d9576040516330cd747160e01b815260040160405180910390fd5b600280546001600160a01b03199081169091556000600355600480549091168155604051632142170760e11b815230918101919091526001600160a01b038381166024830152604482018590528516906342842e0e90606401600060405180830381600087803b15801561054c57600080fd5b505af1158015610560573d6000803e3d6000fd5b50505050816001600160a01b031683856001600160a01b03167fa433e9204e6763dff9274d8c1febdbc7c60aa7d7e85c106d5b978372658438b860405160405180910390a450505050565b6004546000906001600160a01b0316158015906105d557506002546001600160a01b038481169116145b801561019357505060035414919050565b80356001600160a01b03811681146105fd57600080fd5b919050565b6000806040838503121561061557600080fd5b61061e836105e6565b946020939093013593505050565b60008083601f84011261063e57600080fd5b50813567ffffffffffffffff81111561065657600080fd5b60208301915083602082850101111561066e57600080fd5b9250929050565b60008060008060006080868803121561068d57600080fd5b610696866105e6565b94506106a4602087016105e6565b935060408601359250606086013567ffffffffffffffff8111156106c757600080fd5b6106d38882890161062c565b969995985093965092949392505050565b600080600080606085870312156106fa57600080fd5b610703856105e6565b935060208501359250604085013567ffffffffffffffff81111561072657600080fd5b6107328782880161062c565b95989497509550505050565b60008060006060848603121561075357600080fd5b61075c846105e6565b925060208401359150610771604085016105e6565b90509250925092565b6000806000806080858703121561079057600080fd5b610799856105e6565b9350602085013592506107ae604086016105e6565b9150606085013580151581146107c357600080fd5b939692955090935050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b8381526040602082015260006108116040830184866107ce565b95945050505050565b6020815260006103c86020830184866107ce56fea2646970667358221220dd5405c74ca871baa3fc981f170a85015cbe31e79a0e1034acc7154f51ae011664736f6c63430008180033'
-
-export const OPERATOR_VAULT_RUNTIME_BYTECODE_HASH: Hex = keccak256(OPERATOR_VAULT_RUNTIME_BYTECODE)

package/src/identity/registry/operatorVault.ts

@@ -1,44 +0,0 @@
-export {
-  OPERATOR_VAULT_ABI,
-  OPERATOR_VAULT_ADDRESSES,
-  OPERATOR_VAULT_DEPLOY_BYTECODE,
-  OPERATOR_VAULT_RUNTIME_BYTECODE,
-  OPERATOR_VAULT_RUNTIME_BYTECODE_HASH,
-  operatorVaultAddressForChain,
-  resolveConfiguredOperatorVaultAddress,
-} from './operatorVault/constants.js'
-export {
-  OperatorVaultBytecodeMismatchError,
-  assertVaultBytecode,
-  formatOperatorVaultBytecodeMismatchDetail,
-} from './operatorVault/bytecode.js'
-export type { AssertVaultBytecodeClient } from './operatorVault/bytecode.js'
-export {
-  encodeDepositAgent,
-  encodeRotateAgentURI,
-  encodeSetMetadataOperator,
-  encodeUnwrapAgent,
-} from './operatorVault/transactions.js'
-export type {
-  DepositAgentArgs,
-  RotateAgentURIArgs,
-  SetMetadataOperatorArgs,
-  UnwrapAgentArgs,
-} from './operatorVault/transactions.js'
-export {
-  confirmAgentWithdrawnFromVault,
-  confirmAgentInVault,
-  discoverPriorVaultFromTokenOwner,
-  discoverVaultedTokens,
-  isAgentInVault,
-  readMetadataOperators,
-} from './operatorVault/read.js'
-export type {
-  ConfirmAgentWithdrawnArgs,
-  DiscoverPriorVaultArgs,
-  DiscoverPriorVaultClient,
-  DiscoverVaultedTokensArgs,
-  IsAgentInVaultArgs,
-  OperatorVaultReadClient,
-  ReadMetadataOperatorsArgs,
-} from './operatorVault/read.js'