Rename to cdk-erigon (#20)

Author: revitteth

.github/workflows/docker.yml

@@ -9,7 +9,7 @@ on:
 env:
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-  IMAGE_NAME: gatewayfm/zkevm-erigon
+  IMAGE_NAME: gatewayfm/cdk-erigon
 jobs:
   build-and-push:
     runs-on: ubuntu-latest

Dockerfile

@@ -61,7 +61,7 @@ COPY --from=tools-builder /app/build/bin/mdbx_stat /usr/local/bin/mdbx_stat
 ## then give each binary its own layer
 COPY --from=builder /app/build/bin/devnet /usr/local/bin/devnet
 COPY --from=builder /app/build/bin/downloader /usr/local/bin/downloader
-COPY --from=builder /app/build/bin/zkevm-erigon /usr/local/bin/zkevm-erigon
+COPY --from=builder /app/build/bin/cdk-erigon /usr/local/bin/cdk-erigon
 COPY --from=builder /app/build/bin/erigon-cl /usr/local/bin/erigon-cl
 COPY --from=builder /app/build/bin/evm /usr/local/bin/evm
 COPY --from=builder /app/build/bin/hack /usr/local/bin/hack
@@ -100,8 +100,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0" \
       org.label-schema.url="https://torquem.ch" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/gateway-fm/zkevm-erigon.git" \
+      org.label-schema.vcs-url="https://github.com/0xPolygonHermez/cdk-erigon.git" \
       org.label-schema.vendor="Torquem" \
       org.label-schema.version=$VERSION
 
-ENTRYPOINT ["zkevm-erigon"]
+ENTRYPOINT ["cdk-erigon"]

Dockerfile.debian

@@ -60,7 +60,7 @@ COPY --from=tools-builder /app/build/bin/mdbx_stat /usr/local/bin/mdbx_stat
 ## then give each binary its own layer
 COPY --from=builder /app/build/bin/devnet /usr/local/bin/devnet
 COPY --from=builder /app/build/bin/downloader /usr/local/bin/downloader
-COPY --from=builder /app/build/bin/zkevm-erigon /usr/local/bin/zkevm-erigon
+COPY --from=builder /app/build/bin/cdk-erigon /usr/local/bin/cdk-erigon
 COPY --from=builder /app/build/bin/erigon-cl /usr/local/bin/erigon-cl
 COPY --from=builder /app/build/bin/evm /usr/local/bin/evm
 COPY --from=builder /app/build/bin/hack /usr/local/bin/hack
@@ -97,8 +97,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0" \
       org.label-schema.url="https://torquem.ch" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/gateway-fm/zkevm-erigon.git" \
+      org.label-schema.vcs-url="https://github.com/0xPolygonHermez/cdk-erigon.git" \
       org.label-schema.vendor="Torquem" \
       org.label-schema.version=$VERSION
 
-ENTRYPOINT ["zkevm-erigon"]
+ENTRYPOINT ["cdk-erigon"]

Dockerfile.release

@@ -5,4 +5,4 @@ RUN apk add --no-cache ca-certificates && \
 COPY erigon /usr/local/bin/
 
 EXPOSE 8545 8551 8546 30303 30303/udp 42069 42069/udp 8080 9090 6060
-ENTRYPOINT ["zkevm-erigon"]
+ENTRYPOINT ["cdk-erigon"]

Makefile

@@ -99,7 +99,7 @@ dbg:
 	@echo "Run \"$(GOBIN)/$*\" to launch $*."
 
 ## erigon:                            build erigon
-zkevm-erigon: go-version zkevm-erigon.cmd
+cdk-erigon: go-version cdk-erigon.cmd
 	@rm -f $(GOBIN)/tg # Remove old binary to prevent confusion where users still use it because of the scripts
 
 COMMANDS += devnet
@@ -125,7 +125,7 @@ COMMANDS += erigon-el
 $(COMMANDS): %: %.cmd
 
 ## all:                               run erigon with all commands
-all: zkevm-erigon $(COMMANDS)
+all: cdk-erigon $(COMMANDS)
 
 ## db-tools:                          build db tools
 db-tools:
@@ -211,7 +211,7 @@ git-submodules:
 	@git submodule sync --quiet --recursive || true
 	@git submodule update --quiet --init --recursive --force || true
 
-PACKAGE_NAME          := github.com/gateway-fm/zkevm-erigon
+PACKAGE_NAME          := github.com/0xPolygonHermez/cdk-erigon
 GOLANG_CROSS_VERSION  ?= v1.20.2
 
 .PHONY: release-dry-run

README.md

@@ -1,6 +1,6 @@
-# zkEVM-Erigon
+# cdk-erigon
 
-zkEVM-Erigon is a fork of Erigon, currently in Alpha, optimized for syncing with the Polygon Hermez zkEVM network.
+cdk-erigon is a fork of Erigon, currently in Alpha, optimized for syncing with the Polygon Hermez zkEVM network.
 
 ***
 
@@ -48,7 +48,7 @@ In order to enable the zkevm_ namespace, please add 'zkevm' to the http.api flag
 ***
 
 ## Configuration Files
-Config files are the easiest way to configure zKEVM-Erigon, there are examples in the repository for each network e.g. `hermezconfig-testnet.yaml.example`.
+Config files are the easiest way to configure cdk-erigon, there are examples in the repository for each network e.g. `hermezconfig-testnet.yaml.example`.
 
 Depending on the RPC provider you are using, you may wish to alter `zkevm.rpc-ratelimit`.
 
@@ -77,9 +77,9 @@ http.api : ["eth","debug","net","trace","web3","erigon", "zkevm"]
 ***
 
 ## Running zKEVM Erigon
-- Build using  `make zkevm-erigon`
+- Build using  `make cdk-erigon`
 - Set up your config file (copy an example and edit as required)
-- run `./build/bin/zkevm-erigon --config="./hermezconfig-{network}.yaml"` (complete the name of your config file as required)
+- run `./build/bin/cdk-erigon --config="./hermezconfig-{network}.yaml"` (complete the name of your config file as required)
 
 NB: `--externalcl` flag is removed in upstream erigon so beware of re-using commands/config
 

cmd/zkevm-erigon/main.go cmd/cdk-erigon/main.go

@@ -117,6 +117,7 @@ func NewStagedSync(ctx context.Context,
 				cfg.Genesis,
 				cfg.Sync,
 				agg,
+				nil,
 			),
 			stagedsync.StageHashStateCfg(db, dirs, cfg.HistoryV3, agg),
 			stagedsync.StageTrieCfg(db, true, true, false, dirs.Tmp, blockReader, controlServer.Hd, cfg.HistoryV3, agg),

cmd/erigon-el/stages/stages.go

@@ -765,7 +765,7 @@ func stageExec(db kv.RwDB, ctx context.Context) error {
 	genesis := core.GenesisBlockByChainName(chain)
 	cfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, nil, chainConfig, engine, vmConfig, nil,
 		/*stateStream=*/ false,
-		/*badBlockHalt=*/ false, historyV3, dirs, getBlockReader(db), nil, genesis, syncCfg, agg)
+		/*badBlockHalt=*/ false, historyV3, dirs, getBlockReader(db), nil, genesis, syncCfg, agg, nil)
 	if unwind > 0 {
 		u := sync.NewUnwindState(sync_stages.Execution, s.BlockNumber-unwind, s.BlockNumber)
 		err := stagedsync.UnwindExecutionStage(u, s, nil, ctx, cfg, true)

cmd/integration/commands/stages.go

@@ -200,7 +200,7 @@ func syncBySmallSteps(db kv.RwDB, miningConfig params.MiningConfig, ctx context.
 	syncCfg.ExecWorkerCount = int(workers)
 	syncCfg.ReconWorkerCount = int(reconWorkers)
 
-	execCfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, changeSetHook, chainConfig, engine, vmConfig, changesAcc, false, false, historyV3, dirs, getBlockReader(db), nil, genesis, syncCfg, agg)
+	execCfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, changeSetHook, chainConfig, engine, vmConfig, changesAcc, false, false, historyV3, dirs, getBlockReader(db), nil, genesis, syncCfg, agg, nil)
 
 	execUntilFunc := func(execToBlock uint64) func(firstCycle bool, badBlockUnwind bool, stageState *sync_stages.StageState, unwinder sync_stages.Unwinder, tx kv.RwTx, quiet bool) error {
 		return func(firstCycle bool, badBlockUnwind bool, s *sync_stages.StageState, unwinder sync_stages.Unwinder, tx kv.RwTx, quiet bool) error {
@@ -533,7 +533,7 @@ func loopExec(db kv.RwDB, ctx context.Context, unwind uint64) error {
 	initialCycle := false
 	cfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, nil, chainConfig, engine, vmConfig, nil,
 		/*stateStream=*/ false,
-		/*badBlockHalt=*/ false, historyV3, dirs, getBlockReader(db), nil, genesis, syncCfg, agg)
+		/*badBlockHalt=*/ false, historyV3, dirs, getBlockReader(db), nil, genesis, syncCfg, agg, nil)
 
 	// set block limit of execute stage
 	sync.MockExecFunc(sync_stages.Execution, func(firstCycle bool, badBlockUnwind bool, stageState *sync_stages.StageState, unwinder sync_stages.Unwinder, tx kv.RwTx, quiet bool) error {

cmd/integration/commands/state_stages.go

@@ -43,6 +43,7 @@ import (
 	"github.com/ledgerwatch/erigon/turbo/logging"
 	"github.com/ledgerwatch/erigon/turbo/services"
 	"github.com/ledgerwatch/erigon/turbo/snapshotsync"
+	zktypes "github.com/ledgerwatch/erigon/zk/types"
 )
 
 func init() {
@@ -418,7 +419,7 @@ func processBlock23(startTxNum uint64, trace bool, txNumStart uint64, rw *StateR
 			ibs.Prepare(tx.Hash(), block.Hash(), i)
 			ct := exec3.NewCallTracer()
 			vmConfig.Tracer = ct
-			receipt, _, err := core.ApplyTransaction(chainConfig, getHashFn, engine, nil, gp, ibs, ww, header, tx, usedGas, vmConfig, excessDataGas)
+			receipt, _, err := core.ApplyTransaction(chainConfig, getHashFn, engine, nil, gp, ibs, ww, header, tx, usedGas, vmConfig, excessDataGas, zktypes.EFFECTIVE_GAS_PRICE_PERCENTAGE_DISABLED)
 			if err != nil {
 				return 0, nil, fmt.Errorf("could not apply tx %d [%x] failed: %w", i, tx.Hash(), err)
 			}

cmd/state/commands/erigon4.go

@@ -32,6 +32,7 @@ import (
 	"github.com/ledgerwatch/erigon/eth/ethconfig"
 	"github.com/ledgerwatch/erigon/turbo/services"
 	"github.com/ledgerwatch/erigon/turbo/snapshotsync"
+	zktypes "github.com/ledgerwatch/erigon/zk/types"
 )
 
 var (
@@ -257,7 +258,7 @@ func runHistory22(trace bool, blockNum, txNumStart uint64, hw *state.HistoryRead
 		hw.SetTxNum(txNum)
 		ibs := state.New(hw)
 		ibs.Prepare(tx.Hash(), block.Hash(), i)
-		receipt, _, err := core.ApplyTransaction(chainConfig, core.GetHashFn(header, getHeader), engine, nil, gp, ibs, ww, header, tx, usedGas, vmConfig, excessDataGas)
+		receipt, _, err := core.ApplyTransaction(chainConfig, core.GetHashFn(header, getHeader), engine, nil, gp, ibs, ww, header, tx, usedGas, vmConfig, excessDataGas, zktypes.EFFECTIVE_GAS_PRICE_PERCENTAGE_DISABLED)
 		if err != nil {
 			return 0, nil, fmt.Errorf("could not apply tx %d [%x] failed: %w", i, tx.Hash(), err)
 		}

cmd/state/commands/history22.go

@@ -32,6 +32,7 @@ import (
 	"github.com/ledgerwatch/erigon/core/systemcontracts"
 	"github.com/ledgerwatch/erigon/core/types"
 	"github.com/ledgerwatch/erigon/core/vm"
+	zktypes "github.com/ledgerwatch/erigon/zk/types"
 )
 
 var (
@@ -715,7 +716,7 @@ func runBlock(engine consensus.Engine, ibs *state.IntraBlockState, txnWriter sta
 	rules := chainConfig.Rules(block.NumberU64(), block.Time())
 	for i, tx := range block.Transactions() {
 		ibs.Prepare(tx.Hash(), block.Hash(), i)
-		receipt, _, err := core.ApplyTransaction(chainConfig, core.GetHashFn(header, getHeader), engine, nil, gp, ibs, txnWriter, header, tx, usedGas, vmConfig, excessDataGas)
+		receipt, _, err := core.ApplyTransaction(chainConfig, core.GetHashFn(header, getHeader), engine, nil, gp, ibs, txnWriter, header, tx, usedGas, vmConfig, excessDataGas, zktypes.EFFECTIVE_GAS_PRICE_PERCENTAGE_DISABLED)
 		if err != nil {
 			return nil, fmt.Errorf("could not apply tx %d [%x] failed: %w", i, tx.Hash(), err)
 		}

cmd/state/commands/opcode_tracer.go

@@ -49,7 +49,7 @@ RUN mkdir -p ~/.local/share/erigon
 ## then give each binary its own layer
 COPY --from=builder /app/build/bin/devnet /usr/local/bin/devnet
 COPY --from=builder /app/build/bin/downloader /usr/local/bin/downloader
-COPY --from=builder /app/build/bin/zkevm-erigon /usr/local/bin/zkevm-erigon
+COPY --from=builder /app/build/bin/cdk-erigon /usr/local/bin/cdk-erigon
 COPY --from=builder /app/build/bin/erigon-cl /usr/local/bin/erigon-cl
 COPY --from=builder /app/build/bin/evm /usr/local/bin/evm
 COPY --from=builder /app/build/bin/hack /usr/local/bin/hack
@@ -87,8 +87,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0" \
       org.label-schema.url="https://torquem.ch" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/gateway-fm/zkevm-erigon.git" \
+      org.label-schema.vcs-url="https://github.com/0xPolygonHermez/cdk-erigon.git" \
       org.label-schema.vendor="Torquem" \
       org.label-schema.version=$VERSION
 
-ENTRYPOINT ["zkevm-erigon"]
+ENTRYPOINT ["cdk-erigon"]