@@ -103,7 +103,10 @@ func InflateChainConfig(opd *deployer.OpDeployer, st deployer.OpaqueState, state
103103 return nil , fmt .Errorf ("failed to read roles from state: %w" , err )
104104 }
105105
106- cfg .Roles = roles
106+ // For TOML generation only include ProxyAdminOwner
107+ cfg .Roles = config.Roles {
108+ ProxyAdminOwner : roles .ProxyAdminOwner ,
109+ }
107110
108111 addresses , err := GetContractAddressesFromState (st , idx )
109112 if err != nil {
@@ -305,36 +308,12 @@ func GetContractAddressesFromState(st deployer.OpaqueState, idx int) (config.Add
305308 var addresses config.Addresses
306309 var err error
307310
308- addressManager , err := st .ReadAddressManagerImpl (idx )
309- if err != nil {
310- return addresses , fmt .Errorf ("failed to read AddressManager: %w" , err )
311- }
312- addresses .AddressManager = config .NewChecksummedAddress (addressManager )
313-
314- l1CrossDomainMessengerProxy , err := st .ReadL1CrossDomainMessengerProxy (idx )
315- if err != nil {
316- return addresses , fmt .Errorf ("failed to read L1CrossDomainMessengerProxy: %w" , err )
317- }
318- addresses .L1CrossDomainMessengerProxy = config .NewChecksummedAddress (l1CrossDomainMessengerProxy )
319-
320- l1ERC721BridgeProxy , err := st .ReadL1Erc721BridgeProxy (idx )
321- if err != nil {
322- return addresses , fmt .Errorf ("failed to read L1ERC721BridgeProxy: %w" , err )
323- }
324- addresses .L1ERC721BridgeProxy = config .NewChecksummedAddress (l1ERC721BridgeProxy )
325-
326311 l1StandardBridgeProxy , err := st .ReadL1StandardBridgeProxy (idx )
327312 if err != nil {
328313 return addresses , fmt .Errorf ("failed to read L1StandardBridgeProxy: %w" , err )
329314 }
330315 addresses .L1StandardBridgeProxy = config .NewChecksummedAddress (l1StandardBridgeProxy )
331316
332- optimismMintableERC20FactoryProxy , err := st .ReadOptimismMintableErc20FactoryProxy (idx )
333- if err != nil {
334- return addresses , fmt .Errorf ("failed to read OptimismMintableERC20FactoryProxy: %w" , err )
335- }
336- addresses .OptimismMintableERC20FactoryProxy = config .NewChecksummedAddress (optimismMintableERC20FactoryProxy )
337-
338317 optimismPortalProxy , err := st .ReadOptimismPortalProxy (idx )
339318 if err != nil {
340319 return addresses , fmt .Errorf ("failed to read OptimismPortalProxy: %w" , err )
@@ -347,42 +326,12 @@ func GetContractAddressesFromState(st deployer.OpaqueState, idx int) (config.Add
347326 }
348327 addresses .SystemConfigProxy = config .NewChecksummedAddress (systemConfigProxy )
349328
350- proxyAdmin , err := st .ReadProxyAdminImpl (idx )
351- if err != nil {
352- return addresses , fmt .Errorf ("failed to read ProxyAdmin: %w" , err )
353- }
354- addresses .ProxyAdmin = config .NewChecksummedAddress (proxyAdmin )
355-
356- superchainConfigProxy , err := st .ReadSuperchainConfigProxy ()
357- if err != nil {
358- return addresses , fmt .Errorf ("failed to read SuperchainConfig: %w" , err )
359- }
360- addresses .SuperchainConfig = config .NewChecksummedAddress (superchainConfigProxy )
361-
362- anchorStateRegistryProxy , err := st .ReadAnchorStateRegistryProxy (idx )
363- if err != nil {
364- return addresses , fmt .Errorf ("failed to read AnchorStateRegistryProxy: %w" , err )
365- }
366- addresses .AnchorStateRegistryProxy = config .NewChecksummedAddress (anchorStateRegistryProxy )
367-
368- delayedWETHProxy , err := st .ReadDelayedWethPermissionedGameProxy (idx )
369- if err != nil {
370- return addresses , fmt .Errorf ("failed to read DelayedWETHProxy: %w" , err )
371- }
372- addresses .DelayedWETHProxy = config .NewChecksummedAddress (delayedWETHProxy )
373-
374329 disputeGameFactoryProxy , err := st .ReadDisputeGameFactoryProxy (idx )
375330 if err != nil {
376331 return addresses , fmt .Errorf ("failed to read DisputeGameFactoryProxy: %w" , err )
377332 }
378333 addresses .DisputeGameFactoryProxy = config .NewChecksummedAddress (disputeGameFactoryProxy )
379334
380- permissionedDisputeGame , err := st .ReadPermissionedDisputeGameImpl (idx )
381- if err != nil {
382- return addresses , fmt .Errorf ("failed to read PermissionedDisputeGame: %w" , err )
383- }
384- addresses .PermissionedDisputeGame = config .NewChecksummedAddress (permissionedDisputeGame )
385-
386335 return addresses , nil
387336}
388337
0 commit comments