morph-l2
diff --git a/‎.env
+3 b/‎.env
+3
diff --git a/‎.github/pull_request_template.md
+34 b/‎.github/pull_request_template.md
+34
diff --git a/‎.github/workflows/docker.yaml
+1-1 b/‎.github/workflows/docker.yaml
+1-1
diff --git a/‎.github/workflows/l2geth_ci.yml
+9 b/‎.github/workflows/l2geth_ci.yml
+9
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎Dockerfile
+5-12 b/‎Dockerfile
+5-12
diff --git a/‎Makefile
+18 b/‎Makefile
+18
diff --git a/‎accounts/abi/bind/backends/simulated.go
+92-1 b/‎accounts/abi/bind/backends/simulated.go
+92-1
diff --git a/‎accounts/abi/bind/template.go
+7 b/‎accounts/abi/bind/template.go
+7
diff --git a/‎build/jwt-secret.txt
+1 b/‎build/jwt-secret.txt
+1
diff --git a/‎cmd/abigen/main.go
+28-3 b/‎cmd/abigen/main.go
+28-3
diff --git a/‎cmd/clef/main.go
+1-1 b/‎cmd/clef/main.go
+1-1
diff --git a/‎cmd/devp2p/internal/ethtest/chain.go
+8 b/‎cmd/devp2p/internal/ethtest/chain.go
+8
@@ -0,0 +1,3 @@
+GETH_DATA_DIR=/db
+GENESIS_FILE_PATH=/genesis.json
+JWT_SECRET_PATH=/jwt-secret.txt
@@ -0,0 +1,34 @@
+## 1. Purpose or design rationale of this PR
+
+...
+
+
+## 2. PR title
+
+Your PR title must follow [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) (as we are doing squash merge for each PR), so it must start with one of the following [types](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#type):
+
+- [ ] build: Changes that affect the build system or external dependencies (example scopes: yarn, eslint, typescript)
+- [ ] ci: Changes to our CI configuration files and scripts (example scopes: vercel, github, cypress)
+- [ ] docs: Documentation-only changes
+- [ ] feat: A new feature
+- [ ] fix: A bug fix
+- [ ] perf: A code change that improves performance
+- [ ] refactor: A code change that doesn't fix a bug, or add a feature, or improves performance
+- [ ] style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
+- [ ] test: Adding missing tests or correcting existing tests
+
+
+## 3. Deployment tag versioning
+
+Has the version in `params/version.go` been updated?
+
+- [ ] This PR doesn't involve a new deployment, git tag, docker image tag, and it doesn't affect traces
+- [ ] Yes
+
+
+## 4. Breaking change label
+
+Does this PR have the `breaking-change` label?
+
+- [ ] This PR is not a breaking change
+- [ ] Yes
@@ -3,7 +3,7 @@ name: Docker
 on:
   push:
     tags:
-      - scroll-v**
+      - '*'
 
 jobs:
   build-and-push:
 
@@ -6,9 +6,15 @@ on:
       - develop
       - alpha
   pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
 name: CI
 jobs:
   build:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - name: Install Go
@@ -21,6 +27,7 @@ jobs:
       run: |
         make geth
   check:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - name: Install Go
@@ -34,6 +41,7 @@ jobs:
         rm -rf $HOME/.cache/golangci-lint
         make lint
   goimports-lint:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - name: Install Go
@@ -53,6 +61,7 @@ jobs:
           exit 1
         fi
   test:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - name: Install Go
 
@@ -47,3 +47,4 @@ profile.cov
 /dashboard/assets/package-lock.json
 
 **/yarn-error.log
+/build/db*/
@@ -1,8 +1,3 @@
-# Support setting various labels on the final image
-ARG COMMIT=""
-ARG VERSION=""
-ARG BUILDNUM=""
-
 # Build Geth in a stock Go builder container
 FROM golang:1.18-alpine as builder
 
@@ -16,13 +11,11 @@ FROM alpine:latest
 
 RUN apk add --no-cache ca-certificates
 COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
+COPY entrypoint.sh /entrypoint.sh
+
+VOLUME ["/db"]
 
-EXPOSE 8545 8546 30303 30303/udp
-ENTRYPOINT ["geth"]
+ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
 
-# Add some metadata labels to help programatic image consumption
-ARG COMMIT=""
-ARG VERSION=""
-ARG BUILDNUM=""
+EXPOSE 8545 8546 8551 30303 30303/udp
 
-LABEL commit="$COMMIT" version="$VERSION" buildnum="$BUILDNUM"
@@ -52,3 +52,21 @@ devtools:
 	env GOBIN= go install ./cmd/abigen
 	@type "solc" 2> /dev/null || echo 'Please install solc'
 	@type "protoc" 2> /dev/null || echo 'Please install protoc'
+
+
+testnet-up:
+	docker-compose -f testnet/docker-compose.yml up  -d
+.PHONY: testnet-up
+
+testnet-down:
+	docker-compose -f testnet/docker-compose.yml down
+.PHONY: testnet-down
+
+testnet-clean:
+	docker-compose -f testnet/docker-compose.yml down
+	docker images -q morphism_geth:latest | xargs -r docker rmi
+	docker volume ls --filter "name=morph_data*" -q | xargs -r docker volume rm
+.PHONY: testnet-clean
+
+image:
+	docker build -f Dockerfile -t morphism-geth:latest .
@@ -30,6 +30,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/common/hexutil"
 	"github.com/scroll-tech/go-ethereum/common/math"
+	"github.com/scroll-tech/go-ethereum/consensus"
 	"github.com/scroll-tech/go-ethereum/consensus/ethash"
 	"github.com/scroll-tech/go-ethereum/core"
 	"github.com/scroll-tech/go-ethereum/core/bloombits"
@@ -42,6 +43,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/event"
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/scroll-tech/go-ethereum/params"
+	"github.com/scroll-tech/go-ethereum/rollup/fees"
 	"github.com/scroll-tech/go-ethereum/rpc"
 )
 
