Skip to content

rename AA contract registrations on AM #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
InoMurko merged 1 commit into from
Feb 22, 2023
Merged

rename AA contract registrations on AM #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/boba/account-abstraction/deploy/1-deploy-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const deployFn: DeployFunction = async (hre) => {
}
await hre.deployments.save('BundlerHelper', BundlerHelperDeploymentSubmission)

await registerBobaAddress((hre as any).deployConfig.addressManager, 'Boba_BundlerHelper', BundlerHelperAddress )
await registerBobaAddress((hre as any).deployConfig.addressManager, 'L2_Boba_BundlerHelper', BundlerHelperAddress )
}

export default deployFn
Expand Down
2 changes: 1 addition & 1 deletion packages/boba/account-abstraction/deploy/2-deploy_entrypoint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const deployFn: DeployFunction = async (hre) => {
abi: EntryPointJson.abi
}
await hre.deployments.save('EntryPoint', EntryPointDeploymentSubmission)
await registerBobaAddress( (hre as any).deployConfig.addressManager, 'Boba_EntryPoint', EntryPointAddress )
await registerBobaAddress( (hre as any).deployConfig.addressManager, 'L2_Boba_EntryPoint', EntryPointAddress )
}

export default deployFn
Expand Down
4 changes: 2 additions & 2 deletions packages/boba/account-abstraction/deploy/3-deploy-deposit-paymaster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const deployFn: DeployFunction = async (hre) => {
console.log(`EntryPoint is located at: ${entryPoint.address}`)
const ethPriceOracle = await (hre as any).deployConfig.addressManager.getAddress('FeedRegistry')
console.log(`Eth Price Oracle is located at: ${ethPriceOracle}`)
const entryPointFromAM = await (hre as any).deployConfig.addressManager.getAddress('Boba_EntryPoint')
const entryPointFromAM = await (hre as any).deployConfig.addressManager.getAddress('L2_Boba_EntryPoint')
if (entryPoint.address.toLowerCase() === entryPointFromAM.toLowerCase()) {
const bobaDepositPaymasterConstructorArgs = ethers.utils.defaultAbiCoder.encode(
["address", "address"],
Expand All @@ -38,7 +38,7 @@ const deployFn: DeployFunction = async (hre) => {
}
await hre.deployments.save('BobaDepositPaymaster', BobaDepositPaymasterDeploymentSubmission)

await registerBobaAddress( (hre as any).deployConfig.addressManager, 'BobaDepositPaymaster', BobaDepositPaymasterAddress )
await registerBobaAddress( (hre as any).deployConfig.addressManager, 'L2_BobaDepositPaymaster', BobaDepositPaymasterAddress )
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/boba/account-abstraction/deploy/4-deploy-verifying-paymaster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const deployFn: DeployFunction = async (hre) => {
console.log(`BobaDepositPaymaster is located at: ${bobaDepositPaymaster.address}`)
const bobaToken = await (hre as any).deployConfig.addressManager.getAddress('TK_L2BOBA')
console.log(`Boba is located at: ${bobaToken}`)
const entryPointFromAM = await (hre as any).deployConfig.addressManager.getAddress('Boba_EntryPoint')
const entryPointFromAM = await (hre as any).deployConfig.addressManager.getAddress('L2_Boba_EntryPoint')
if (entryPoint.address.toLowerCase() === entryPointFromAM.toLowerCase()) {
const bobaVerifyingPaymasterConstructorArgs = ethers.utils.defaultAbiCoder.encode(
["address", "address","address", "address"],
Expand All @@ -43,7 +43,7 @@ const deployFn: DeployFunction = async (hre) => {
}
await hre.deployments.save('BobaVerifyingPaymaster', BobaVerifyingPaymasterDeploymentSubmission)

await registerBobaAddress( (hre as any).deployConfig.addressManager, 'BobaVerifyingPaymaster', BobaVerifyingPaymasterAddress )
await registerBobaAddress( (hre as any).deployConfig.addressManager, 'L2_BobaVerifyingPaymaster', BobaVerifyingPaymasterAddress )
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/boba/account-abstraction/deploy/5-dump-addresses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ const deployFn: DeployFunction = async (hre) => {
for (const key in deployments) {
if (deployments.hasOwnProperty(key)) {
if (key == 'EntryPoint' || key == 'BundlerHelper') {
contracts['BOBA_'+key] = deployments[key].address
contracts['L2_BOBA_'+key] = deployments[key].address
} else {
contracts[key] = deployments[key].address
contracts['L2_'+key] = deployments[key].address
}
}
}
Expand Down