Merge branch 'ledgerwatch:devel' into devel

maticnetwork · Dec 8, 2022 · 2041735 · 2041735
2 parents 7498251 + 70b18af
commit 2041735
Show file tree

Hide file tree

Showing 230 changed files with 4,857 additions and 3,069 deletions.
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -36,8 +36,8 @@ jobs:
       - name: test-integration
         run: make test-integration
 
-#      - name: history-v3-test-integration
-#        run: make test3-integration
+      - name: history-v3-test-integration
+        run: make test3-integration
 
   tests-windows:
     strategy:

diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ GO_FLAGS += -trimpath -tags $(BUILD_TAGS) -buildvcs=false
 GO_FLAGS += -ldflags "-X ${PACKAGE}/params.GitCommit=${GIT_COMMIT} -X ${PACKAGE}/params.GitBranch=${GIT_BRANCH} -X ${PACKAGE}/params.GitTag=${GIT_TAG}"
 
 GOBUILD = $(CGO_CFLAGS) $(GO) build $(GO_FLAGS)
-GO_DBG_BUILD = $(DBG_CGO_CFLAGS) $(GO) build $(GO_FLAGS) -tags $(BUILD_TAGS),debug -gcflags=all="-N -l"  # see delve docs
+GO_DBG_BUILD = $(GO) build $(GO_FLAGS) -tags $(BUILD_TAGS),debug -gcflags=all="-N -l"  # see delve docs
 GOTEST = $(CGO_CFLAGS) GODEBUG=cgocheck=0 $(GO) test $(GO_FLAGS) ./... -p 2
 
 default: all
@@ -279,6 +279,7 @@ coverage:
 .PHONY: hive
 hive:
 	DOCKER_TAG=thorax/erigon:ci-local make docker
+	docker pull thorax/hive:latest
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(OUTPUT_DIR):/work thorax/hive:latest --sim $(SIM) --results-root=/work/results --client erigon_ci-local # run erigon
 
 ## help:                              print commands help

diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
@@ -35,6 +35,7 @@ import (
 	"github.com/ledgerwatch/erigon/common/hexutil"
 	"github.com/ledgerwatch/erigon/common/math"
 	"github.com/ledgerwatch/erigon/common/u256"
+	"github.com/ledgerwatch/erigon/consensus"
 	"github.com/ledgerwatch/erigon/consensus/ethash"
 	"github.com/ledgerwatch/erigon/core"
 	"github.com/ledgerwatch/erigon/core/rawdb"
@@ -119,7 +120,8 @@ func (b *SimulatedBackend) Agg() *state2.Aggregator22 { return b.m.HistoryV3Comp
 func (b *SimulatedBackend) BlockReader() *snapshotsync.BlockReaderWithSnapshots {
 	return snapshotsync.NewBlockReaderWithSnapshots(b.m.BlockSnapshots)
 }
-func (b *SimulatedBackend) HistoryV3() bool { return b.m.HistoryV3 }
+func (b *SimulatedBackend) HistoryV3() bool          { return b.m.HistoryV3 }
+func (b *SimulatedBackend) Engine() consensus.Engine { return b.m.Engine }
 
 // Close terminates the underlying blockchain's update loop.
 func (b *SimulatedBackend) Close() {

diff --git a/cl/clparams/config.go b/cl/clparams/config.go
@@ -34,11 +34,11 @@ const (
 )
 
 const (
-	MaxDialTimeout               = 10 * time.Second
+	MaxDialTimeout               = 2 * time.Second
 	VersionLength  int           = 4
 	MaxChunkSize   uint64        = 1 << 20 // 1 MiB
-	ReqTimeout     time.Duration = 5 * time.Second
-	RespTimeout    time.Duration = 15 * time.Second
+	ReqTimeout     time.Duration = 1 * time.Second
+	RespTimeout    time.Duration = 3 * time.Second
 )
 
 var (
@@ -430,7 +430,7 @@ func configForkNames(b *BeaconChainConfig) map[[VersionLength]byte]string {
 	return fvn
 }
 
-var mainnetBeaconConfig BeaconChainConfig = BeaconChainConfig{
+var MainnetBeaconConfig BeaconChainConfig = BeaconChainConfig{
 	// Constants (Non-configurable)
 	FarFutureEpoch:           math.MaxUint64,
 	FarFutureSlot:            math.MaxUint64,
@@ -622,13 +622,13 @@ var mainnetBeaconConfig BeaconChainConfig = BeaconChainConfig{
 }
 
 func mainnetConfig() BeaconChainConfig {
-	cfg := mainnetBeaconConfig
+	cfg := MainnetBeaconConfig
 	cfg.InitializeForkSchedule()
 	return cfg
 }
 
 func sepoliaConfig() BeaconChainConfig {
-	cfg := mainnetBeaconConfig
+	cfg := MainnetBeaconConfig
 	cfg.MinGenesisTime = 1655647200
 	cfg.GenesisDelay = 86400
 	cfg.MinGenesisActiveValidatorCount = 1300
@@ -648,7 +648,7 @@ func sepoliaConfig() BeaconChainConfig {
 }
 
 func goerliConfig() BeaconChainConfig {
-	cfg := mainnetBeaconConfig
+	cfg := MainnetBeaconConfig
 	cfg.MinGenesisTime = 1614588812
 	cfg.GenesisDelay = 1919188
 	cfg.ConfigName = "prater"

diff --git a/cl/cltypes/Makefile b/cl/cltypes/Makefile
@@ -1,5 +1,5 @@
 all:
-	go run github.com/ferranbt/fastssz/sszgen -path types.go 
-	go run github.com/ferranbt/fastssz/sszgen -path network.go 	
+	go run github.com/prysmaticlabs/fastssz/sszgen -path types.go 
+	go run github.com/prysmaticlabs/fastssz/sszgen -path network.go 	
 clean:
 	rm lightrpc/*.pb.go
diff --git a/cl/cltypes/custom_types.go b/cl/cltypes/custom_types.go
@@ -1,8 +1,8 @@
 package cltypes
 
 import (
-	ssz "github.com/ferranbt/fastssz"
 	"github.com/pkg/errors"
+	ssz "github.com/prysmaticlabs/fastssz"
 )
 
 const (