Merge pull request #34 from GreatSoshiant/develop

updating rollup created event
OffchainLabs · Jul 4, 2023 · baae0e9 · baae0e9
2 parents 56dc9a9 + 668b11a
commit baae0e9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -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",

diff --git a/scripts/rollupCreation.ts b/scripts/rollupCreation.ts
@@ -3,17 +3,21 @@ 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
   address: string
   args?: {
     rollupAddress: string
     inboxAddress: string
+    outbox: string
+    rollupEventInbox: string
+    challengeManager: string
     adminProxy: string
     sequencerInbox: string
     bridge: string
+    validatorUtils: string
+    validatorWalletCreator: string
   }
 }
 
@@ -57,15 +61,15 @@ async function main() {
     if (rollupCreatedEvent) {
       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 rollupCore = new ethers.Contract(
-        rollupAddress,
-        rollupCoreAbi,
-        signer
-      )
+      const validatorUtils = rollupCreatedEvent.args?.validatorUtils
+      const validatorWalletCreator =
+        rollupCreatedEvent.args?.validatorWalletCreator
 
       console.log("Congratulations! 🎉🎉🎉 All DONE! Here's your addresses:")
       console.log('RollupProxy Contract created at address:', rollupAddress)
@@ -88,20 +92,16 @@ 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('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)
-      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

diff --git a/src/rollup/RollupCreator.sol b/src/rollup/RollupCreator.sol
@@ -16,9 +16,14 @@ contract RollupCreator is Ownable {
     event RollupCreated(
         address indexed rollupAddress,
         address inboxAddress,
+        address outbox,
+        address rollupEventInbox,
+        address challengeManager,
         address adminProxy,
         address sequencerInbox,
-        address bridge
+        address bridge,
+        address validatorUtils,
+        address validatorWalletCreator
     );
     event TemplatesUpdated();
 
@@ -112,9 +117,14 @@ contract RollupCreator is Ownable {
         emit RollupCreated(
             address(rollup),
             address(inbox),
+            address(outbox),
+            address(rollupEventInbox),
+            address(challengeManager),
             address(proxyAdmin),
             address(sequencerInbox),
-            address(bridge)
+            address(bridge),
+            address(validatorUtils),
+            address(validatorWalletCreator)
         );
         return address(rollup);
     }

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 {
@@ -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,