diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index fc4f066973d..b761e284a32 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -152,7 +152,7 @@ require ( replace ( github.com/anacrolix/torrent => github.com/erigontech/torrent v1.54.2-alpha-35 - github.com/erigontech/erigon-snapshot => github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240808142021-41f59a286e8a + github.com/erigontech/erigon-snapshot => github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240819113423-26b9bc53f3a1 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 8056e690d82..53eb410eb53 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -308,8 +308,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.20240808142021-41f59a286e8a h1:8ctLGQSZYl9o7V7SAlUmi6WczkJ7jVGklQfHlGiYH1k= -github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240808142021-41f59a286e8a/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M= +github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240819113423-26b9bc53f3a1 h1:eglPofkQ6WsTeHzrCPQ++P0RbYjsAaiQfIc74eXIeaA= +github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240819113423-26b9bc53f3a1/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 34d588a2f26..2821b1a54d8 100644 --- a/go.mod +++ b/go.mod @@ -315,7 +315,7 @@ require ( replace ( github.com/anacrolix/torrent => github.com/erigontech/torrent v1.54.2-alpha-35 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.20240808142021-41f59a286e8a + github.com/erigontech/erigon-snapshot => github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240819113423-26b9bc53f3a1 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 f85415c4f8e..1e8e6fb930a 100644 --- a/go.sum +++ b/go.sum @@ -732,8 +732,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.20240808142021-41f59a286e8a h1:8ctLGQSZYl9o7V7SAlUmi6WczkJ7jVGklQfHlGiYH1k= -github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240808142021-41f59a286e8a/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M= +github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240819113423-26b9bc53f3a1 h1:eglPofkQ6WsTeHzrCPQ++P0RbYjsAaiQfIc74eXIeaA= +github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240819113423-26b9bc53f3a1/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/turbo/snapshotsync/freezeblocks/block_reader.go b/turbo/snapshotsync/freezeblocks/block_reader.go index cedd076e342..22f7c4037b5 100644 --- a/turbo/snapshotsync/freezeblocks/block_reader.go +++ b/turbo/snapshotsync/freezeblocks/block_reader.go @@ -1194,7 +1194,7 @@ func (r *BlockReader) IntegrityTxnID(failFast bool) error { log.Error(err.Error()) } } - expectedFirstTxnID = b.BaseTxnID.LastSystemTx(uint32(sn.Count())) + 1 // +1 to move to first baseTxId of next block aka its first system tx + expectedFirstTxnID = expectedFirstTxnID + uint64(sn.Count()) } return nil }