Merge branch 'develop' into test-scenario

Author: jkrvivian

.github/workflows/feature-network-deploy.yml

@@ -4,11 +4,6 @@ on:
     branches:
       - develop
   workflow_dispatch:
-    inputs:
-      snapshotUrl:
-        description: 'Custom snapshot URL:'
-        required: false
-        default: ""
 
 concurrency:
   group: feature-network-deploy-group
@@ -62,13 +57,6 @@ jobs:
         working-directory: tools/genesis-snapshot
         run: go run -tags=rocksdb . --config feature --seed 7R1itJx5hVuo9w9hjg5cwKFmek4HMSoBDgJZN8hKGxih --filename genesis-snapshot.bin
 
-      - name: Upload snapshot
-        id: upload-snapshot
-        run: |
-          SNAPSHOT_URL=$(curl -T ./tools/genesis-snapshot/genesis-snapshot.bin https://transfer.sh)
-          echo "Snapshot URL: $SNAPSHOT_URL"
-          echo "snapshot_url=$SNAPSHOT_URL" >> $GITHUB_OUTPUT
-
       - # Temp fix
         # https://github.com/docker/build-push-action/issues/252
         # https://github.com/moby/buildkit/issues/1896
@@ -92,8 +80,6 @@ jobs:
 
       - name: Ansible deploy
         env:
-          CUSTOM_SNAPSHOT_URL: '${{ github.event.inputs.snapshotUrl }}'
-          DEFAULT_SNAPSHOT_URL: '${{ steps.upload-snapshot.outputs.snapshot_url }}'
           NETWORK_ENVIRONMENT: '${{ secrets.NETWORK_ENVIRONMENT }}'
           IOTA_CORE_DOCKER_IMAGE_REPO: 'iotaledger/iota-core'
           IOTA_CORE_DOCKER_IMAGE_TAG: 'feature'

components/app/app.go

@@ -11,9 +11,9 @@ import (
 	dashboardmetrics "github.com/iotaledger/iota-core/components/dashboard_metrics"
 	"github.com/iotaledger/iota-core/components/debugapi"
 	"github.com/iotaledger/iota-core/components/inx"
-	"github.com/iotaledger/iota-core/components/metrics"
 	"github.com/iotaledger/iota-core/components/metricstracker"
 	"github.com/iotaledger/iota-core/components/p2p"
+	"github.com/iotaledger/iota-core/components/prometheus"
 	"github.com/iotaledger/iota-core/components/protocol"
 	"github.com/iotaledger/iota-core/components/restapi"
 	coreapi "github.com/iotaledger/iota-core/components/restapi/core"
@@ -25,7 +25,7 @@ var (
 	Name = "iota-core"
 
 	// Version of the app.
-	Version = "1.0.0-alpha.1"
+	Version = "1.0.0-alpha.2"
 )
 
 func App() *app.App {
@@ -49,7 +49,7 @@ Command line flags:
 			protocol.Component,
 			dashboardmetrics.Component,
 			dashboard.Component,
-			metrics.Component,
+			prometheus.Component,
 			inx.Component,
 		),
 	)

components/debugapi/component.go

@@ -79,13 +79,13 @@ func configure() error {
 	blocksPerSlot = shrinkingmap.New[iotago.SlotIndex, []*blocks.Block]()
 	blocksPrunableStorage = prunable.NewBucketManager(database.Config{
 		Engine:    hivedb.EngineRocksDB,
-		Directory: ParamsDebugAPI.Path,
+		Directory: ParamsDebugAPI.Database.Path,
 
 		Version:      1,
 		PrefixHealth: []byte{debugPrefixHealth},
 	}, func(err error) {
 		Component.LogWarnf(">> DebugAPI Error: %s\n", err)
-	}, prunable.WithMaxOpenDBs(ParamsDebugAPI.MaxOpenDBs),
+	}, prunable.WithMaxOpenDBs(ParamsDebugAPI.Database.MaxOpenDBs),
 	)
 
 	routeGroup := deps.RestRouteManager.AddRoute("debug/v2")
@@ -98,7 +98,7 @@ func configure() error {
 
 	deps.Protocol.Events.Engine.SlotGadget.SlotFinalized.Hook(func(index iotago.SlotIndex) {
 		epoch := deps.Protocol.APIForSlot(index).TimeProvider().EpochFromSlot(index)
-		if epoch < iotago.EpochIndex(ParamsDebugAPI.PruningThreshold) {
+		if epoch < iotago.EpochIndex(ParamsDebugAPI.Database.Pruning.Threshold) {
 			return
 		}
 
@@ -107,7 +107,7 @@ func configure() error {
 			lastPruned++
 		}
 
-		for i := lastPruned; i < epoch-iotago.EpochIndex(ParamsDebugAPI.PruningThreshold); i++ {
+		for i := lastPruned; i < epoch-iotago.EpochIndex(ParamsDebugAPI.Database.Pruning.Threshold); i++ {
 			if err := blocksPrunableStorage.Prune(i); err != nil {
 				Component.LogWarnf(">> DebugAPI Error: %s\n", err)
 			}

components/debugapi/params.go

@@ -9,10 +9,14 @@ type ParametersDebugAPI struct {
 	// Enabled whether the DebugAPI component is enabled.
 	Enabled bool `default:"true" usage:"whether the DebugAPI component is enabled"`
 
-	Path             string `default:"testnet/debug" usage:"the path to the database folder"`
-	MaxOpenDBs       int    `default:"2" usage:"maximum number of open database instances"`
-	PruningThreshold uint64 `default:"1" usage:"how many epochs should be retained"`
-	DBGranularity    int64  `default:"100" usage:"how many slots should be contained in a single DB instance"`
+	Database struct {
+		Path        string `default:"testnet/debug" usage:"the path to the database folder"`
+		MaxOpenDBs  int    `default:"2" usage:"maximum number of open database instances"`
+		Granularity int64  `default:"100" usage:"how many slots should be contained in a single DB instance"`
+		Pruning     struct {
+			Threshold uint64 `default:"1" usage:"how many epochs should be retained"`
+		}
+	} `name:"db"`
 }
 
 // ParamsDebugAPI is the default configuration parameters for the DebugAPI component.

components/p2p/params.go

@@ -13,7 +13,7 @@ const (
 // ParametersP2P contains the definition of configuration parameters used by the p2p plugin.
 type ParametersP2P struct {
 	// BindAddress defines on which multi addresses the p2p service should listen on.
-	BindMultiAddresses []string `default:"/ip4/0.0.0.0/tcp/14666,/ip6/::/tcp/14666" usage:"the bind multi addresses for p2p connections"`
+	BindMultiAddresses []string `default:"/ip4/0.0.0.0/tcp/15600,/ip6/::/tcp/15600" usage:"the bind multi addresses for p2p connections"`
 
 	ConnectionManager struct {
 		// Defines the high watermark to use within the connection manager.

…mponents/metrics/collector/collection.go …nents/prometheus/collector/collection.gocomponents/metrics/collector/collection.go renamed to components/prometheus/collector/collection.go components/metrics/collector/collection.go renamed to components/prometheus/collector/collection.go

@@ -1,6 +1,6 @@
-package metrics
+package prometheus
 
-// metrics is the plugin instance responsible for collection of prometheus metrics.
+// prometheus is the plugin instance responsible for collection of prometheus metrics.
 // All metrics should be defined in metrics_namespace.go files with different namespace for each new collection.
 // Metrics naming should follow the guidelines from: https://prometheus.io/docs/practices/naming/
 // In short:
@@ -22,14 +22,14 @@ import (
 
 	"github.com/iotaledger/hive.go/app"
 	"github.com/iotaledger/hive.go/ierrors"
-	"github.com/iotaledger/iota-core/components/metrics/collector"
+	"github.com/iotaledger/iota-core/components/prometheus/collector"
 	"github.com/iotaledger/iota-core/pkg/daemon"
 	"github.com/iotaledger/iota-core/pkg/protocol"
 )
 
 func init() {
 	Component = &app.Component{
-		Name:     "Metrics",
+		Name:     "Prometheus",
 		DepsFunc: func(cDeps dependencies) { deps = cDeps },
 		Params:   params,
 		Run:      run,

components/metrics/collector/collector.go …onents/prometheus/collector/collector.gocomponents/metrics/collector/collector.go renamed to components/prometheus/collector/collector.go components/metrics/collector/collector.go renamed to components/prometheus/collector/collector.go

@@ -1,10 +1,10 @@
-package metrics
+package prometheus
 
 import (
 	"time"
 
 	"github.com/iotaledger/hive.go/runtime/event"
-	"github.com/iotaledger/iota-core/components/metrics/collector"
+	"github.com/iotaledger/iota-core/components/prometheus/collector"
 	"github.com/iotaledger/iota-core/pkg/protocol/engine/blocks"
 )