fix(registry): align AgentRegistry with IAgentIdentityRegistry + close #37 #38
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /** | ||
| * deploy-agent-registry.ts — Deploy AgentRegistry (M8.1) | ||
| * | ||
| * Deploys the AgentRegistry contract that maps agent execution wallets to their | ||
| * human AirAccount owners. Used by AirAccount.setAgentWallet() and SuperPaymaster | ||
| * for sponsorship eligibility checks. | ||
| * | ||
| * Usage: | ||
| * pnpm tsx scripts/deploy-agent-registry.ts | ||
| * | ||
| * Prerequisites: | ||
| * - .env.sepolia with PRIVATE_KEY and SEPOLIA_RPC_URL | ||
| * - Run `forge build` first to generate out/AgentRegistry.sol/AgentRegistry.json | ||
| */ | ||
|
|
||
| import { config } from "dotenv"; | ||
| import { resolve } from "path"; | ||
| import { readFileSync } from "fs"; | ||
| import { | ||
| createPublicClient, | ||
| createWalletClient, | ||
| http, | ||
| encodeDeployData, | ||
| formatEther, | ||
| type Address, | ||
| type Hex, | ||
| } from "viem"; | ||
| import { privateKeyToAccount } from "viem/accounts"; | ||
| import { sepolia } from "viem/chains"; | ||
|
|
||
| config({ path: resolve(import.meta.dirname, "../.env.sepolia") }); | ||
|
|
||
| const PRIVATE_KEY = process.env.PRIVATE_KEY as Hex; | ||
|
|
||
| const RPC_URLS = [ | ||
| process.env.SEPOLIA_RPC_URL, | ||
| process.env.SEPOLIA_RPC_URL2, | ||
| process.env.SEPOLIA_RPC_URL3, | ||
| ].filter(Boolean) as string[]; | ||
|
|
||
| function loadArtifact(name: string) { | ||
| const artifact = JSON.parse( | ||
| readFileSync(resolve(import.meta.dirname, `../out/${name}.sol/${name}.json`), "utf-8") | ||
| ); | ||
| return { abi: artifact.abi as unknown[], bytecode: artifact.bytecode.object as Hex }; | ||
| } | ||
|
|
||
| async function waitTx( | ||
| pub: ReturnType<typeof createPublicClient>, | ||
| hash: Hex, | ||
| label: string | ||
| ) { | ||
| console.log(` TX(${label}): https://sepolia.etherscan.io/tx/${hash}`); | ||
| const receipt = await pub.waitForTransactionReceipt({ hash, timeout: 300_000 }); | ||
| if (receipt.status !== "success") throw new Error(`${label} reverted`); | ||
| console.log(` Gas used: ${receipt.gasUsed} Block: ${receipt.blockNumber}`); | ||
| return receipt; | ||
| } | ||
|
|
||
| async function tryDeploy(rpcUrl: string, owner: ReturnType<typeof privateKeyToAccount>) { | ||
| const transport = http(rpcUrl, { timeout: 300_000 }); | ||
| const pub = createPublicClient({ chain: sepolia, transport }); | ||
| const wal = createWalletClient({ account: owner, chain: sepolia, transport }); | ||
|
|
||
| const art = loadArtifact("AgentRegistry"); | ||
| const hash = await wal.sendTransaction({ | ||
| data: encodeDeployData({ abi: art.abi, bytecode: art.bytecode, args: [] }), | ||
| gas: 800_000n, | ||
| }); | ||
| const receipt = await waitTx(pub, hash, "AgentRegistry"); | ||
| return receipt.contractAddress as Address; | ||
| } | ||
|
|
||
| async function main() { | ||
| if (!PRIVATE_KEY) { | ||
| console.error("Missing PRIVATE_KEY in .env.sepolia"); | ||
| process.exit(1); | ||
| } | ||
| if (RPC_URLS.length === 0) { | ||
| console.error("Missing SEPOLIA_RPC_URL in .env.sepolia"); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| const owner = privateKeyToAccount(PRIVATE_KEY); | ||
|
|
||
| console.log("=== Deploy AgentRegistry (M8.1) ==="); | ||
| console.log(`Deployer: ${owner.address}`); | ||
|
|
||
| // Check balance on first RPC | ||
| const pub0 = createPublicClient({ chain: sepolia, transport: http(RPC_URLS[0]) }); | ||
| const bal = await pub0.getBalance({ address: owner.address }); | ||
| console.log(`Balance: ${formatEther(bal)} ETH\n`); | ||
|
|
||
| let agentRegistryAddr: Address | undefined; | ||
|
|
||
| for (const rpcUrl of RPC_URLS) { | ||
| try { | ||
| console.log(`Trying RPC: ${rpcUrl.slice(0, 60)}...`); | ||
| agentRegistryAddr = await tryDeploy(rpcUrl, owner); | ||
| break; | ||
| } catch (err: any) { | ||
| console.warn(` Failed: ${err.message?.slice(0, 100)}`); | ||
| } | ||
| } | ||
|
|
||
| if (!agentRegistryAddr) { | ||
| console.error("All RPCs failed."); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| console.log(`\n✓ AgentRegistry deployed at: ${agentRegistryAddr}`); | ||
| console.log(` Verify: https://sepolia.etherscan.io/address/${agentRegistryAddr}`); | ||
| console.log(`\nNext step: pass this address as agentRegistry to setAgentWallet()`); | ||
| } | ||
|
|
||
| main().catch((err) => { | ||
| console.error(err); | ||
| process.exit(1); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| // SPDX-License-Identifier: GPL-3.0 | ||
| pragma solidity ^0.8.33; | ||
|
|
||
| /// @title AgentRegistry — maps agent execution wallets to their human AirAccount owners | ||
| /// @notice Any AirAccount owner can register their agent's wallet address. | ||
| /// Provides the reverse lookup needed by SuperPaymaster to verify sponsorship eligibility. | ||
| contract AgentRegistry { | ||
| /// @dev agentWallet → humanOwner | ||
| mapping(address => address) public agentWalletOwner; | ||
| /// @dev humanOwner → agentWallet[] (for enumeration) | ||
| mapping(address => address[]) public ownerAgents; | ||
|
|
||
| event AgentRegistered(address indexed humanOwner, address indexed agentWallet); | ||
| event AgentDeregistered(address indexed humanOwner, address indexed agentWallet); | ||
|
|
||
| error NotAgentOwner(); | ||
| error AgentAlreadyRegistered(); | ||
| error InvalidAddress(); | ||
|
|
||
| /// @notice Register msg.sender as the owner of agentWallet. | ||
| /// Called by AirAccount.setAgentWallet() on behalf of the account owner. | ||
| function registerAgent(address agentWallet) external { | ||
| if (agentWallet == address(0)) revert InvalidAddress(); | ||
| if (agentWalletOwner[agentWallet] != address(0)) revert AgentAlreadyRegistered(); | ||
| agentWalletOwner[agentWallet] = msg.sender; | ||
| ownerAgents[msg.sender].push(agentWallet); | ||
| emit AgentRegistered(msg.sender, agentWallet); | ||
| } | ||
|
|
||
| /// @notice Deregister an agent wallet. Only the original registrant can deregister. | ||
| function deregisterAgent(address agentWallet) external { | ||
| if (agentWalletOwner[agentWallet] != msg.sender) revert NotAgentOwner(); | ||
| agentWalletOwner[agentWallet] = address(0); | ||
| // Remove from ownerAgents array (swap-and-pop) | ||
| address[] storage agents = ownerAgents[msg.sender]; | ||
| uint256 len = agents.length; | ||
| for (uint256 i = 0; i < len; i++) { | ||
| if (agents[i] == agentWallet) { | ||
| agents[i] = agents[len - 1]; | ||
| agents.pop(); | ||
| break; | ||
| } | ||
| } | ||
| emit AgentDeregistered(msg.sender, agentWallet); | ||
| } | ||
|
|
||
| /// @notice Returns true if agentWallet is registered (has any owner). | ||
| function isRegisteredAgent(address agentWallet) external view returns (bool) { | ||
| return agentWalletOwner[agentWallet] != address(0); | ||
| } | ||
|
|
||
| /// @notice Returns count of agent wallets registered by this owner. | ||
| /// Implements IAgentIdentityRegistry.balanceOf(address) — returns actual count. | ||
| function balanceOf(address humanOwner) external view returns (uint256) { | ||
| return ownerAgents[humanOwner].length; | ||
| } | ||
|
|
||
| /// @notice ERC-721-compatible stub required by IAgentIdentityRegistry. | ||
| /// Always returns address(0) — AgentRegistry does not use token IDs. | ||
| function ownerOf(uint256 /* agentId */) external pure returns (address) { | ||
| return address(0); | ||
| } | ||
|
|
||
| /// @notice Alias for deregisterAgent — matches IAgentIdentityRegistry.revokeAgent(address). | ||
| function revokeAgent(address agentWallet) external { | ||
| if (agentWalletOwner[agentWallet] != msg.sender) revert NotAgentOwner(); | ||
| agentWalletOwner[agentWallet] = address(0); | ||
| address[] storage agents = ownerAgents[msg.sender]; | ||
| uint256 len = agents.length; | ||
| for (uint256 i = 0; i < len; i++) { | ||
| if (agents[i] == agentWallet) { | ||
| agents[i] = agents[len - 1]; | ||
| agents.pop(); | ||
| break; | ||
| } | ||
| } | ||
| emit AgentDeregistered(msg.sender, agentWallet); | ||
| } | ||
|
|
||
| /// @notice Convenience lookup: returns the human AirAccount that registered agentWallet. | ||
| /// Returns address(0) if agentWallet is not registered. | ||
| function getHumanOwner(address agentWallet) external view returns (address) { | ||
| return agentWalletOwner[agentWallet]; | ||
| } | ||
|
|
||
| /// @notice Returns all agent wallets registered by a human owner. | ||
| function getAgents(address humanOwner) external view returns (address[] memory) { | ||
| return ownerAgents[humanOwner]; | ||
| } | ||
|
|
||
| /// @notice Returns agentWallets[index] for a given owner (for enumeration). | ||
| function getAgentByIndex(address owner, uint256 index) external view returns (address) { | ||
| return ownerAgents[owner][index]; | ||
| } | ||
|
|
||
| /// @notice Returns count of agent wallets registered by this owner. | ||
| function getAgentCount(address owner) external view returns (uint256) { | ||
| return ownerAgents[owner].length; | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The script claims multi-RPC resiliency, but it performs an unconditional
getBalanceagainstRPC_URLS[0]before entering the retry loop. If the first endpoint is down or rate-limited, deployment aborts before tryingSEPOLIA_RPC_URL2/3, so the fallback mechanism never runs in exactly the failure mode it is meant to handle.Useful? React with 👍 / 👎.