Merge remote-tracking branch 'origin' into feature/block_context

Author: FletcherMan

MakefileEc2.mk

@@ -21,3 +21,34 @@ build-bk-prod-morph-prod-mainnet-to-morph-nccc-geth:
 	aws s3 cp morph-nccc-geth.tar.gz s3://morph-0582-morph-technical-department-mainnet-data/morph-setup/morph-nccc-geth.tar.gz
 
 
+# build for holesky
+build-bk-prod-morph-prod-testnet-to-morph-geth-holesky:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	$(GORUN) build/ci.go install ./cmd/geth
+	cp build/bin/geth dist/
+	tar -czvf morph-geth.tar.gz dist
+	aws s3 cp morph-geth.tar.gz s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/morph-geth.tar.gz
+
+build-bk-prod-morph-prod-testnet-to-morph-nccc-geth-holesky:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	$(GORUN) build/ci.go install ./cmd/geth
+	@echo "Done building."
+	cp build/bin/geth dist/
+	tar -czvf morph-nccc-geth.tar.gz dist
+	aws s3 cp morph-nccc-geth.tar.gz s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/morph-nccc-geth.tar.gz
+
+build-bk-test-morph-test-qanet-to-morph-geth-qanet:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	$(GORUN) build/ci.go install ./cmd/geth
+	@echo "Done building."
+	cp build/bin/geth dist/
+	tar -czvf morph-geth.tar.gz dist
+	aws s3 cp morph-geth.tar.gz s3://morph-7637-morph-technical-department-qanet-data/morph-setup/morph-geth.tar.gz
+
+build-bk-test-morph-test-qanet-to-morph-nccc-geth-qanet:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	$(GORUN) build/ci.go install ./cmd/geth
+	@echo "Done building."
+	cp build/bin/geth dist/
+	tar -czvf morph-nccc-geth.tar.gz dist
+	aws s3 cp morph-nccc-geth.tar.gz s3://morph-7637-morph-technical-department-qanet-data/morph-setup/morph-nccc-geth.tar.gz

core/state_transition.go

@@ -368,12 +368,18 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 		return nil, err
 	}
 	if st.gas < gas {
-		return nil, fmt.Errorf("%w: have %d, want %d", ErrIntrinsicGas, st.gas, gas)
+		// Allow L1 message transactions to be included in the block but fail during execution,
+		// instead of rejecting them outright at this point.
+		if st.msg.IsL1MessageTx() {
+			gas = st.gas
+		} else {
+			return nil, fmt.Errorf("%w: have %d, want %d", ErrIntrinsicGas, st.gas, gas)
+		}
 	}
 	st.gas -= gas
 
 	// Check clause 6
-	if msg.Value().Sign() > 0 && !st.evm.Context.CanTransfer(st.state, msg.From(), msg.Value()) {
+	if msg.Value().Sign() > 0 && !msg.IsL1MessageTx() && !st.evm.Context.CanTransfer(st.state, msg.From(), msg.Value()) {
 		return nil, fmt.Errorf("%w: address %v", ErrInsufficientFundsForTransfer, msg.From().Hex())
 	}
 

rollup/tracing/tracing.go

@@ -386,6 +386,13 @@ func (env *TraceEnv) getTxResult(state *state.StateDB, index int, block *types.B
 	// merge required proof data
 	proofAccounts := structLogger.UpdatedAccounts()
 	proofAccounts[vmenv.FeeRecipient()] = struct{}{}
+	// add from/to address if it does not exist
+	if _, ok := proofAccounts[from]; !ok {
+		proofAccounts[from] = struct{}{}
+	}
+	if _, ok := proofAccounts[*to]; !ok {
+		proofAccounts[*to] = struct{}{}
+	}
 	for addr := range proofAccounts {
 		addrStr := addr.String()