Skip to content
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

updating rollup created event #34

Merged
merged 4 commits into from
Jul 4, 2023
Merged

updating rollup created event #34

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6beb27e
changing RollupCreated event
GreatSoshiant Jul 1, 2023
c91e7d7
formatting
GreatSoshiant Jul 1, 2023
7d30d19
Merge branch 'develop' into develop
GreatSoshiant Jul 1, 2023
668b11a
added rollupEventInbox and challengeManager addresses to event
GreatSoshiant Jul 1, 2023
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
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"postinstall": "patch-package",
"deploy-factory": "hardhat run scripts/deployment.ts",
"deploy-rollup": "hardhat run scripts/rollupCreation.ts"

},
"dependencies": {
"@openzeppelin/contracts": "4.5.0",
Expand Down
19 changes: 10 additions & 9 deletions scripts/rollupCreation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ interface RollupCreatedEvent {
args?: {
rollupAddress: string
inboxAddress: string
outbox: string
adminProxy: string
sequencerInbox: string
bridge: string
validatorUtils: string
validatorWalletCreator: string
}
}

Expand Down Expand Up @@ -57,9 +60,13 @@ async function main() {
if (rollupCreatedEvent) {
const rollupAddress = rollupCreatedEvent.args?.rollupAddress
const inboxAddress = rollupCreatedEvent.args?.inboxAddress
const outbox = rollupCreatedEvent.args?.outbox
const adminProxy = rollupCreatedEvent.args?.adminProxy
const sequencerInbox = rollupCreatedEvent.args?.sequencerInbox
const bridge = rollupCreatedEvent.args?.bridge
const validatorUtils = rollupCreatedEvent.args?.validatorUtils
const validatorWalletCreator =
rollupCreatedEvent.args?.validatorWalletCreator

const rollupCore = new ethers.Contract(
rollupAddress,
Expand Down Expand Up @@ -88,20 +95,14 @@ async function main() {
}
}
console.log('Inbox (proxy) Contract created at address:', inboxAddress)
console.log(
'Outbox (proxy) Contract created at address:',
await rollupCore.outbox()
)
console.log('Outbox (proxy) Contract created at address:', outbox)
console.log('AdminProxy Contract created at address:', adminProxy)
console.log('SequencerInbox (proxy) created at address:', sequencerInbox)
console.log('Bridge (proxy) Contract created at address:', bridge)
console.log(
'ValidatorUtils Contract created at address:',
await rollupCore.validatorUtils()
)
console.log('ValidatorUtils Contract created at address:', validatorUtils)
console.log(
'ValidatorWalletCreator Contract created at address:',
await rollupCore.validatorWalletCreator()
validatorWalletCreator
)

const blockNumber = createRollupReceipt.blockNumber
Expand Down
10 changes: 8 additions & 2 deletions src/rollup/RollupCreator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ contract RollupCreator is Ownable {
event RollupCreated(
address indexed rollupAddress,
address inboxAddress,
address outbox,
address adminProxy,
address sequencerInbox,
address bridge
address bridge,
address validatorUtils,
address validatorWalletCreator
);
event TemplatesUpdated();

Expand Down Expand Up @@ -112,9 +115,12 @@ contract RollupCreator is Ownable {
emit RollupCreated(
GreatSoshiant marked this conversation as resolved.
Show resolved Hide resolved
address(rollup),
address(inbox),
address(outbox),
address(proxyAdmin),
address(sequencerInbox),
address(bridge)
address(bridge),
address(validatorUtils),
address(validatorWalletCreator)
);
return address(rollup);
}
Expand Down
2 changes: 1 addition & 1 deletion test/contract/arbRollup.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ const setup = async () => {
rollupUserLogicTemplate,
blockChallengeFactory: challengeManagerTemplateFac,
rollupEventBridge: await rollupAdmin.rollupEventInbox(),
outbox: await rollupAdmin.outbox(),
outbox: rollupCreatedEvent.outbox,
sequencerInbox: rollupCreatedEvent.sequencerInbox,
delayedBridge: rollupCreatedEvent.bridge,
delayedInbox: rollupCreatedEvent.inboxAddress,
Expand Down