merge devel

Author: AskAlexSharov

cmd/downloader/main.go

@@ -13,6 +13,8 @@ import (
 	"strings"
 	"time"
 
+	_ "github.com/ledgerwatch/erigon/core/snaptype" //hack
+
 	"github.com/anacrolix/torrent/metainfo"
 	"github.com/c2h5oh/datasize"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"

cmd/integration/main.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	_ "github.com/ledgerwatch/erigon/core/snaptype" //hack
+
 	"github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon/cmd/integration/commands"
 )