diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go index a56930738d6..6d434ac4cab 100644 --- a/cmd/state/exec3/state.go +++ b/cmd/state/exec3/state.go @@ -194,10 +194,6 @@ func (rw *Worker) RunTxTaskNoLock(txTask *state.TxTask) { var err error header := txTask.Header lastBlockTime := header.Time - rw.chainConfig.Parlia.Period - parent, _ := rw.blockReader.HeaderByHash(rw.ctx, rw.chainTx, header.ParentHash) - if parent != nil { - lastBlockTime = parent.Time - } //fmt.Printf("txNum=%d blockNum=%d history=%t\n", txTask.TxNum, txTask.BlockNum, txTask.HistoryExecution) switch { diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index fef85d00c3b..70d4a16946a 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -151,7 +151,7 @@ require ( replace ( github.com/anacrolix/torrent => github.com/erigontech/torrent v1.54.2-alpha-32 - github.com/erigontech/erigon-snapshot => github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240723023831-e67e46da4d26 + github.com/erigontech/erigon-snapshot => github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240805061542-ddf011a69761 github.com/holiman/bloomfilter/v2 => github.com/AskAlexSharov/bloomfilter/v2 v2.0.8 github.com/tidwall/btree => github.com/AskAlexSharov/btree v1.6.2 ) diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 2c7cfe3e80f..c3c8a79d8c0 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -307,8 +307,8 @@ github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOl github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= -github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240723023831-e67e46da4d26 h1:riUZvCyLXxllayXKNsCrnFr7UNgvavGZhBAmUzY5qzc= -github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240723023831-e67e46da4d26/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M= +github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240805061542-ddf011a69761 h1:Oz/Pa4dMUhGI3iAt47nrz55p6srdCOLwiWe7mGJVhbY= +github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240805061542-ddf011a69761/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/go.mod b/go.mod index a0f3d46b6fe..9e691cb19ad 100644 --- a/go.mod +++ b/go.mod @@ -320,7 +320,7 @@ require ( replace ( github.com/anacrolix/torrent => github.com/erigontech/torrent v1.54.2-alpha-32 github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v1.3.1 - github.com/erigontech/erigon-snapshot => github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240723023831-e67e46da4d26 + github.com/erigontech/erigon-snapshot => github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240805061542-ddf011a69761 github.com/gballet/go-verkle => github.com/gballet/go-verkle v0.0.0-20221121182333-31427a1f2d35 github.com/holiman/bloomfilter/v2 => github.com/AskAlexSharov/bloomfilter/v2 v2.0.8 github.com/tendermint/tendermint => github.com/bnb-chain/tendermint v0.31.16 diff --git a/go.sum b/go.sum index 8592e0d18fe..62ec310a964 100644 --- a/go.sum +++ b/go.sum @@ -734,8 +734,8 @@ github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdh github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240723023831-e67e46da4d26 h1:riUZvCyLXxllayXKNsCrnFr7UNgvavGZhBAmUzY5qzc= -github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240723023831-e67e46da4d26/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M= +github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240805061542-ddf011a69761 h1:Oz/Pa4dMUhGI3iAt47nrz55p6srdCOLwiWe7mGJVhbY= +github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240805061542-ddf011a69761/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M= github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/params/version.go b/params/version.go index bb061261f90..d8bc56acf16 100644 --- a/params/version.go +++ b/params/version.go @@ -34,10 +34,10 @@ var ( // see https://calver.org const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 2 // Minor version component of the current release - VersionMicro = 9 // Patch version component of the current release - VersionModifier = "dev" // Modifier component of the current release + VersionMajor = 3 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionMicro = 0 // Patch version component of the current release + VersionModifier = "alpha1" // Modifier component of the current release VersionKeyCreated = "ErigonVersionCreated" VersionKeyFinished = "ErigonVersionFinished" )