fixup! [GH-846] Added bootstrap-url parameter for simple initialization of archive node.

Author: Un1oR

nil/client/client.go

@@ -14,6 +14,7 @@ import (
 	"github.com/NilFoundation/nil/nil/internal/contracts"
 	"github.com/NilFoundation/nil/nil/internal/types"
 	"github.com/NilFoundation/nil/nil/services/rpc/jsonrpc"
+	rpctypes "github.com/NilFoundation/nil/nil/services/rpc/types"
 	"github.com/NilFoundation/nil/nil/services/txnpool"
 )
 
@@ -132,6 +133,8 @@ type Client interface {
 
 	// GetDebugContract retrieves smart contract with its data, such as code, storage and proof
 	GetDebugContract(ctx context.Context, contractAddr types.Address, blockId any) (*jsonrpc.DebugRPCContract, error)
+
+	GetBootstrapConfig(ctx context.Context) (*rpctypes.BootstrapConfig, error)
 }
 
 func EstimateFeeExternal(

nil/client/direct_client.go

@@ -15,6 +15,7 @@ import (
 	"github.com/NilFoundation/nil/nil/services/rpc/jsonrpc"
 	"github.com/NilFoundation/nil/nil/services/rpc/rawapi"
 	"github.com/NilFoundation/nil/nil/services/rpc/transport"
+	rpctypes "github.com/NilFoundation/nil/nil/services/rpc/types"
 )
 
 // DirectClient is a client that interacts with the end api directly, without using the rpc server.
@@ -438,3 +439,7 @@ func (c *DirectClient) GetTxpoolStatus(ctx context.Context, shardId types.ShardI
 func (c *DirectClient) GetTxpoolContent(ctx context.Context, shardId types.ShardId) (jsonrpc.TxPoolContent, error) {
 	return c.txPoolApi.GetTxpoolContent(ctx, shardId)
 }
+
+func (c *DirectClient) GetBootstrapConfig(ctx context.Context) (*rpctypes.BootstrapConfig, error) {
+	return c.debugApi.GetBootstrapConfig(ctx)
+}

nil/client/rpc/client.go

@@ -25,6 +25,7 @@ import (
 	"github.com/NilFoundation/nil/nil/internal/types"
 	"github.com/NilFoundation/nil/nil/services/rpc/jsonrpc"
 	"github.com/NilFoundation/nil/nil/services/rpc/transport"
+	rpctypes "github.com/NilFoundation/nil/nil/services/rpc/types"
 )
 
 // CallError represents an error that occurs during a remote procedure call,
@@ -79,6 +80,7 @@ const (
 	Debug_getBlockByHash                 = "debug_getBlockByHash"
 	Debug_getBlockByNumber               = "debug_getBlockByNumber"
 	Debug_getContract                    = "debug_getContract"
+	Debug_getBootstrapConfig             = "debug_getBootstrapConfig"
 	Web3_clientVersion                   = "web3_clientVersion"
 	Dev_doPanicOnShard                   = "dev_doPanicOnShard"
 	Txpool_getTxpoolStatus               = "txpool_getTxpoolStatus"
@@ -951,6 +953,18 @@ func (c *Client) DoPanicOnShard(ctx context.Context, shardId types.ShardId) (uin
 	return 0, err
 }
 
+func (c *Client) GetTxpoolStatus(ctx context.Context, shardId types.ShardId) (jsonrpc.TxPoolStatus, error) {
+	return simpleCall[jsonrpc.TxPoolStatus](ctx, c, Txpool_getTxpoolStatus, shardId)
+}
+
+func (c *Client) GetTxpoolContent(ctx context.Context, shardId types.ShardId) (jsonrpc.TxPoolContent, error) {
+	return simpleCall[jsonrpc.TxPoolContent](ctx, c, Txpool_getTxpoolContent, shardId)
+}
+
+func (c *Client) GetBootstrapConfig(ctx context.Context) (*rpctypes.BootstrapConfig, error) {
+	return simpleCall[*rpctypes.BootstrapConfig](ctx, c, Debug_getBootstrapConfig)
+}
+
 func simpleCall[ReturnType any](ctx context.Context, c *Client, method string, params ...any) (ReturnType, error) {
 	res, err := c.call(ctx, method, params...)
 	var result ReturnType
@@ -977,11 +991,3 @@ func simpleCallUint64[ReturnType ~uint64](
 	}
 	return ReturnType(result), err
 }
-
-func (c *Client) GetTxpoolStatus(ctx context.Context, shardId types.ShardId) (jsonrpc.TxPoolStatus, error) {
-	return simpleCall[jsonrpc.TxPoolStatus](ctx, c, Txpool_getTxpoolStatus, shardId)
-}
-
-func (c *Client) GetTxpoolContent(ctx context.Context, shardId types.ShardId) (jsonrpc.TxPoolContent, error) {
-	return simpleCall[jsonrpc.TxPoolContent](ctx, c, Txpool_getTxpoolContent, shardId)
-}

nil/cmd/nild/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"os"
 	"time"
@@ -22,7 +21,6 @@ import (
 	"github.com/NilFoundation/nil/nil/services/indexer"
 	"github.com/NilFoundation/nil/nil/services/nilservice"
 	"github.com/NilFoundation/nil/nil/services/rpc/transport"
-	rpctypes "github.com/NilFoundation/nil/nil/services/rpc/types"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
@@ -104,19 +102,16 @@ func addBasicFlags(fset *pflag.FlagSet, cfg *nildconfig.Config) {
 		&cfg.CollatorTickPeriodMs, "collator-tick-ms", cfg.CollatorTickPeriodMs, "collator tick period in milliseconds")
 }
 
-func doBootstrapRequestAndPatchConfig(bootstrapUrl string, cfg *nildconfig.Config, logger logging.Logger) error {
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+func doBootstrapRequestAndPatchConfig(
+	ctx context.Context,
+	bootstrapUrl string,
+	cfg *nildconfig.Config,
+	logger logging.Logger,
+) error {
+	ctx, cancel := context.WithTimeout(ctx, 15*time.Second)
 	defer cancel()
 
-	client := rpc_client.NewRawClient(bootstrapUrl, logger)
-	response, err := client.RawCall(ctx, "debug_getBootstrapConfig")
-	if err != nil {
-		logger.Error().Err(err).Msg("failed to fetch bootstrap config")
-		return err
-	}
-
-	var bootstrapConfig rpctypes.BootstrapConfig
-	err = json.Unmarshal(response, &bootstrapConfig)
+	bootstrapConfig, err := rpc_client.NewClient(bootstrapUrl, logger).GetBootstrapConfig(ctx)
 	if err != nil {
 		return err
 	}
@@ -233,7 +228,7 @@ func parseArgs(logger logging.Logger) *nildconfig.Config {
 			cfg.RunMode = nilservice.ArchiveRunMode
 
 			if bootstrapUrl != "" {
-				return doBootstrapRequestAndPatchConfig(bootstrapUrl, cfg, logger)
+				return doBootstrapRequestAndPatchConfig(cmd.Context(), bootstrapUrl, cfg, logger)
 			}
 
 			return nil

nil/internal/network/addr_info.go

@@ -51,16 +51,12 @@ func (a *AddrInfo) UnmarshalText(text []byte) error {
 	return a.Set(string(text))
 }
 
-func (a AddrInfo) MarshalYAML() (any, error) {
-	return a.String(), nil
+func (a *AddrInfo) MarshalYAML() (any, error) {
+	return a.MarshalText()
 }
 
 func (a *AddrInfo) UnmarshalYAML(value *yaml.Node) error {
-	var str string
-	if err := value.Decode(&str); err != nil {
-		return err
-	}
-	return a.Set(str)
+	return a.UnmarshalText([]byte(value.Value))
 }
 
 type AddrInfoSlice = common.PValueSlice[*AddrInfo, AddrInfo]

nil/internal/network/host.go

@@ -89,7 +89,11 @@ func newHost(ctx context.Context, conf *Config) (Host, logging.Logger, error) {
 	}
 
 	if conf.ServeRelay {
-		options = append(options, libp2p.EnableRelayService(relay.WithInfiniteLimits()))
+		options = append(options, libp2p.EnableRelayService(
+			// We temporarily disable the limitation because proxying traffic through a relay is the simplest
+			// way to make the whole system work. Later we should study EnableAutoNATv2 and
+			// EnableHolePunching more carefully to move to direct peer-to-peer connections.
+			relay.WithInfiniteLimits()))
 
 		// todo: remove it after relay is tested
 		// this is to make sure that the relay is not disabled