@@ -63,6 +65,8 @@ type SimulatedBackend struct {
 	database   ethdb.Database   // In memory database to store our testing data
 	blockchain *core.BlockChain // Ethereum blockchain to handle the consensus
 
+	consensus consensus.Engine
+
 	mu           sync.Mutex
 	pendingBlock *types.Block   // Currently pending block that will be imported on request
 	pendingState *state.StateDB // Currently pending state that will be the active on request
@@ -97,6 +101,87 @@ func NewSimulatedBackend(alloc core.GenesisAlloc, gasLimit uint64) *SimulatedBac
 	return NewSimulatedBackendWithDatabase(rawdb.NewMemoryDatabase(), alloc, gasLimit)
 }
 
+type simulatedBackendConfig struct {
+	genesis     core.Genesis
+	cacheConfig *core.CacheConfig
+	database    ethdb.Database
+	vmConfig    vm.Config
+	consensus   consensus.Engine
+}
+
+type SimulatedBackendOpt func(s *simulatedBackendConfig)
+
+func WithDatabase(database ethdb.Database) SimulatedBackendOpt {
+	return func(s *simulatedBackendConfig) {
+		s.database = database
+	}
+}
+
+func WithGasLimit(gasLimit uint64) SimulatedBackendOpt {
+	return func(s *simulatedBackendConfig) {
+		s.genesis.GasLimit = gasLimit
+	}
+}
+
+func WithAlloc(alloc core.GenesisAlloc) SimulatedBackendOpt {
+	return func(s *simulatedBackendConfig) {
+		s.genesis.Alloc = alloc
+	}
+}
+
+func WithCacheConfig(cacheConfig *core.CacheConfig) SimulatedBackendOpt {
+	return func(s *simulatedBackendConfig) {
+		s.cacheConfig = cacheConfig
+	}
+}
+
+func WithGenesis(genesis core.Genesis) SimulatedBackendOpt {
+	return func(s *simulatedBackendConfig) {
+		s.genesis = genesis
+	}
+}
+
+func WithVMConfig(vmConfig vm.Config) SimulatedBackendOpt {
+	return func(s *simulatedBackendConfig) {
+		s.vmConfig = vmConfig
+	}
+}
+
+func WithConsensus(consensus consensus.Engine) SimulatedBackendOpt {
+	return func(s *simulatedBackendConfig) {
+		s.consensus = consensus
+	}
+}
+
+// NewSimulatedBackendWithOpts creates a new binding backend based on the given database
+// and uses a simulated blockchain for testing purposes. It exposes additional configuration
+// options that are useful to
+func NewSimulatedBackendWithOpts(opts ...SimulatedBackendOpt) *SimulatedBackend {
+	config := &simulatedBackendConfig{
+		genesis:   core.Genesis{Config: params.AllEthashProtocolChanges, GasLimit: 100000000, Alloc: make(core.GenesisAlloc)},
+		database:  rawdb.NewMemoryDatabase(),
+		consensus: ethash.NewFaker(),
+	}
+
+	for _, opt := range opts {
+		opt(config)
+	}
+
+	config.genesis.MustCommit(config.database)
+	blockchain, _ := core.NewBlockChain(config.database, config.cacheConfig, config.genesis.Config, config.consensus, config.vmConfig, nil, nil)
+
+	backend := &SimulatedBackend{
+		database:   config.database,
+		blockchain: blockchain,
+		config:     config.genesis.Config,
+		consensus:  config.consensus,
+		events:     filters.NewEventSystem(&filterBackend{config.database, blockchain}, false),
+	}
+
+	backend.rollback(blockchain.CurrentBlock())
+	return backend
+}
+
 // Close terminates the underlying blockchain's update loop.
 func (b *SimulatedBackend) Close() error {
 	b.blockchain.Stop()
@@ -638,8 +723,13 @@ func (b *SimulatedBackend) callContract(ctx context.Context, call ethereum.CallM
 	// about the transaction and calling mechanisms.
 	vmEnv := vm.NewEVM(evmContext, txContext, stateDB, b.config, vm.Config{NoBaseFee: true})
 	gasPool := new(core.GasPool).AddGas(math.MaxUint64)
+	signer := types.MakeSigner(b.blockchain.Config(), head.Number)
+	l1DataFee, err := fees.EstimateL1DataFeeForMessage(msg, head.BaseFee, b.blockchain.Config().ChainID, signer, stateDB)
+	if err != nil {
+		return nil, err
+	}
 
-	return core.NewStateTransition(vmEnv, msg, gasPool).TransitionDb()
+	return core.NewStateTransition(vmEnv, msg, gasPool, l1DataFee).TransitionDb()
 }
 
 // SendTransaction updates the pending block to include the given transaction.
@@ -814,6 +904,7 @@ func (m callMsg) Gas() uint64                  { return m.CallMsg.Gas }
 func (m callMsg) Value() *big.Int              { return m.CallMsg.Value }
 func (m callMsg) Data() []byte                 { return m.CallMsg.Data }
 func (m callMsg) AccessList() types.AccessList { return m.CallMsg.AccessList }
+func (m callMsg) IsL1MessageTx() bool          { return false }
 
 // filterBackend implements filters.Backend to support filtering for logs without
 // taking bloom-bits acceleration structures into account.
 
@@ -79,6 +79,13 @@ var tmplSource = map[Lang]string{
 	LangJava: tmplSourceJava,
 }
 
+// SetTmplSource supports this func in order to set special template file.
+func SetTmplSource(lang Lang, source string) {
+	if _, ok := tmplSource[lang]; ok {
+		tmplSource[lang] = source
+	}
+}
+
 // tmplSourceGo is the Go source template that the generated Go contract binding
 // is based on.
 const tmplSourceGo = `
 
@@ -0,0 +1 @@
+688f5d737bad920bdfb2fc2f488d6b6209eebda1dae949a8de91398d932c517a
@@ -99,6 +99,14 @@ var (
 		Name:  "alias",
 		Usage: "Comma separated aliases for function and event renaming, e.g. original1=alias1, original2=alias2",
 	}
+	contractFlag = cli.StringFlag{
+		Name:  "contract",
+		Usage: "Name of the contract to generate the bindings for",
+	}
+	tmplFlag = cli.StringFlag{
+		Name:  "tmpl",
+		Usage: "Template file if a user wants to customize",
+	}
 )
 
 func init() {
@@ -117,6 +125,8 @@ func init() {
 		outFlag,
 		langFlag,
 		aliasFlag,
+		contractFlag,
+		tmplFlag,
 	}
 	app.Action = utils.MigrateFlags(abigen)
 	cli.CommandHelpTemplate = flags.OriginCommandHelpTemplate
@@ -225,6 +235,13 @@ func abigen(c *cli.Context) error {
 		}
 		// Gather all non-excluded contract for binding
 		for name, contract := range contracts {
+			// The fully qualified name is of the form <solFilePath>:<type>
+			nameParts := strings.Split(name, ":")
+			typeName := nameParts[len(nameParts)-1]
+			// If a contract name is provided then ignore all other contracts
+			if c.GlobalIsSet(contractFlag.Name) && c.GlobalString(contractFlag.Name) != typeName {
+				continue
+			}
 			if exclude[strings.ToLower(name)] {
 				continue
 			}
@@ -235,11 +252,10 @@ func abigen(c *cli.Context) error {
 			abis = append(abis, string(abi))
 			bins = append(bins, contract.Code)
 			sigs = append(sigs, contract.Hashes)
-			nameParts := strings.Split(name, ":")
-			types = append(types, nameParts[len(nameParts)-1])
+			types = append(types, typeName)
 
 			libPattern := crypto.Keccak256Hash([]byte(name)).String()[2:36]
-			libs[libPattern] = nameParts[len(nameParts)-1]
+			libs[libPattern] = typeName
 		}
 	}
 	// Extract all aliases from the flags
@@ -254,6 +270,15 @@ func abigen(c *cli.Context) error {
 			aliases[match[1]] = match[2]
 		}
 	}
+	// Set customize template file.
+	if c.GlobalIsSet(tmplFlag.Name) {
+		tmplFile := c.GlobalString(tmplFlag.Name)
+		data, err := os.ReadFile(tmplFile)
+		if err != nil {
+			utils.Fatalf("Failed to read template file: %v", err)
+		}
+		bind.SetTmplSource(lang, string(data))
+	}
 	// Generate the contract binding
 	code, err := bind.Bind(types, abis, bins, sigs, c.GlobalString(pkgFlag.Name), lang, libs, aliases)
 	if err != nil {
 
@@ -662,7 +662,7 @@ func signer(c *cli.Context) error {
 		if err != nil {
 			utils.Fatalf("Could not register API: %w", err)
 		}
-		handler := node.NewHTTPHandlerStack(srv, cors, vhosts)
+		handler := node.NewHTTPHandlerStack(srv, cors, vhosts, nil)
 
 		// set port
 		port := c.Int(rpcPortFlag.Name)
 
@@ -26,6 +26,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/core"
 	"github.com/scroll-tech/go-ethereum/core/forkid"
 	"github.com/scroll-tech/go-ethereum/core/types"
@@ -67,6 +68,13 @@ func (c *Chain) TotalDifficultyAt(height int) *big.Int {
 	return sum
 }
 
+func (c *Chain) RootAt(height int) common.Hash {
+	if height < c.Len() {
+		return c.blocks[height].Root()
+	}
+	return common.Hash{}
+}
+
 // ForkID gets the fork id of the chain.
 func (c *Chain) ForkID() forkid.ID {
 	return forkid.NewID(c.chainConfig, c.blocks[0].Hash(), uint64(c.Len()))
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+GETH_DATA_DIR=/db`
	`2`	`+GENESIS_FILE_PATH=/genesis.json`
	`3`	`+JWT_SECRET_PATH=/jwt-secret.txt`
Original file line number	Diff line number	Diff line change
`@@ -47,3 +47,4 @@ profile.cov`
`47`	`47`	`/dashboard/assets/package-lock.json`
`48`	`48`
`49`	`49`	`**/yarn-error.log`
	`50`	`+/build/db*/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+688f5d737bad920bdfb2fc2f488d6b6209eebda1dae949a8de91398d932c517a`
Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ func signer(c *cli.Context) error {`
`662`	`662`	`if err != nil {`
`663`	`663`	`utils.Fatalf("Could not register API: %w", err)`
`664`	`664`	`}`
`665`		`- handler := node.NewHTTPHandlerStack(srv, cors, vhosts)`
	`665`	`+ handler := node.NewHTTPHandlerStack(srv, cors, vhosts, nil)`
`666`	`666`
`667`	`667`	`// set port`
`668`	`668`	`port := c.Int(rpcPortFlag.Name)`