Centralization cleanup

.dockerignore

@@ -1,6 +1,9 @@
 prover/
 .git/
 contracts/node_modules/
+gas-oracle/app/target/
+node/build/
+ops/docker/.devnet/
 ops/reth-cross-test/
 ops/publicnode/
 docs/

Makefile

@@ -1,6 +1,6 @@
 ################## update dependencies ####################
-ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.2.4
-ETHEREUM_TARGET_VERSION := morph-v2.2.4
+ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.2.6
+ETHEREUM_TARGET_VERSION := morph-v2.2.6
 TENDERMINT_TARGET_VERSION := v0.3.9
 
 

bindings/Makefile

@@ -5,7 +5,7 @@ pkg := bindings
 all: version mkdir bindings more
 
 bindings: \
-	l1-staking-bindings \
+	submitter-bindings \
 	l1-cross-domain-messenger-bindings \
 	l1-standard-erc20-gateway-bindings \
 	l1-eth-gateway-bindings \
@@ -65,9 +65,9 @@ compile-forge:
 	./compile.sh forge
 
 ## L1
-# Staking
-l1-staking-bindings: compile
-	./gen_bindings.sh contracts/l1/staking/L1Staking.sol:L1Staking $(pkg)
+# Submitter
+submitter-bindings: compile
+	./gen_bindings.sh contracts/l1/rollup/Submitter.sol:Submitter $(pkg)
 
 # CrossDomainMessenger
 l1-cross-domain-messenger-bindings: compile
@@ -194,7 +194,7 @@ more: compile-forge
 	go run ./gen/main.go \
 		-artifacts ../contracts/artifacts \
 		-out ./bindings \
-		-contracts ProxyAdmin,TransparentUpgradeableProxy,L2TokenRegistry,L1MessageQueueWithGasPriceOracle,L1USDCGateway,L1Staking,L1CrossDomainMessenger,L1StandardERC20Gateway,L1ETHGateway,L1ERC20Gateway,L1GatewayRouter,L1WETHGateway,L1LidoGateway,Rollup,MultipleVersionRollupVerifier,L2CrossDomainMessenger,GasPriceOracle,L2ToL1MessagePasser,L2TxFeeVault,Sequencer,Gov,Distribute,L2Staking,Record,L2ETHGateway,L2StandardERC20Gateway,L2GatewayRouter,L2WETHGateway,L2ERC20Gateway,L2ERC721Gateway,L2ERC1155Gateway,L2LidoGateway,MorphToken,MorphStandardERC20,MorphStandardERC20Factory,WrappedEther,L2USDCGateway,EnforcedTxGateway,L1ERC721Gateway,L1ERC1155Gateway,L1ReverseCustomGateway,L2WithdrawLockERC20Gateway,L2ReverseCustomGateway,Whitelist,ZkEvmVerifierV1,L2WstETHToken \
+		-contracts ProxyAdmin,TransparentUpgradeableProxy,L2TokenRegistry,L1MessageQueueWithGasPriceOracle,L1USDCGateway,Submitter,L1CrossDomainMessenger,L1StandardERC20Gateway,L1ETHGateway,L1ERC20Gateway,L1GatewayRouter,L1WETHGateway,L1LidoGateway,Rollup,MultipleVersionRollupVerifier,L2CrossDomainMessenger,GasPriceOracle,L2ToL1MessagePasser,L2TxFeeVault,Sequencer,Gov,Distribute,L2Staking,Record,L2ETHGateway,L2StandardERC20Gateway,L2GatewayRouter,L2WETHGateway,L2ERC20Gateway,L2ERC721Gateway,L2ERC1155Gateway,L2LidoGateway,MorphToken,MorphStandardERC20,MorphStandardERC20Factory,WrappedEther,L2USDCGateway,EnforcedTxGateway,L1ERC721Gateway,L1ERC1155Gateway,L1ReverseCustomGateway,L2WithdrawLockERC20Gateway,L2ReverseCustomGateway,Whitelist,ZkEvmVerifierV1,L2WstETHToken \
 		-package bindings
 
 mkdir:
@@ -211,4 +211,3 @@ test:
 lint:
 	GOBIN=$(PWD)/build/bin go run ../build/lint.go
 .PHONY: lint
-

bindings/bin/submitter_deployed.hex

