Refactor staking

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "go-ethereum"]
 path = go-ethereum
 url = https://github.com/morph-l2/go-ethereum.git
-branch = main
+branch = features/coinbase

Makefile

@@ -1,6 +1,6 @@
 ################## update dependencies ####################
 
-ETHEREUM_TARGET_VERSION := v1.10.14-0.20250218031646-de5160c106de
+ETHEREUM_TARGET_VERSION := v1.10.14-0.20250507031230-2fbc3c0550c3
 TENDERMINT_TARGET_VERSION := v0.3.2-0.20250115141431-c84dfe5c8533
 
 ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum
@@ -28,7 +28,6 @@ update_all_mod:
 	@$(MAKE) update_mod MODULE=node
 	@$(MAKE) update_mod MODULE=ops/l2-genesis
 	@$(MAKE) update_mod MODULE=ops/tools
-	@$(MAKE) update_mod MODULE=oracle
 	@$(MAKE) update_mod MODULE=tx-submitter
 
 
@@ -63,7 +62,6 @@ lint-go:
 	make -C node lint
 	make -C ops/l2-genesis lint
 	make -C ops/tools lint
-	make -C oracle lint
 	make -C tx-submitter lint
 .PHONY: lint-go
 
@@ -86,7 +84,6 @@ fmt-go:
 	cd $(PWD)/node/ && go mod tidy
 	cd $(PWD)/ops/l2-genesis/ && go mod tidy
 	cd $(PWD)/ops/tools/ && go mod tidy
-	cd $(PWD)/oracle/ && go mod tidy
 	cd $(PWD)/tx-submitter/ && go mod tidy
 	find . -name '*.go' -type f -not -path "./go-ethereum*" -not -name '*.pb.go' | xargs gofmt -w -s
 	find . -name '*.go' -type f -not -path "./go-ethereum*" -not -name '*.pb.go' | xargs misspell -w
@@ -128,7 +125,7 @@ go-ubuntu-builder:
 
 ################## devnet 4 nodes ####################
 
-devnet-up: submodules go-ubuntu-builder
+devnet-up:  go-ubuntu-builder
 	python3 ops/devnet-morph/main.py --polyrepo-dir=.
 .PHONY: devnet-up
 

MakefileEks.mk

@@ -70,29 +70,6 @@ build-bk-prod-morph-prod-mainnet-to-morph-shadow-proving:
 start-bk-prod-morph-prod-mainnet-to-morph-shadow-proving:
 	/data/secret-manager-wrapper  ./shadow-proving
 
-# staking-oracle
-# mainnet
-build-bk-prod-morph-prod-mainnet-to-morph-staking-oracle:
-	if [ ! -d dist ]; then mkdir -p dist; fi
-	env GO111MODULE=on CGO_LDFLAGS="-ldl" CGO_ENABLED=1 go build -v $(LDFLAGS) -o oracle/staking-oracle ./oracle/cmd/staking-oracle
-	cp oracle/staking-oracle dist/
-	aws s3 cp s3://morph-0582-morph-technical-department-mainnet-data/morph-setup/secret-manager-wrapper.tar.gz ./
-	tar -xvzf secret-manager-wrapper.tar.gz
-
-start-bk-prod-morph-prod-mainnet-to-morph-staking-oracle:
-	/data/secret-manager-wrapper  ./staking-oracle
-
-# qanet
-build-bk-test-morph-test-qanet-to-morph-staking-oracle-qanet:
-	if [ ! -d dist ]; then mkdir -p dist; fi
-	env GO111MODULE=on CGO_LDFLAGS="-ldl" CGO_ENABLED=1 go build -v $(LDFLAGS) -o oracle/staking-oracle ./oracle/cmd/staking-oracle
-	cp oracle/staking-oracle dist/
-	aws s3 cp s3://morph-7637-morph-technical-department-qanet-data/morph-setup/secret-manager-wrapper.tar.gz ./
-	tar -xvzf secret-manager-wrapper.tar.gz
-
-start-bk-test-morph-test-qanet-to-morph-staking-oracle-qanet:
-	/data/secret-manager-wrapper  ./staking-oracle
-
 
 # gas-oracle
 # testnet
@@ -143,16 +120,4 @@ build-bk-prod-morph-prod-testnet-to-morph-shadow-proving-holesky:
 	tar -xvzf secret-manager-wrapper.tar.gz
 
 start-bk-prod-morph-prod-testnet-to-morph-shadow-proving-holesky:
-	/data/secret-manager-wrapper  ./shadow-proving
-
-# staking-oracle
-# testnet
-build-bk-prod-morph-prod-testnet-to-morph-staking-oracle-holesky:
-	if [ ! -d dist ]; then mkdir -p dist; fi
-	env GO111MODULE=on CGO_LDFLAGS="-ldl" CGO_ENABLED=1 go build -v $(LDFLAGS) -o oracle/staking-oracle ./oracle/cmd/staking-oracle
-	cp oracle/staking-oracle dist/
-	aws s3 cp s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/secret-manager-wrapper.tar.gz ./
-	tar -xvzf secret-manager-wrapper.tar.gz
-
-start-bk-prod-morph-prod-testnet-to-morph-staking-oracle-holesky:
-	/data/secret-manager-wrapper  ./staking-oracle
+	/data/secret-manager-wrapper  ./shadow-proving

bindings/Makefile

@@ -29,8 +29,6 @@ bindings: \
 	l2-gov-bindings \
 	l2-sequencer-bindings \
 	l2-staking-bindings \
-	l2-distribute-bindings \
-	l2-record-bindings \
 	l2-eth-gateway-bindings \
 	l2-standard-erc20-gateway-bindings \
 	l2-gateway-router-bindings \
@@ -126,10 +124,6 @@ l2-sequencer-bindings: compile
 	./gen_bindings.sh contracts/l2/staking/Sequencer.sol:Sequencer $(pkg)
 l2-staking-bindings: compile
 	./gen_bindings.sh contracts/l2/staking/L2Staking.sol:L2Staking $(pkg)
-l2-distribute-bindings: compile
-	./gen_bindings.sh contracts/l2/staking/Distribute.sol:Distribute $(pkg)
-l2-record-bindings: compile
-	./gen_bindings.sh contracts/l2/staking/Record.sol:Record $(pkg)
 
 # Gateways
 l2-eth-gateway-bindings: compile
@@ -191,7 +185,7 @@ more: compile-forge
 	go run ./gen/main.go \
 		-artifacts ../contracts/artifacts \
 		-out ./bindings \
-		-contracts ProxyAdmin,TransparentUpgradeableProxy,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,L1MessageQueueWithGasPriceOracle,L1USDCGateway,L1Staking,L1CrossDomainMessenger,L1StandardERC20Gateway,L1ETHGateway,L1ERC20Gateway,L1GatewayRouter,L1WETHGateway,L1LidoGateway,Rollup,MultipleVersionRollupVerifier,L2CrossDomainMessenger,GasPriceOracle,L2ToL1MessagePasser,L2TxFeeVault,Sequencer,Gov,L2Staking,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: