fix

SYS-Labs · Feb 26, 2024 · e63f9ae · e63f9ae
1 parent 47965c1
commit e63f9ae
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 1,244 deletions.
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
@@ -420,7 +420,7 @@ func (l *BatchSubmitter) sendTransaction(ctx context.Context, txdata txData, que
 	} else {
 		candidate = l.calldataTxCandidate(data)
 	}
-	candidate.GasLimit = 18446744073709551615 // SYSCOIN let L1 estimate gas due to precompile
+	candidate.GasLimit = 800000 // SYSCOIN let L1 estimate gas due to precompile
 
 	queue.Send(txdata, *candidate, receiptsCh)
 	return nil

diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go
@@ -474,6 +474,7 @@ func (d *DeployConfig) SetDeployments(deployments *L1Deployments) {
 	d.L1ERC721BridgeProxy = deployments.L1ERC721BridgeProxy
 	d.SystemConfigProxy = deployments.SystemConfigProxy
 	d.OptimismPortalProxy = deployments.OptimismPortalProxy
+	d.L2OutputOracleProxy = deployments.L2OutputOracleProxy
 }
 
 func (d *DeployConfig) GovernanceEnabled() bool {

diff --git a/packages/contracts-bedrock/deploy-config/rollux-tanenbaum.json b/packages/contracts-bedrock/deploy-config/rollux-tanenbaum.json
@@ -1,5 +1,5 @@
 {
-  "l1StartingBlockTag": "0xa3c0e1807cbb0ea86383ee01a6769121bfad3b6d745460b5141269d9b3661ea9",
+  "l1StartingBlockTag": "0x701ad5e21beeecef588e24f48165c2756ee0cb74ae683f45606039424d9e0348",
 
   "l1ChainID": 5700,
   "l2ChainID": 570570,
@@ -10,25 +10,25 @@
   "sequencerWindowSize": 3600,
   "channelTimeout": 300,
 
-  "p2pSequencerAddress": "0xD9b7F1467EDb7247f026D2A719bad1A59EDdBFB0",
+  "p2pSequencerAddress": "0x1222BD4b93Fb278620E9F307a1abD08deE07123E",
   "batchInboxAddress": "0xff00000000000000000000000000000000042069",
-  "batchSenderAddress": "0xdC5D6b20cf58A15Ea8460B39912142dC0e3F6964",
+  "batchSenderAddress": "0x59e96157eA243cae52Aa433166B50e9fACa4B5Bb",
 
   "l2OutputOracleSubmissionInterval": 120,
   "l2OutputOracleStartingBlockNumber": 0,
-  "l2OutputOracleStartingTimestamp": 1707744603,
+  "l2OutputOracleStartingTimestamp": 1708962803,
 
-  "l2OutputOracleProposer": "0x3D6E6DC3DC468679492FA869aD76D6B0F6D4fDC9",
-  "l2OutputOracleChallenger": "0x7dB1bbb08C4Fd561f00a1d981d8F3E995C0F3df3",
+  "l2OutputOracleProposer": "0x8825b93825Fb1B8a82C1D6D70Fd1AdceeCcE9DFE",
+  "l2OutputOracleChallenger": "0x16629e37B157aEfBD601F1436B1D34e88c0b9A92",
 
   "finalizationPeriodSeconds": 12,
 
-  "proxyAdminOwner": "0x7dB1bbb08C4Fd561f00a1d981d8F3E995C0F3df3",
-  "baseFeeVaultRecipient": "0x7dB1bbb08C4Fd561f00a1d981d8F3E995C0F3df3",
-  "l1FeeVaultRecipient": "0x7dB1bbb08C4Fd561f00a1d981d8F3E995C0F3df3",
-  "sequencerFeeVaultRecipient": "0x7dB1bbb08C4Fd561f00a1d981d8F3E995C0F3df3",
-  "finalSystemOwner": "0x7dB1bbb08C4Fd561f00a1d981d8F3E995C0F3df3",
-  "superchainConfigGuardian": "0x7dB1bbb08C4Fd561f00a1d981d8F3E995C0F3df3",
+  "proxyAdminOwner": "0x16629e37B157aEfBD601F1436B1D34e88c0b9A92",
+  "baseFeeVaultRecipient": "0x16629e37B157aEfBD601F1436B1D34e88c0b9A92",
+  "l1FeeVaultRecipient": "0x16629e37B157aEfBD601F1436B1D34e88c0b9A92",
+  "sequencerFeeVaultRecipient": "0x16629e37B157aEfBD601F1436B1D34e88c0b9A92",
+  "finalSystemOwner": "0x16629e37B157aEfBD601F1436B1D34e88c0b9A92",
+  "superchainConfigGuardian": "0x16629e37B157aEfBD601F1436B1D34e88c0b9A92",
 
   "baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
   "l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
@@ -41,9 +41,14 @@
   "gasPriceOracleScalar": 1000000,
 
   "enableGovernance": true,
+  "fundDevAccounts": true,
+  "useFaultProofs": false,
+  "proofMaturityDelaySeconds": 0,
+  "disputeGameFinalityDelaySeconds": 0,
   "governanceTokenSymbol": "NEB",
   "governanceTokenName": "Nebula",
-  "governanceTokenOwner": "0x7dB1bbb08C4Fd561f00a1d981d8F3E995C0F3df3",
+  "respectedGameType": 2,
+  "governanceTokenOwner": "0x16629e37B157aEfBD601F1436B1D34e88c0b9A92",
 
   "l2GenesisBlockGasLimit": "0x1c9c380",
   "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
@@ -68,8 +73,6 @@
   "faultGameGenesisOutputRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "faultGameSplitDepth": 14,
 
-
-  "fundDevAccounts": true,
   "preimageOracleMinProposalSize": 1800000,
   "preimageOracleChallengePeriod": 86400,
   "preimageOracleCancunActivationTimestamp": 0

diff --git a/packages/contracts-bedrock/scripts/Deploy.s.sol b/packages/contracts-bedrock/scripts/Deploy.s.sol
@@ -129,34 +129,34 @@ contract Deploy is Deployer {
     /// @notice Returns the proxy addresses. If a proxy is not found, it will have address(0).
     function _proxies() internal view returns (Types.ContractSet memory proxies_) {
         proxies_ = Types.ContractSet({
-            L1CrossDomainMessenger: mustGetAddress("L1CrossDomainMessengerProxy"),
-            L1StandardBridge: mustGetAddress("L1StandardBridgeProxy"),
-            L2OutputOracle: mustGetAddress("L2OutputOracleProxy"),
-            DisputeGameFactory: mustGetAddress("DisputeGameFactoryProxy"),
-            OptimismMintableERC20Factory: mustGetAddress("OptimismMintableERC20FactoryProxy"),
-            OptimismPortal: mustGetAddress("OptimismPortalProxy"),
-            OptimismPortal2: mustGetAddress("OptimismPortalProxy"),
-            SystemConfig: mustGetAddress("SystemConfigProxy"),
-            L1ERC721Bridge: mustGetAddress("L1ERC721BridgeProxy"),
-            ProtocolVersions: mustGetAddress("ProtocolVersionsProxy"),
-            SuperchainConfig: mustGetAddress("SuperchainConfigProxy")
+        L1CrossDomainMessenger: mustGetAddress("L1CrossDomainMessengerProxy"),
+        L1StandardBridge: mustGetAddress("L1StandardBridgeProxy"),
+        L2OutputOracle: mustGetAddress("L2OutputOracleProxy"),
+        DisputeGameFactory: mustGetAddress("DisputeGameFactoryProxy"),
+        OptimismMintableERC20Factory: mustGetAddress("OptimismMintableERC20FactoryProxy"),
+        OptimismPortal: mustGetAddress("OptimismPortalProxy"),
+        OptimismPortal2: mustGetAddress("OptimismPortalProxy"),
+        SystemConfig: mustGetAddress("SystemConfigProxy"),
+        L1ERC721Bridge: mustGetAddress("L1ERC721BridgeProxy"),
+        ProtocolVersions: mustGetAddress("ProtocolVersionsProxy"),
+        SuperchainConfig: mustGetAddress("SuperchainConfigProxy")
         });
     }
 
     /// @notice Returns the proxy addresses, not reverting if any are unset.
     function _proxiesUnstrict() internal view returns (Types.ContractSet memory proxies_) {
         proxies_ = Types.ContractSet({
-            L1CrossDomainMessenger: getAddress("L1CrossDomainMessengerProxy"),
-            L1StandardBridge: getAddress("L1StandardBridgeProxy"),
-            L2OutputOracle: getAddress("L2OutputOracleProxy"),
-            DisputeGameFactory: getAddress("DisputeGameFactoryProxy"),
-            OptimismMintableERC20Factory: getAddress("OptimismMintableERC20FactoryProxy"),
-            OptimismPortal: getAddress("OptimismPortalProxy"),
-            OptimismPortal2: getAddress("OptimismPortalProxy"),
-            SystemConfig: getAddress("SystemConfigProxy"),
-            L1ERC721Bridge: getAddress("L1ERC721BridgeProxy"),
-            ProtocolVersions: getAddress("ProtocolVersionsProxy"),
-            SuperchainConfig: getAddress("SuperchainConfigProxy")
+        L1CrossDomainMessenger: getAddress("L1CrossDomainMessengerProxy"),
+        L1StandardBridge: getAddress("L1StandardBridgeProxy"),
+        L2OutputOracle: getAddress("L2OutputOracleProxy"),
+        DisputeGameFactory: getAddress("DisputeGameFactoryProxy"),
+        OptimismMintableERC20Factory: getAddress("OptimismMintableERC20FactoryProxy"),
+        OptimismPortal: getAddress("OptimismPortalProxy"),
+        OptimismPortal2: getAddress("OptimismPortalProxy"),
+        SystemConfig: getAddress("SystemConfigProxy"),
+        L1ERC721Bridge: getAddress("L1ERC721BridgeProxy"),
+        ProtocolVersions: getAddress("ProtocolVersionsProxy"),
+        SuperchainConfig: getAddress("SuperchainConfigProxy")
 
         });
     }
@@ -286,7 +286,7 @@ contract Deploy is Deployer {
 
         // Deploy the BatchInbox contract
         // Replace <MESSENGER_ADDRESS> with the actual address
-        address payable messengerAddress = payable(address(0x0B908F7ceE98eBB59D16b37573A18bd875b160Bf));
+        address payable messengerAddress = payable(address(0x7e7F216cDe9c0b9AE823a0A712662A636A2D9068));
 
         BatchInbox batchInbox = new BatchInbox(messengerAddress);
 
@@ -588,9 +588,9 @@ contract Deploy is Deployer {
         );
 
         OptimismPortal2 portal = new OptimismPortal2{ salt: _implSalt() }({
-            _proofMaturityDelaySeconds: cfg.proofMaturityDelaySeconds(),
-            _disputeGameFinalityDelaySeconds: cfg.disputeGameFinalityDelaySeconds(),
-            _initialRespectedGameType: GameType.wrap(uint32(cfg.respectedGameType()))
+        _proofMaturityDelaySeconds: cfg.proofMaturityDelaySeconds(),
+        _disputeGameFinalityDelaySeconds: cfg.disputeGameFinalityDelaySeconds(),
+        _initialRespectedGameType: GameType.wrap(uint32(cfg.respectedGameType()))
         });
 
         save("OptimismPortal2", address(portal));
@@ -1068,16 +1068,16 @@ contract Deploy is Deployer {
         address superchainConfigProxy = mustGetAddress("SuperchainConfigProxy");
 
         _upgradeAndCallViaSafe({
-            _proxy: payable(optimismPortalProxy),
-            _implementation: optimismPortal2,
-            _innerCallData: abi.encodeCall(
+        _proxy: payable(optimismPortalProxy),
+        _implementation: optimismPortal2,
+        _innerCallData: abi.encodeCall(
                 OptimismPortal2.initialize,
                 (
-                    DisputeGameFactory(disputeGameFactoryProxy),
-                    SystemConfig(systemConfigProxy),
-                    SuperchainConfig(superchainConfigProxy)
-                )
+                DisputeGameFactory(disputeGameFactoryProxy),
+                SystemConfig(systemConfigProxy),
+                SuperchainConfig(superchainConfigProxy)
                 )
+            )
         });
 
         OptimismPortal2 portal = OptimismPortal2(payable(optimismPortalProxy));
@@ -1180,12 +1180,12 @@ contract Deploy is Deployer {
 
         // Set the Cannon FaultDisputeGame implementation in the factory.
         _setFaultGameImplementation({
-            _factory: factory,
-            _gameType: GameTypes.PERMISSIONED_CANNON,
-            _absolutePrestate: loadMipsAbsolutePrestate(),
-            _faultVm: IBigStepper(mustGetAddress("Mips")),
-            _maxGameDepth: cfg.faultGameMaxDepth(),
-            _allowUpgrade: _allowUpgrade
+        _factory: factory,
+        _gameType: GameTypes.PERMISSIONED_CANNON,
+        _absolutePrestate: loadMipsAbsolutePrestate(),
+        _faultVm: IBigStepper(mustGetAddress("Mips")),
+        _maxGameDepth: cfg.faultGameMaxDepth(),
+        _allowUpgrade: _allowUpgrade
         });
     }
 
@@ -1230,31 +1230,31 @@ contract Deploy is Deployer {
             _factory.setImplementation(
                 _gameType,
                 new FaultDisputeGame({
-                    _gameType: _gameType,
-                    _absolutePrestate: _absolutePrestate,
-                    _genesisBlockNumber: cfg.faultGameGenesisBlock(),
-                    _genesisOutputRoot: Hash.wrap(cfg.faultGameGenesisOutputRoot()),
-                    _maxGameDepth: _maxGameDepth,
-                    _splitDepth: cfg.faultGameSplitDepth(),
-                    _gameDuration: Duration.wrap(uint64(cfg.faultGameMaxDuration())),
-                    _vm: _faultVm
-                })
+            _gameType: _gameType,
+            _absolutePrestate: _absolutePrestate,
+            _genesisBlockNumber: cfg.faultGameGenesisBlock(),
+            _genesisOutputRoot: Hash.wrap(cfg.faultGameGenesisOutputRoot()),
+            _maxGameDepth: _maxGameDepth,
+            _splitDepth: cfg.faultGameSplitDepth(),
+            _gameDuration: Duration.wrap(uint64(cfg.faultGameMaxDuration())),
+            _vm: _faultVm
+            })
             );
         } else {
             _factory.setImplementation(
                 _gameType,
                 new PermissionedDisputeGame({
-                    _gameType: _gameType,
-                    _absolutePrestate: _absolutePrestate,
-                    _genesisBlockNumber: cfg.faultGameGenesisBlock(),
-                    _genesisOutputRoot: Hash.wrap(cfg.faultGameGenesisOutputRoot()),
-                    _maxGameDepth: _maxGameDepth,
-                    _splitDepth: cfg.faultGameSplitDepth(),
-                    _gameDuration: Duration.wrap(uint64(cfg.faultGameMaxDuration())),
-                    _vm: _faultVm,
-                    _proposer: cfg.l2OutputOracleProposer(),
-                    _challenger: cfg.l2OutputOracleChallenger()
-                })
+            _gameType: _gameType,
+            _absolutePrestate: _absolutePrestate,
+            _genesisBlockNumber: cfg.faultGameGenesisBlock(),
+            _genesisOutputRoot: Hash.wrap(cfg.faultGameGenesisOutputRoot()),
+            _maxGameDepth: _maxGameDepth,
+            _splitDepth: cfg.faultGameSplitDepth(),
+            _gameDuration: Duration.wrap(uint64(cfg.faultGameMaxDuration())),
+            _vm: _faultVm,
+            _proposer: cfg.l2OutputOracleProposer(),
+            _challenger: cfg.l2OutputOracleChallenger()
+            })
             );
         }