Multi-chain cleanup

clients/iota-go/hw_ledger/ledger-go/ledger_test.go

@@ -111,7 +111,6 @@ func Test_BasicExchange(t *testing.T) {
 
 	for i := 0; i < 10; i++ {
 		response, err := ledger.Exchange(message)
-
 		if err != nil {
 			fmt.Printf("iteration %d\n", i)
 			t.Fatalf("Error: %s", err.Error())

clients/iota-go/hw_ledger/ledger_test.go

@@ -78,7 +78,6 @@ func TestDeployChain(t *testing.T) {
 	require.NoError(t, err)
 
 	fmt.Println(result)
-
 }
 
 func TestSign(t *testing.T) {

clients/iota-go/iotaclient/client.go

@@ -22,11 +22,13 @@ type WaitParams struct {
 	DelayBetweenAttempts time.Duration
 }
 
-var WaitForEffectsDisabled *WaitParams = nil
-var WaitForEffectsEnabled *WaitParams = &WaitParams{
-	Attempts:             5,
-	DelayBetweenAttempts: 2 * time.Second,
-}
+var (
+	WaitForEffectsDisabled *WaitParams = nil
+	WaitForEffectsEnabled  *WaitParams = &WaitParams{
+		Attempts:             5,
+		DelayBetweenAttempts: 2 * time.Second,
+	}
+)
 
 type transport interface {
 	Call(ctx context.Context, v any, method iotaconn.JsonRPCMethod, args ...any) error

clients/iota-go/iotaconn/websocket.go

@@ -34,7 +34,6 @@ func NewWebsocketClient(
 	url string,
 	log log.Logger,
 ) (*WebsocketClient, error) {
-
 	c := &WebsocketClient{
 		url:           url,
 		writeQueue:    make(chan *jsonrpcMessage),

clients/iota-go/iotago/iotatest/test_values.go

@@ -35,8 +35,10 @@ func testTransactionData(packageAddr, senderAddr *iotago.Address) *iotago.Transa
 	return &tx
 }
 
-var TestAddress = iotago.AddressFromArray([iotago.AddressLen]byte(testval.TestBytes(iotago.AddressLen)))
-var TestDigest = iotago.MustNewDigest(testval.TestHex(iotago.DigestSize))
+var (
+	TestAddress = iotago.AddressFromArray([iotago.AddressLen]byte(testval.TestBytes(iotago.AddressLen)))
+	TestDigest  = iotago.MustNewDigest(testval.TestHex(iotago.DigestSize))
+)
 
 var TestObjectRef = &iotago.ObjectRef{
 	ObjectID: TestAddress,

clients/multiclient/reqstatus.go

@@ -14,7 +14,7 @@ import (
 )
 
 // WaitUntilRequestProcessed blocks until the request has been processed by all nodes
-func (m *MultiClient) WaitUntilRequestProcessed(ctx context.Context, chainID isc.ChainID, reqID isc.RequestID, waitForL1Confirmation bool, timeout time.Duration) (*apiclient.ReceiptResponse, error) {
+func (m *MultiClient) WaitUntilRequestProcessed(ctx context.Context, reqID isc.RequestID, waitForL1Confirmation bool, timeout time.Duration) (*apiclient.ReceiptResponse, error) {
 	oldTimeout := m.Timeout
 	defer func() { m.Timeout = oldTimeout }()
 
@@ -37,8 +37,8 @@ func (m *MultiClient) WaitUntilRequestProcessed(ctx context.Context, chainID isc
 
 // WaitUntilRequestProcessedSuccessfully is similar to WaitUntilRequestProcessed,
 // but also checks the receipt and return an error if the request was processed with an error
-func (m *MultiClient) WaitUntilRequestProcessedSuccessfully(ctx context.Context, chainID isc.ChainID, reqID isc.RequestID, waitForL1Confirmation bool, timeout time.Duration) (*apiclient.ReceiptResponse, error) {
-	receipt, err := m.WaitUntilRequestProcessed(ctx, chainID, reqID, waitForL1Confirmation, timeout)
+func (m *MultiClient) WaitUntilRequestProcessedSuccessfully(ctx context.Context, reqID isc.RequestID, waitForL1Confirmation bool, timeout time.Duration) (*apiclient.ReceiptResponse, error) {
+	receipt, err := m.WaitUntilRequestProcessed(ctx, reqID, waitForL1Confirmation, timeout)
 	if err != nil {
 		return receipt, err
 	}
@@ -50,9 +50,9 @@ func (m *MultiClient) WaitUntilRequestProcessedSuccessfully(ctx context.Context,
 
 // WaitUntilEVMRequestProcessedSuccessfully is similar to WaitUntilRequestProcessed,
 // but also checks the receipt and return an error if the request was processed with an error
-func (m *MultiClient) WaitUntilEVMRequestProcessedSuccessfully(ctx context.Context, chainID isc.ChainID, txHash common.Hash, waitForL1Confirmation bool, timeout time.Duration) (*apiclient.ReceiptResponse, error) {
+func (m *MultiClient) WaitUntilEVMRequestProcessedSuccessfully(ctx context.Context, txHash common.Hash, waitForL1Confirmation bool, timeout time.Duration) (*apiclient.ReceiptResponse, error) {
 	requestID := isc.RequestIDFromEVMTxHash(txHash)
-	receipt, err := m.WaitUntilRequestProcessed(ctx, chainID, requestID, waitForL1Confirmation, timeout)
+	receipt, err := m.WaitUntilRequestProcessed(ctx, requestID, waitForL1Confirmation, timeout)
 	if err != nil {
 		return receipt, err
 	}
@@ -64,7 +64,7 @@ func (m *MultiClient) WaitUntilEVMRequestProcessedSuccessfully(ctx context.Conte
 
 // WaitUntilAllRequestsProcessed blocks until all requests in the given transaction have been processed
 // by all nodes
-func (m *MultiClient) WaitUntilAllRequestsProcessed(ctx context.Context, chainID isc.ChainID, tx *iotajsonrpc.IotaTransactionBlockResponse, waitForL1Confirmation bool, timeout time.Duration) ([]*apiclient.ReceiptResponse, error) {
+func (m *MultiClient) WaitUntilAllRequestsProcessed(ctx context.Context, tx *iotajsonrpc.IotaTransactionBlockResponse, waitForL1Confirmation bool, timeout time.Duration) ([]*apiclient.ReceiptResponse, error) {
 	oldTimeout := m.Timeout
 	defer func() { m.Timeout = oldTimeout }()
 
@@ -82,8 +82,8 @@ func (m *MultiClient) WaitUntilAllRequestsProcessed(ctx context.Context, chainID
 
 // WaitUntilAllRequestsProcessedSuccessfully is similar to WaitUntilAllRequestsProcessed
 // but also checks the receipts and return an error if any of the requests was processed with an error
-func (m *MultiClient) WaitUntilAllRequestsProcessedSuccessfully(ctx context.Context, chainID isc.ChainID, tx *iotajsonrpc.IotaTransactionBlockResponse, waitForL1Confirmation bool, timeout time.Duration) ([]*apiclient.ReceiptResponse, error) {
-	receipts, err := m.WaitUntilAllRequestsProcessed(ctx, chainID, tx, waitForL1Confirmation, timeout)
+func (m *MultiClient) WaitUntilAllRequestsProcessedSuccessfully(ctx context.Context, tx *iotajsonrpc.IotaTransactionBlockResponse, waitForL1Confirmation bool, timeout time.Duration) ([]*apiclient.ReceiptResponse, error) {
+	receipts, err := m.WaitUntilAllRequestsProcessed(ctx, tx, waitForL1Confirmation, timeout)
 	if err != nil {
 		return receipts, err
 	}

components/app/app.go

@@ -8,7 +8,7 @@ import (
 	"github.com/iotaledger/hive.go/app/components/profiling"
 	"github.com/iotaledger/hive.go/app/components/shutdown"
 	"github.com/iotaledger/wasp/v2/components/cache"
-	"github.com/iotaledger/wasp/v2/components/chains"
+	"github.com/iotaledger/wasp/v2/components/chainrunner"
 	"github.com/iotaledger/wasp/v2/components/database"
 	"github.com/iotaledger/wasp/v2/components/dkg"
 	"github.com/iotaledger/wasp/v2/components/logger"
@@ -48,7 +48,7 @@ func App() *app.App {
 			peering.Component,
 			dkg.Component,
 			processors.Component,
-			chains.Component,
+			chainrunner.Component,
 			publisher.Component,
 			webapi.Component,
 			profiling.Component,

components/chains/component.go → components/chainrunner/component.go

@@ -1,4 +1,4 @@
-package chains
+package chainrunner
 
 import (
 	"context"
@@ -13,7 +13,7 @@ import (
 	"github.com/iotaledger/wasp/v2/packages/chain"
 	"github.com/iotaledger/wasp/v2/packages/chain/cmtlog"
 	"github.com/iotaledger/wasp/v2/packages/chain/mempool"
-	"github.com/iotaledger/wasp/v2/packages/chains"
+	chainrunner "github.com/iotaledger/wasp/v2/packages/chainrunner"
 	"github.com/iotaledger/wasp/v2/packages/daemon"
 	"github.com/iotaledger/wasp/v2/packages/database"
 	"github.com/iotaledger/wasp/v2/packages/metrics"
@@ -44,7 +44,7 @@ type dependencies struct {
 	dig.In
 
 	ShutdownHandler *hiveshutdown.ShutdownHandler
-	Chains          *chains.Chains
+	Chains          *chainrunner.ChainRunner
 }
 
 func initConfigParams(c *dig.Container) error {
@@ -55,16 +55,16 @@ func initConfigParams(c *dig.Container) error {
 
 	if err := c.Provide(func() cfgResult {
 		return cfgResult{
-			APICacheTTL: ParamsChains.APICacheTTL,
+			APICacheTTL: ParamsChainRunner.APICacheTTL,
 		}
 	}); err != nil {
 		Component.LogPanic(err.Error())
 	}
 
-	chain.RedeliveryPeriod = ParamsChains.RedeliveryPeriod
-	chain.PrintStatusPeriod = ParamsChains.PrintStatusPeriod
-	chain.ConsensusInstsInAdvance = ParamsChains.ConsensusInstsInAdvance
-	chain.AwaitReceiptCleanupEvery = ParamsChains.AwaitReceiptCleanupEvery
+	chain.RedeliveryPeriod = ParamsChainRunner.RedeliveryPeriod
+	chain.PrintStatusPeriod = ParamsChainRunner.PrintStatusPeriod
+	chain.ConsensusInstsInAdvance = ParamsChainRunner.ConsensusInstsInAdvance
+	chain.AwaitReceiptCleanupEvery = ParamsChainRunner.AwaitReceiptCleanupEvery
 
 	return nil
 }
@@ -86,24 +86,24 @@ func provide(c *dig.Container) error {
 		ChainMetricsProvider        *metrics.ChainMetricsProvider
 	}
 
-	type chainsResult struct {
+	type chainRunnerResult struct {
 		dig.Out
 
-		Chains *chains.Chains
+		Runner *chainrunner.ChainRunner
 	}
 
-	if err := c.Provide(func(deps chainsDeps) chainsResult {
-		return chainsResult{
-			Chains: chains.New(
+	if err := c.Provide(func(deps chainsDeps) chainRunnerResult {
+		return chainRunnerResult{
+			Runner: chainrunner.New(
 				Component.Logger,
 				deps.NodeConnection,
 				deps.ProcessorsConfig,
 				ParamsValidator.Address,
-				ParamsChains.DeriveAliasOutputByQuorum,
-				ParamsChains.PipeliningLimit,
-				ParamsChains.PostponeRecoveryMilestones,
-				ParamsChains.ConsensusDelay,
-				ParamsChains.RecoveryTimeout,
+				ParamsChainRunner.DeriveAliasOutputByQuorum,
+				ParamsChainRunner.PipeliningLimit,
+				ParamsChainRunner.PostponeRecoveryMilestones,
+				ParamsChainRunner.ConsensusDelay,
+				ParamsChainRunner.RecoveryTimeout,
 				deps.NetworkProvider,
 				deps.TrustedNetworkManager,
 				deps.ChainStateDatabaseManager.ChainStateKVStore,
@@ -120,7 +120,7 @@ func provide(c *dig.Container) error {
 				ParamsStateManager.StateManagerTimerTickPeriod,
 				ParamsStateManager.PruningMinStatesToKeep,
 				ParamsStateManager.PruningMaxStatesToDelete,
-				ParamsSnapshotManager.SnapshotsToLoad,
+				ParamsSnapshotManager.SnapshotToLoad,
 				ParamsSnapshotManager.Period,
 				ParamsSnapshotManager.Delay,
 				ParamsSnapshotManager.LocalPath,
@@ -131,16 +131,16 @@ func provide(c *dig.Container) error {
 				deps.ConsensusStateRegistry,
 				deps.ChainListener,
 				mempool.Settings{
-					TTL:                        ParamsChains.MempoolTTL,
-					OnLedgerRefreshMinInterval: ParamsChains.MempoolOnLedgerRefreshMinInterval,
-					MaxOffledgerInPool:         ParamsChains.MempoolMaxOffledgerInPool,
-					MaxOnledgerInPool:          ParamsChains.MempoolMaxOnledgerInPool,
-					MaxTimedInPool:             ParamsChains.MempoolMaxTimedInPool,
-					MaxOnledgerToPropose:       ParamsChains.MempoolMaxOnledgerToPropose,
-					MaxOffledgerToPropose:      ParamsChains.MempoolMaxOffledgerToPropose,
-					MaxOffledgerPerAccount:     ParamsChains.MempoolMaxOffledgerPerAccount,
+					TTL:                        ParamsChainRunner.MempoolTTL,
+					OnLedgerRefreshMinInterval: ParamsChainRunner.MempoolOnLedgerRefreshMinInterval,
+					MaxOffledgerInPool:         ParamsChainRunner.MempoolMaxOffledgerInPool,
+					MaxOnledgerInPool:          ParamsChainRunner.MempoolMaxOnledgerInPool,
+					MaxTimedInPool:             ParamsChainRunner.MempoolMaxTimedInPool,
+					MaxOnledgerToPropose:       ParamsChainRunner.MempoolMaxOnledgerToPropose,
+					MaxOffledgerToPropose:      ParamsChainRunner.MempoolMaxOffledgerToPropose,
+					MaxOffledgerPerAccount:     ParamsChainRunner.MempoolMaxOffledgerPerAccount,
 				},
-				ParamsChains.BroadcastInterval,
+				ParamsChainRunner.BroadcastInterval,
 				shutdown.NewCoordinator("chains", Component.NewChildLogger("Shutdown")),
 				deps.ChainMetricsProvider,
 			),

components/chains/params.go → components/chainrunner/params.go

@@ -1,15 +1,15 @@
-// Package chains provides functionality for managing IOTA Smart Contract chains,
+// Package chains provides functionality for managing IOTA Smart Contract chain runner,
 // including chain configuration parameters, write-ahead logging, validator settings,
 // state management, and snapshot capabilities.
-package chains
+package chainrunner
 
 import (
 	"time"
 
 	"github.com/iotaledger/hive.go/app"
 )
 
-type ParametersChains struct {
+type ParametersChainRunner struct {
 	BroadcastUpToNPeers               int           `default:"2" usage:"number of peers an offledger request is broadcasted to"`
 	BroadcastInterval                 time.Duration `default:"0s" usage:"time between re-broadcast of offledger requests; 0 value means that re-broadcasting is disabled"`
 	APICacheTTL                       time.Duration `default:"300s" usage:"time to keep processed offledger requests in api cache"`
@@ -57,15 +57,15 @@
 }
 
 type ParametersSnapshotManager struct {
-	SnapshotsToLoad []string `default:"" usage:"list of snapshots to load; can be either single block hash of a snapshot (if a single chain has to be configured) or list of '<chainID>:<blockHash>' to configure many chains"`
-	Period          uint32   `default:"0" usage:"how often state snapshots should be made: 1000 meaning \"every 1000th state\", 0 meaning \"making snapshots is disabled\""`
-	Delay           uint32   `default:"20" usage:"how many states should pass before snapshot is produced"`
-	LocalPath       string   `default:"waspdb/snap" usage:"the path to the snapshots folder in this node's disk"`
-	NetworkPaths    []string `default:"" usage:"the list of paths to the remote (http(s)) snapshot locations; each of listed locations must contain 'INDEX' file with list of snapshot files"`
+	SnapshotToLoad string   `default:"" usage:"block hash of a snapshot to load"`
+	Period         uint32   `default:"0" usage:"how often state snapshots should be made: 1000 meaning \"every 1000th state\", 0 meaning \"making snapshots is disabled\""`
+	Delay          uint32   `default:"20" usage:"how many states should pass before snapshot is produced"`
+	LocalPath      string   `default:"waspdb/snap" usage:"the path to the snapshots folder in this node's disk"`
+	NetworkPaths   []string `default:"" usage:"the list of paths to the remote (http(s)) snapshot locations; each of listed locations must contain 'INDEX' file with list of snapshot files"`
 }
 
 var (
-	ParamsChains          = &ParametersChains{}
+	ParamsChainRunner     = &ParametersChainRunner{}
 	ParamsWAL             = &ParametersWAL{}
 	ParamsValidator       = &ParametersValidator{}
 	ParamsStateManager    = &ParametersStateManager{}
@@ -74,7 +74,7 @@
 
 var params = &app.ComponentParams{
 	Params: map[string]any{
-		"chains":       ParamsChains,
+		"chains":       ParamsChainRunner, // TODO: fix the name
 		"wal":          ParamsWAL,
 		"validator":    ParamsValidator,
 		"stateManager": ParamsStateManager,

components/nodeconn/component.go

@@ -13,7 +13,7 @@ import (
 	"github.com/iotaledger/hive.go/app/shutdown"
 
 	"github.com/iotaledger/wasp/v2/clients/iota-go/iotago"
-	"github.com/iotaledger/wasp/v2/components/chains"
+	"github.com/iotaledger/wasp/v2/components/chainrunner"
 	"github.com/iotaledger/wasp/v2/packages/chain"
 	"github.com/iotaledger/wasp/v2/packages/daemon"
 	"github.com/iotaledger/wasp/v2/packages/nodeconn"
@@ -54,7 +54,7 @@ func provide(c *dig.Container) error {
 		nodeConnection, err := nodeconn.New(
 			Component.Daemon().ContextStopped(),
 			*address,
-			chains.ParamsChains.MempoolMaxOnledgerInPool,
+			chainrunner.ParamsChainRunner.MempoolMaxOnledgerInPool,
 			ParamsL1.WebsocketURL,
 			ParamsL1.HTTPURL,
 			Component.NewChildLogger("nc"),

components/webapi/component.go

@@ -23,7 +23,7 @@ import (
 	"github.com/iotaledger/hive.go/web/websockethub"
 	"github.com/iotaledger/wasp/v2/packages/authentication"
 	"github.com/iotaledger/wasp/v2/packages/chain"
-	"github.com/iotaledger/wasp/v2/packages/chains"
+	"github.com/iotaledger/wasp/v2/packages/chainrunner"
 	"github.com/iotaledger/wasp/v2/packages/daemon"
 	"github.com/iotaledger/wasp/v2/packages/dkg"
 	"github.com/iotaledger/wasp/v2/packages/evm/jsonrpc"
@@ -216,7 +216,7 @@ func provide(c *dig.Container) error {
 		AppConfig                   *configuration.Configuration `name:"appConfig"`
 		ShutdownHandler             *shutdown.ShutdownHandler
 		APICacheTTL                 time.Duration `name:"apiCacheTTL"`
-		Chains                      *chains.Chains
+		Chains                      *chainrunner.ChainRunner
 		ChainMetricsProvider        *metrics.ChainMetricsProvider
 		ChainRecordRegistryProvider registry.ChainRecordRegistryProvider
 		DKShareRegistryProvider     registry.DKShareRegistryProvider
@@ -277,7 +277,7 @@ func provide(c *dig.Container) error {
 			deps.ChainRecordRegistryProvider,
 			deps.DKShareRegistryProvider,
 			deps.NodeIdentityProvider,
-			func() *chains.Chains {
+			func() *chainrunner.ChainRunner {
 				return deps.Chains
 			},
 			func() *dkg.Node {

components/webapi/webapi_test.go

@@ -46,8 +46,6 @@ func TestInternalServerErrors(t *testing.T) {
 		log.NewLogger(log.WithHandler(logger)),
 	)
 
-	time.Sleep(5 * time.Second)
-
 	// Add an endpoint that just panics with "foobar" and start the server
 	exceptionText := "foobar"
 	e.GET("/test", func(c echo.Context) error { panic(exceptionText) })
@@ -57,6 +55,8 @@ func TestInternalServerErrors(t *testing.T) {
 	}()
 	defer e.Shutdown(context.Background())
 
+	time.Sleep(5 * time.Second)
+
 	// query the endpoint
 	req, err := http.NewRequest(http.MethodGet, "http://localhost:9999/test", http.NoBody)
 	require.NoError(t, err)

config_defaults.json

@@ -88,7 +88,7 @@
     "mempoolOnLedgerRefreshMinInterval": "10m"
   },
   "snapshots": {
-    "snapshotsToLoad": [],
+    "snapshotToLoad": "",
     "period": 0,
     "delay": 20,
     "localPath": "waspdb/snap",

documentation/docs/configuration.md

@@ -337,7 +337,7 @@ Example:
 
 | Name            | Description                                                                                                                                                                   | Type   | Default value |
 | --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | ------------- |
-| snapshotsToLoad | List of snapshots to load; can be either single block hash of a snapshot (if a single chain has to be configured) or list of '<chainID>:<blockHash>' to configure many chains | array  |               |
+| snapshotToLoad | Single block hash of a snapshot | string  |               |
 | period          | How often state snapshots should be made: 1000 meaning "every 1000th state", 0 meaning "making snapshots is disabled"                                                         | uint   | 0             |
 | delay           | How many states should pass before snapshot is produced                                                                                                                       | uint   | 20            |
 | localPath       | The path to the snapshots folder in this node's disk                                                                                                                          | string | "waspdb/snap" |
@@ -348,7 +348,7 @@ Example:
 ```json
   {
     "snapshots": {
-      "snapshotsToLoad": [],
+      "snapshotToLoad": "",
       "period": 0,
       "delay": 20,
       "localPath": "waspdb/snap",