@@ -0,0 +1 @@
+0x608060405260043610610183575f3560e01c80639f8a13d7116100d1578063c36f41e21161007c578063d13f90b411610057578063d13f90b41461043f578063ec5ffac21461045e578063f2fde38b14610473575f80fd5b8063c36f41e2146103e2578063c96be4cb14610401578063cde4cd1114610420575f80fd5b8063ab8c53dc116100ac578063ab8c53dc14610380578063b2dd5c0714610395578063bfa02ba9146103c3575f80fd5b80639f8a13d714610323578063a3066aab14610342578063a4f209b014610361575f80fd5b80633bf1944b1161013157806352d472eb1161010c57806352d472eb146102c9578063715018a6146102de5780638da5cb5b146102f2575f80fd5b80633bf1944b1461025f5780633ccfd60b1461028a578063426233601461029e575f80fd5b8063264762041161016157806326476204146101ef57806335928991146102025780633baf3a2f14610221575f80fd5b8063072900f9146101875780630d13fd7b146101a8578063233e9903146101d0575b5f80fd5b348015610192575f80fd5b506101a66101a13660046119bd565b610492565b005b3480156101b3575f80fd5b506101bd60995481565b6040519081526020015b60405180910390f35b3480156101db575f80fd5b506101a66101ea3660046119dd565b6105ab565b6101a66101fd3660046119bd565b610651565b34801561020d575f80fd5b506101a661021c3660046119dd565b6107c9565b34801561022c575f80fd5b5061024f61023b3660046119bd565b609e6020525f908152604090205460ff1681565b60405190151581526020016101c7565b34801561026a575f80fd5b506101bd6102793660046119bd565b609f6020525f908152604090205481565b348015610295575f80fd5b506101a661086f565b3480156102a9575f80fd5b506101bd6102b83660046119bd565b609d6020525f908152604090205481565b3480156102d4575f80fd5b506101bd609a5481565b3480156102e9575f80fd5b506101a6610948565b3480156102fd575f80fd5b506033546001600160a01b03165b6040516001600160a01b0390911681526020016101c7565b34801561032e575f80fd5b5061024f61033d3660046119bd565b61095b565b34801561034d575f80fd5b506101a661035c3660046119bd565b6109c5565b34801561036c575f80fd5b506101a661037b3660046119dd565b610c0a565b34801561038b575f80fd5b506101bd609b5481565b3480156103a0575f80fd5b5061024f6103af3660046119bd565b609c6020525f908152604090205460ff1681565b3480156103ce575f80fd5b5060975461030b906001600160a01b031681565b3480156103ed575f80fd5b506101a66103fc3660046119bd565b610cbd565b34801561040c575f80fd5b506101bd61041b3660046119bd565b610dc1565b34801561042b575f80fd5b506101a661043a3660046119bd565b610f35565b34801561044a575f80fd5b506101a66104593660046119f4565b611034565b348015610469575f80fd5b506101bd60985481565b34801561047e575f80fd5b506101a661048d3660046119bd565b611448565b61049a6114d5565b6001600160a01b038116158015906104ca57506001600160a01b0381165f908152609c602052604090205460ff16155b80156104ee57506001600160a01b0381165f908152609e602052604090205460ff16155b801561050f57506001600160a01b0381165f908152609d6020526040902054155b6105605760405162461bcd60e51b815260206004820152601160248201527f696e76616c6964207375626d697474657200000000000000000000000000000060448201526064015b60405180910390fd5b6001600160a01b0381165f818152609c6020526040808220805460ff19166001179055517fb079bc2cbde1f186e0b351d4a87c4597e3ed098f571548617449e73506428d8b9190a250565b6105b36114d5565b5f811180156105c457506098548114155b6106105760405162461bcd60e51b815260206004820152601560248201527f696e76616c6964206d696e696d756d207374616b6500000000000000000000006044820152606401610557565b60985460408051918252602082018390527fd67ed534faf3e0dcda08ac6043ec96dcf9b6ebec56055fd14bd0cb40a27c0e49910160405180910390a1609855565b61065961152f565b6001600160a01b0381165f908152609c602052604090205460ff16801561069857506001600160a01b0381165f908152609e602052604090205460ff16155b6106e45760405162461bcd60e51b815260206004820152600d60248201527f6e6f74207374616b6561626c65000000000000000000000000000000000000006044820152606401610557565b6001600160a01b0381165f908152609d6020526040812054610707903490611a6a565b90505f3411801561071a57506098548110155b6107665760405162461bcd60e51b815260206004820152601360248201527f62656c6f77206d696e696d756d207374616b65000000000000000000000000006044820152606401610557565b6001600160a01b0382165f818152609d602090815260409182902084905581513481529081018490527f1449c6dd7851abc30abf37f57715f492010519147cc2652fbc38202c18a6ee9091015b60405180910390a2506107c66001606555565b50565b6107d16114d5565b5f811180156107e257506099548114155b61082e5760405162461bcd60e51b815260206004820152601960248201527f696e76616c6964206368616c6c656e6765206465706f736974000000000000006044820152606401610557565b60995460408051918252602082018390527f36f971a40478225aeb80cfbf5e80306e8cb76d3bf7d56fdc5e490945cddb7d55910160405180910390a1609955565b335f818152609c602052604090205460ff1680156108a557506001600160a01b0381165f908152609e602052604090205460ff16155b80156108c757506001600160a01b0381165f908152609d602052604090205415155b6109135760405162461bcd60e51b815260206004820152601060248201527f6e6f7420776974686472617761626c65000000000000000000000000000000006044820152606401610557565b6001600160a01b0381165f908152609c60209081526040808320805460ff19169055609d9091529020546107c690829061158f565b6109506114d5565b6109595f611686565b565b6001600160a01b0381165f908152609c602052604081205460ff16801561099a57506001600160a01b0382165f908152609e602052604090205460ff16155b80156109bf57506098546001600160a01b0383165f908152609d602052604090205410155b92915050565b6109cd61152f565b336001600160a01b038216610a245760405162461bcd60e51b815260206004820152601060248201527f696e76616c6964207265636569766572000000000000000000000000000000006044820152606401610557565b6001600160a01b0381165f908152609e602052604090205460ff16610a8b5760405162461bcd60e51b815260206004820152600f60248201527f6e6f74207769746864726177696e6700000000000000000000000000000000006044820152606401610557565b6001600160a01b038082165f908152609f60209081526040918290205460975483517f059def6100000000000000000000000000000000000000000000000000000000815293519194169263059def619260048083019391928290030181865afa158015610afb573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b1f9190611a7d565b1015610b6d5760405162461bcd60e51b815260206004820152601e60248201527f7769746864726177616c206261746368206e6f742066696e616c697a656400006044820152606401610557565b6001600160a01b0381165f908152609d60209081526040808320805490849055609e8352818420805460ff19169055609f909252822091909155610bb183826116ef565b826001600160a01b0316826001600160a01b03167f8188e2b4d95f73db30690b4103c71159349bb897df928902c6330ef99e45fef383604051610bf691815260200190565b60405180910390a350506107c66001606555565b610c126114d5565b5f81118015610c22575060648111155b8015610c305750609a548114155b610c7c5760405162461bcd60e51b815260206004820152601960248201527f696e76616c6964207265776172642070657263656e74616765000000000000006044820152606401610557565b609a5460408051918252602082018390527fa46de936426e045703b2d34a292a19fde92b329018db8e0da750033876b655ba910160405180910390a1609a55565b610cc56114d5565b6001600160a01b0381165f908152609c602052604090205460ff168015610d0457506001600160a01b0381165f908152609e602052604090205460ff16155b610d505760405162461bcd60e51b815260206004820152601160248201527f696e76616c6964207375626d69747465720000000000000000000000000000006044820152606401610557565b6001600160a01b0381165f908152609c60209081526040808320805460ff19169055609d9091529020548015610d8a57610d8a828261158f565b6040516001600160a01b038316907ff84a004e1673d2f349a7c93c72b3794b8eba6d2f9338044d8c8cd260e51a57a1905f90a25050565b6097545f906001600160a01b0316336001600160a01b031614610e265760405162461bcd60e51b815260206004820152601460248201527f6f6e6c7920726f6c6c757020636f6e74726163740000000000000000000000006044820152606401610557565b610e2e61152f565b6001600160a01b038216610e4357505f610f26565b6001600160a01b0382165f908152609d602090815260408083208054609c8452828520805460ff1990811690915591859055609e84528285208054909216909155609f909252822091909155609a54606490610e9f9083611a94565b610ea99190611aab565b9150610eb58282611ae3565b609b5f828254610ec59190611a6a565b9091555050609754610ee0906001600160a01b0316836116ef565b60408051828152602081018490526001600160a01b038516917f45a371af55b0726877a30f464edc14db5879ab096590bacce682cf6c18223596910160405180910390a2505b610f306001606555565b919050565b610f3d6114d5565b610f4561152f565b6001600160a01b038116610f9b5760405162461bcd60e51b815260206004820152601060248201527f696e76616c6964207265636569766572000000000000000000000000000000006044820152606401610557565b609b5480610feb5760405162461bcd60e51b815260206004820152601260248201527f6e6f20736c6173682072656d61696e696e6700000000000000000000000000006044820152606401610557565b5f609b55610ff982826116ef565b816001600160a01b03167fa1fefb6c5328a92a416e321ed50997303fe7135fd88c28b0592b21ce42b5cdd9826040516107b391815260200190565b5f54610100900460ff161580801561105257505f54600160ff909116105b8061106b5750303b15801561106b57505f5460ff166001145b6110dd5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a65640000000000000000000000000000000000006064820152608401610557565b5f805460ff19166001179055801561111b575f80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b6001600160a01b0386166111715760405162461bcd60e51b815260206004820152600d60248201527f696e76616c6964206f776e6572000000000000000000000000000000000000006044820152606401610557565b6001600160a01b0385161580159061119257505f856001600160a01b03163b115b6111de5760405162461bcd60e51b815260206004820152601760248201527f696e76616c696420726f6c6c757020636f6e74726163740000000000000000006044820152606401610557565b5f841161122d5760405162461bcd60e51b815260206004820152601560248201527f696e76616c6964206d696e696d756d207374616b6500000000000000000000006044820152606401610557565b5f831161127c5760405162461bcd60e51b815260206004820152601960248201527f696e76616c6964206368616c6c656e6765206465706f736974000000000000006044820152606401610557565b5f8211801561128c575060648211155b6112d85760405162461bcd60e51b815260206004820152601960248201527f696e76616c6964207265776172642070657263656e74616765000000000000006044820152606401610557565b6112e061179e565b6112e8611822565b6112f186611686565b609780547fffffffffffffffffffffffff0000000000000000000000000000000000000000166001600160a01b03871617905560988490556099839055609a829055604080515f8152602081018690527fd67ed534faf3e0dcda08ac6043ec96dcf9b6ebec56055fd14bd0cb40a27c0e49910160405180910390a1604080515f8152602081018590527f36f971a40478225aeb80cfbf5e80306e8cb76d3bf7d56fdc5e490945cddb7d55910160405180910390a1604080515f8152602081018490527fa46de936426e045703b2d34a292a19fde92b329018db8e0da750033876b655ba910160405180910390a18015611440575f80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b6114506114d5565b6001600160a01b0381166114cc5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f64647265737300000000000000000000000000000000000000000000000000006064820152608401610557565b6107c681611686565b6033546001600160a01b031633146109595760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610557565b6002606554036115815760405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606401610557565b6002606555565b6001606555565b6001600160a01b038083165f908152609e6020908152604091829020805460ff1916600117905560975482517f121dcd50000000000000000000000000000000000000000000000000000000008152925193169263121dcd509260048082019392918290030181865afa158015611608573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061162c9190611a7d565b6001600160a01b0383165f818152609f6020526040908190209290925590517fe670e4e82118d22a1f9ee18920455ebc958bae26a90a05d31d3378788b1b0e449061167a9084815260200190565b60405180910390a25050565b603380546001600160a01b038381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0905f90a35050565b805f036116fa575050565b5f826001600160a01b0316826040515f6040518083038185875af1925050503d805f8114611743576040519150601f19603f3d011682016040523d82523d5f602084013e611748565b606091505b50509050806117995760405162461bcd60e51b815260206004820152601360248201527f455448207472616e73666572206661696c6564000000000000000000000000006044820152606401610557565b505050565b5f54610100900460ff1661181a5760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e670000000000000000000000000000000000000000006064820152608401610557565b6109596118a6565b5f54610100900460ff1661189e5760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e670000000000000000000000000000000000000000006064820152608401610557565b61095961192b565b5f54610100900460ff166119225760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e670000000000000000000000000000000000000000006064820152608401610557565b61095933611686565b5f54610100900460ff166115885760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e670000000000000000000000000000000000000000006064820152608401610557565b80356001600160a01b0381168114610f30575f80fd5b5f602082840312156119cd575f80fd5b6119d6826119a7565b9392505050565b5f602082840312156119ed575f80fd5b5035919050565b5f805f805f60a08688031215611a08575f80fd5b611a11866119a7565b9450611a1f602087016119a7565b94979496505050506040830135926060810135926080909101359150565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b808201808211156109bf576109bf611a3d565b5f60208284031215611a8d575f80fd5b5051919050565b80820281158282048414176109bf576109bf611a3d565b5f82611ade577f4e487b71000000000000000000000000000000000000000000000000000000005f52601260045260245ffd5b500490565b818103818111156109bf576109bf611a3d56fea164736f6c6343000818000a