added rollupEventInbox and challengeManager addresses to event

OffchainLabs · Jul 1, 2023 · 668b11a · 668b11a
1 parent 7d30d19
commit 668b11a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/scripts/rollupCreation.ts b/scripts/rollupCreation.ts
@@ -3,7 +3,6 @@ import '@nomiclabs/hardhat-ethers'
 import { run } from 'hardhat'
 import { abi as rollupCreatorAbi } from '../build/contracts/src/rollup/RollupCreator.sol/RollupCreator.json'
 import { rollupConfig } from './config'
-import { abi as rollupCoreAbi } from '../build/contracts/src/rollup/RollupCore.sol/RollupCore.json'
 
 interface RollupCreatedEvent {
   event: string
@@ -12,6 +11,8 @@ interface RollupCreatedEvent {
     rollupAddress: string
     inboxAddress: string
     outbox: string
+    rollupEventInbox: string
+    challengeManager: string
     adminProxy: string
     sequencerInbox: string
     bridge: string
@@ -61,19 +62,15 @@ async function main() {
       const rollupAddress = rollupCreatedEvent.args?.rollupAddress
       const inboxAddress = rollupCreatedEvent.args?.inboxAddress
       const outbox = rollupCreatedEvent.args?.outbox
+      const rollupEventInbox = rollupCreatedEvent.args?.rollupEventInbox
+      const challengeManager = rollupCreatedEvent.args?.challengeManager
       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,
-        rollupCoreAbi,
-        signer
-      )
-
       console.log("Congratulations! 🎉🎉🎉 All DONE! Here's your addresses:")
       console.log('RollupProxy Contract created at address:', rollupAddress)
       console.log(
@@ -96,6 +93,8 @@ async function main() {
       }
       console.log('Inbox (proxy) Contract created at address:', inboxAddress)
       console.log('Outbox (proxy) Contract created at address:', outbox)
+      console.log('rollupEventInbox (proxy) Contract created at address:', rollupEventInbox)
+      console.log('challengeManager (proxy) Contract created at address:', challengeManager)
       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)

diff --git a/src/rollup/RollupCreator.sol b/src/rollup/RollupCreator.sol
@@ -17,6 +17,8 @@ contract RollupCreator is Ownable {
         address indexed rollupAddress,
         address inboxAddress,
         address outbox,
+        address rollupEventInbox,
+        address challengeManager,
         address adminProxy,
         address sequencerInbox,
         address bridge,
@@ -116,6 +118,8 @@ contract RollupCreator is Ownable {
             address(rollup),
             address(inbox),
             address(outbox),
+            address(rollupEventInbox),
+            address(challengeManager),
             address(proxyAdmin),
             address(sequencerInbox),
             address(bridge),

diff --git a/test/contract/arbRollup.spec.ts b/test/contract/arbRollup.spec.ts
@@ -18,7 +18,7 @@
 import { ethers, run, network } from 'hardhat'
 import { Signer } from '@ethersproject/abstract-signer'
 import { BigNumberish, BigNumber } from '@ethersproject/bignumber'
-import { BytesLike, hexConcat, zeroPad } from '@ethersproject/bytes'
+import { BytesLike } from '@ethersproject/bytes'
 import { ContractTransaction } from '@ethersproject/contracts'
 import { assert, expect } from 'chai'
 import {