diff --git a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard.json b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard.json index 29bc12b93..f464af4c6 100644 --- a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard.json +++ b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard.json @@ -1340,8 +1340,8 @@ { "current": { "selected": false, - "text": "faucet:9311", - "value": "faucet:9311" + "text": "validator-3:9311", + "value": "validator-3:9311" }, "datasource": { "type": "prometheus", diff --git a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard_old.json b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard_old.json index 7aeca0129..71fb84826 100644 --- a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard_old.json +++ b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard_old.json @@ -4847,8 +4847,8 @@ { "current": { "selected": false, - "text": "faucet:9311", - "value": "faucet:9311" + "text": "validator-3:9311", + "value": "validator-3:9311" }, "datasource": { "type": "prometheus", diff --git a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/scheduler-metrics.json b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/scheduler-metrics.json index 6208935e4..c3d8798c3 100644 --- a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/scheduler-metrics.json +++ b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/scheduler-metrics.json @@ -772,8 +772,8 @@ { "current": { "selected": true, - "text": "peer_master2:9311", - "value": "peer_master2:9311" + "text": "validator-2:9311", + "value": "validator-2:9311" }, "datasource": { "type": "prometheus", diff --git a/go.mod b/go.mod index fcfb506bd..8f58c8568 100644 --- a/go.mod +++ b/go.mod @@ -10,19 +10,19 @@ require ( github.com/google/uuid v1.3.1 github.com/gorilla/websocket v1.5.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2 + github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20231011161248-cf0bd6e08811 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20231011154428-257141868dad github.com/iotaledger/iota.go/v4 v4.0.0-20231019112751-e9872df31648 @@ -88,7 +88,7 @@ require ( github.com/huin/goupnp v1.3.0 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 // indirect - github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2 // indirect + github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38 // indirect github.com/ipfs/boxo v0.10.0 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-datastore v0.6.0 // indirect diff --git a/go.sum b/go.sum index 837cb6a9d..1de1123f2 100644 --- a/go.sum +++ b/go.sum @@ -277,34 +277,34 @@ github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJ github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PTNgli6EbS4tV9qu3QAm/kBU3XaYZV2xdzys= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= -github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2 h1:asyE+LxMChmcSix5rsms0L23jrlzJt616UoDijPpWTY= -github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:IFh0gDfeMgZtfCo+5afK59IDR4xXh+cTR9YtLnZPcbY= -github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2 h1:ZjcC0WoYVs64iMFHzodM8qsdncA9O2ItWA3A98JhHMo= -github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:8ZbIKR84oQd/3iQ5eeT7xpudO9/ytzXP7veIYnk7Orc= -github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2 h1:QPDVoivTVVJIYfXuWW2GpEZLFaJQutkevr2Wm/VKdu4= -github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2 h1:oVnQnvYgLEzlFxEu4DcHYfGqT5v+8fVQfAGyPMmZL6c= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2/go.mod h1:Mc+ACqBGPxrPMIPUBOm6/HL0J6m0iVMwjtIEKW3uow8= -github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2 h1:CTbrWBYM98pfpfdYNGfx/a8ub4SXrltjmeGjpB7Jkx4= -github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:h3o6okvMSEK3KOX6pOp3yq1h9ohTkTfo6X8MzEadeb0= -github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2 h1:8i4bvVO+paY/ZxWKr0OHw1xx8Kz9CUIg3+B5gVl7fjk= -github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:3XkUSKfHaVxGbT0XAvjNlVYqPzhfLTGhDtdNA5UBPco= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2 h1:rpBz3vmvDd2rab6kZE4b4NXkaNSKsJ7v74DLOsbBUlA= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2 h1:fgKzJkRaLIGUZpQaB6koK3tYagN2nSaGo1qXmNaKRaA= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:O/U3jtiUDeqqM0MZQFu2UPqS9fUm0C5hNISxlmg/thE= -github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2 h1:BUsL7XFucscD/7jtEpS/EbgFI08PhP4Af3gHNMRqkKA= -github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:s4kzx9QY1MVWHJralj+3q5kI0eARtrJhphYD/iBbPfo= -github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2 h1:Pm1UzKTgobqi1SSX7VG3wMYtahq4vagtOLI/xUypoto= -github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:JvokzmpmFZPDskMlUqqjgHtD8usVJU4nAY/TNMGge8M= -github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2 h1:+LqfdkgC1ahuAhTbXPIyydmni8IsvxNgZziM1cZKfmc= -github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:aBfAfIB2GO/IblhYt5ipCbyeL9bXSNeAwtYVA3hZaHg= -github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2 h1:7keivgxNXi2yqt6yx3TWMmZf9vBEaGM4UNpFuaRxg8E= -github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:jRw8yFipiPaqmTPHh7hTcxAP9u6pjRGpByS3REJKkbY= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2 h1:as3d3f7gH2/fR1997OWmRPpKwjY0E1X7Twc4LWBTEuE= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2/go.mod h1:SdK26z8/VhWtxaqCuQrufm80SELgowQPmu9T/8eUQ8g= -github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2 h1:virnPQxZvZ00VqcZBzTvPo5DLUZgIvH06YEhktwW224= -github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38 h1:/Td52GNRrMzh0lVKwQu/BbVciwrKn5LwtkWAzd41X4Q= +github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38/go.mod h1:IFh0gDfeMgZtfCo+5afK59IDR4xXh+cTR9YtLnZPcbY= +github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38 h1:t60nsq/lI168gM0WqIP44FDHk784uXy35P6uKt9WbMU= +github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38/go.mod h1:8ZbIKR84oQd/3iQ5eeT7xpudO9/ytzXP7veIYnk7Orc= +github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38 h1:xYh6+dUl+iocWofo0Z/0/OJGSdxYaPV1oYo1HlFj8+s= +github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38 h1:3OUYK9wgyH4U6xfGnLdU1QdYQ5dpS/6WRju+eXP051E= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38/go.mod h1:Mc+ACqBGPxrPMIPUBOm6/HL0J6m0iVMwjtIEKW3uow8= +github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38 h1:iXqM0/Y4poiiuNf+0tu3nUj9Dzp4slrWHJ8GXKgt2Zk= +github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38/go.mod h1:h3o6okvMSEK3KOX6pOp3yq1h9ohTkTfo6X8MzEadeb0= +github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38 h1:xyaKXgNt8CQ4t14Raqu/4+aBRZQunGOlK+T+99egkSA= +github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38/go.mod h1:3XkUSKfHaVxGbT0XAvjNlVYqPzhfLTGhDtdNA5UBPco= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38 h1:6I6PEdLuwiIpmiXFVEW5lPaNe+xFdaBR6NSHsNZ3o6c= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38 h1:SCBXTAhrLFs0o9EJxO9ZBGPyfq1VhOdb5pP7+vFhdtk= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38/go.mod h1:O/U3jtiUDeqqM0MZQFu2UPqS9fUm0C5hNISxlmg/thE= +github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38 h1:qks472rk/MjwwFvDrlpckxWTf4c1yd+k7ve/IkeuPYk= +github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38/go.mod h1:s4kzx9QY1MVWHJralj+3q5kI0eARtrJhphYD/iBbPfo= +github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38 h1:6HIBNKOWLXY5Gk1s+q93D6IsTcqwANigfMO3ePtV3HQ= +github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38/go.mod h1:JvokzmpmFZPDskMlUqqjgHtD8usVJU4nAY/TNMGge8M= +github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38 h1:lTp8+8GgFH63IMY0G9B90v2vmOlgo+c3XiZg4f0Te+I= +github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38/go.mod h1:aBfAfIB2GO/IblhYt5ipCbyeL9bXSNeAwtYVA3hZaHg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38 h1:lPiKbh8o/SN2FGCN9RF7iN1zE+KXCidp815GSOieU8s= +github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38/go.mod h1:jRw8yFipiPaqmTPHh7hTcxAP9u6pjRGpByS3REJKkbY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38 h1:njGr4TrKdpa66XyioxhDU3slV9gZOZeEg7/M8bjXw7M= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38/go.mod h1:SdK26z8/VhWtxaqCuQrufm80SELgowQPmu9T/8eUQ8g= +github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38 h1:jh0LHzzLqVO+SW9NkvNIgYo1g3CyTBnR8Qv3+PNH+dY= +github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20231011161248-cf0bd6e08811 h1:nR8uTm1Htn2RQOT53RV2zdCIflpuF8N00Tv2FWYimY0= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20231011161248-cf0bd6e08811/go.mod h1:rmclNpXw5sKJDHU0e51Ar/9zL00P7Uu9hkfaM7vAAiE= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20231011154428-257141868dad h1:TRM9EkAole9fYY1vHEVQ6zCEOGuvCWq/bczZ98Al5Ec= diff --git a/pkg/protocol/snapshotcreator/options.go b/pkg/protocol/snapshotcreator/options.go index 907838e78..f1da75f43 100644 --- a/pkg/protocol/snapshotcreator/options.go +++ b/pkg/protocol/snapshotcreator/options.go @@ -26,6 +26,9 @@ type Options struct { // Accounts defines the accounts that are created in the ledger as part of the Genesis. Accounts []AccountDetails + // BasicOutput defines the basic outputs that are created in the ledger as part of the Genesis. + BasicOutputs []BasicOutputDetails + DataBaseVersion byte LedgerProvider func() module.Provider[*engine.Engine, ledger.Ledger] } @@ -99,3 +102,16 @@ func WithAccounts(accounts ...AccountDetails) options.Option[Options] { m.Accounts = accounts } } + +// BasicOutputDetails is a struct that specifies details of a basic output created in the Genesis snapshot. +type BasicOutputDetails struct { + Address iotago.Address + Amount iotago.BaseToken + Mana iotago.Mana +} + +func WithBasicOutputs(basicOutputs ...BasicOutputDetails) options.Option[Options] { + return func(m *Options) { + m.BasicOutputs = basicOutputs + } +} diff --git a/pkg/protocol/snapshotcreator/snapshotcreator.go b/pkg/protocol/snapshotcreator/snapshotcreator.go index ae6270ae2..eae10d089 100644 --- a/pkg/protocol/snapshotcreator/snapshotcreator.go +++ b/pkg/protocol/snapshotcreator/snapshotcreator.go @@ -120,8 +120,12 @@ func CreateSnapshot(opts ...options.Option[Options]) error { return accumulator + details.Amount }, iotago.BaseToken(0)) + totalBasicOutputAmount := lo.Reduce(opt.BasicOutputs, func(accumulator iotago.BaseToken, details BasicOutputDetails) iotago.BaseToken { + return accumulator + details.Amount + }, iotago.BaseToken(0)) + var genesisTransactionOutputs iotago.TxEssenceOutputs - genesisOutput, err := createGenesisOutput(api, opt.ProtocolParameters.TokenSupply()-totalAccountAmount, opt.GenesisSeed) + genesisOutput, err := createGenesisOutput(api, opt.ProtocolParameters.TokenSupply()-totalAccountAmount-totalBasicOutputAmount, opt.GenesisSeed) if err != nil { return ierrors.Wrap(err, "failed to create genesis outputs") } @@ -133,6 +137,12 @@ func CreateSnapshot(opts ...options.Option[Options]) error { } genesisTransactionOutputs = append(genesisTransactionOutputs, accountOutputs...) + genesisBasicOutputs, err := createGenesisBasicOutputs(api, opt.BasicOutputs) + if err != nil { + return ierrors.Wrap(err, "failed to create genesis basic outputs") + } + genesisTransactionOutputs = append(genesisTransactionOutputs, genesisBasicOutputs...) + var accountLedgerOutputs utxoledger.Outputs for idx, output := range genesisTransactionOutputs { proof, err := iotago.NewOutputIDProof(engineInstance.LatestAPI(), GenesisTransactionCommitment, GenesisTransactionCreationSlot, genesisTransactionOutputs, uint16(idx)) @@ -172,7 +182,7 @@ func CreateSnapshot(opts ...options.Option[Options]) error { func createGenesisOutput(api iotago.API, genesisTokenAmount iotago.BaseToken, genesisSeed []byte) (iotago.Output, error) { if genesisTokenAmount > 0 { genesisWallet := mock.NewHDWallet("genesis", genesisSeed, 0) - output := createOutput(genesisWallet.Address(), genesisTokenAmount) + output := createOutput(genesisWallet.Address(), genesisTokenAmount, 0) if _, err := api.StorageScoreStructure().CoversMinDeposit(output, genesisTokenAmount); err != nil { return nil, ierrors.Wrap(err, "min rent not covered by Genesis output with index 0") @@ -200,9 +210,26 @@ func createGenesisAccounts(api iotago.API, accounts []AccountDetails) (iotago.Tx return outputs, nil } -func createOutput(address iotago.Address, tokenAmount iotago.BaseToken) (output iotago.Output) { +func createGenesisBasicOutputs(api iotago.API, basicOutputs []BasicOutputDetails) (iotago.TxEssenceOutputs, error) { + var outputs iotago.TxEssenceOutputs + + for idx, genesisBasicOutput := range basicOutputs { + output := createOutput(genesisBasicOutput.Address, genesisBasicOutput.Amount, genesisBasicOutput.Mana) + + if _, err := api.StorageScoreStructure().CoversMinDeposit(output, genesisBasicOutput.Amount); err != nil { + return nil, ierrors.Wrapf(err, "min rent not covered by Genesis basic output with index %d", idx) + } + + outputs = append(outputs, output) + } + + return outputs, nil +} + +func createOutput(address iotago.Address, tokenAmount iotago.BaseToken, mana iotago.Mana) (output iotago.Output) { return &iotago.BasicOutput{ Amount: tokenAmount, + Mana: mana, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{Address: address}, }, diff --git a/pkg/protocol/sybilprotection/sybilprotectionv1/performance/rewards.go b/pkg/protocol/sybilprotection/sybilprotectionv1/performance/rewards.go index ef6c25369..a2dbdeaad 100644 --- a/pkg/protocol/sybilprotection/sybilprotectionv1/performance/rewards.go +++ b/pkg/protocol/sybilprotection/sybilprotectionv1/performance/rewards.go @@ -79,12 +79,7 @@ func (t *Tracker) ValidatorReward(validatorID iotago.AccountID, stakeAmount iota return 0, 0, 0, ierrors.Wrapf(err, "failed to calculate profit margin factor due to overflow for epoch %d and validator accountID %s", epoch, validatorID) } - result, err = safemath.SafeMul(result>>profitMarginExponent, uint64(stakeAmount)) - if err != nil { - return 0, 0, 0, ierrors.Wrapf(err, "failed to calculate profit margin factor due to overflow for epoch %d and validator accountID %s", epoch, validatorID) - } - - residualValidatorFactor, err := safemath.SafeDiv(result, uint64(rewardsForAccountInEpoch.PoolStake)) + residualValidatorFactor, err := safemath.Safe64MulDiv(result>>profitMarginExponent, uint64(stakeAmount), uint64(rewardsForAccountInEpoch.PoolStake)) if err != nil { return 0, 0, 0, ierrors.Wrapf(err, "failed to calculate residual validator factor due to overflow for epoch %d and validator accountID %s", epoch, validatorID) } @@ -210,6 +205,7 @@ func (t *Tracker) rewardsForAccount(accountID iotago.AccountID, epoch iotago.Epo return m.Get(accountID) } + func (t *Tracker) poolReward(slot iotago.SlotIndex, totalValidatorsStake, totalStake, poolStake, validatorStake iotago.BaseToken, performanceFactor uint64) (iotago.Mana, error) { apiForSlot := t.apiProvider.APIForSlot(slot) epoch := apiForSlot.TimeProvider().EpochFromSlot(slot) diff --git a/tools/docker-network/.env b/tools/docker-network/.env index bea3fc0e7..ce7903fb0 100644 --- a/tools/docker-network/.env +++ b/tools/docker-network/.env @@ -16,5 +16,5 @@ COMMON_CONFIG=" --protocol.snapshot.path=/app/data/snapshot.bin " MANUALPEERING_CONFIG=" ---p2p.peers=/dns/peer_master/tcp/14666/p2p/12D3KooWRVt4Engu27jHnF2RjfX48EqiAqJbgLfFdHNt3Vn6BtJK\ +--p2p.peers=/dns/validator-1/tcp/14666/p2p/12D3KooWRVt4Engu27jHnF2RjfX48EqiAqJbgLfFdHNt3Vn6BtJK\ " diff --git a/tools/docker-network/docker-compose.yml b/tools/docker-network/docker-compose.yml index e547cb9c1..92ae8e023 100644 --- a/tools/docker-network/docker-compose.yml +++ b/tools/docker-network/docker-compose.yml @@ -4,7 +4,7 @@ x-build-iota-core: &iota-core_build context: ${DOCKER_BUILD_CONTEXT:-../../} dockerfile: ${DOCKERFILE_PATH:-./Dockerfile} services: - peer_master: + validator-1: build: *iota-core_build stop_grace_period: 1m command: > @@ -28,17 +28,8 @@ services: networks: - iota-core - inx-indexer: - image: iotaledger/inx-indexer:2.0-alpha - stop_grace_period: 1m - command: - - "--inx.address=peer_master:9029" - - "--restAPI.bindAddress=inx-indexer:9091" - networks: - - iota-core - - peer_master2: - image: docker-network-peer_master:latest + validator-2: + image: docker-network-validator-1:latest stop_grace_period: 1m command: > ${COMMON_CONFIG} @@ -57,12 +48,11 @@ services: - "8071:8081/tcp" # dashboard - "6071:6061/tcp" # pprof - "9029:9029/tcp" # inx - networks: - iota-core - faucet: - image: docker-network-peer_master:latest + validator-3: + image: docker-network-validator-1:latest stop_grace_period: 1m command: > ${COMMON_CONFIG} @@ -84,8 +74,8 @@ services: networks: - iota-core - peer_nomana: - image: docker-network-peer_master:latest + node-1: + image: docker-network-validator-1:latest stop_grace_period: 1m command: > ${COMMON_CONFIG} @@ -104,8 +94,8 @@ services: networks: - iota-core - peer_nomana2: - image: docker-network-peer_master:latest + node-2: + image: docker-network-validator-1:latest stop_grace_period: 1m command: > ${COMMON_CONFIG} @@ -121,7 +111,57 @@ services: - "8031:8081/tcp" # dashboard - "6031:6061/tcp" # pprof - "9039:9029/tcp" # inx + networks: + - iota-core + + inx-indexer: + image: iotaledger/inx-indexer:2.0-alpha + stop_grace_period: 1m + depends_on: + validator-1: + condition: service_started + command: + - "--inx.address=validator-1:9029" + - "--restAPI.bindAddress=inx-indexer:9091" + networks: + - iota-core + + inx-blockissuer: + image: iotaledger/inx-blockissuer:1.0-alpha + stop_grace_period: 1m + depends_on: + validator-1: + condition: service_started + inx-indexer: + condition: service_started + restart: on-failure + environment: + - "BLOCKISSUER_PRV_KEY=432c624ca3260f910df35008d5c740593b222f1e196e6cdb8cd1ad080f0d4e33997be92a22b1933f36e26fba5f721756f95811d6b4ae21564197c2bfa4f28270" + command: + - "--inx.address=validator-1:9029" + - "--restAPI.bindAddress=inx-blockissuer:9086" + - "--blockIssuer.accountAddress=rms1prkursay9fs2qjmfctamd6yxg9x8r3ry47786x0mvwek4qr9xd9d5c6gkun" + networks: + - iota-core + inx-faucet: + image: iotaledger/inx-faucet:2.0-alpha + stop_grace_period: 1m + depends_on: + validator-1: + condition: service_started + inx-indexer: + condition: service_started + inx-blockissuer: + condition: service_started + restart: on-failure + environment: + - "FAUCET_PRV_KEY=de52b9964dda96564e9fab362ab16c2669c715c6a2a853bece8a25fc58c599755b938327ea463e0c323c0fd44f6fc1843ed94daecc6909c6043d06b7152e4737" + command: + - "--inx.address=validator-1:9029" + - "--faucet.bindAddress=inx-faucet:8091" + ports: + - "8088:8091/tcp" # faucet frontend networks: - iota-core @@ -138,7 +178,7 @@ services: networks: - iota-core depends_on: - - peer_master + - validator-1 grafana: image: grafana/grafana:9.5.6 diff --git a/tools/docker-network/grafana/provisioning/dashboards/local_dashboard.json b/tools/docker-network/grafana/provisioning/dashboards/local_dashboard.json index 29bc12b93..f464af4c6 100644 --- a/tools/docker-network/grafana/provisioning/dashboards/local_dashboard.json +++ b/tools/docker-network/grafana/provisioning/dashboards/local_dashboard.json @@ -1340,8 +1340,8 @@ { "current": { "selected": false, - "text": "faucet:9311", - "value": "faucet:9311" + "text": "validator-3:9311", + "value": "validator-3:9311" }, "datasource": { "type": "prometheus", diff --git a/tools/docker-network/grafana/provisioning/dashboards/local_dashboard_old.json b/tools/docker-network/grafana/provisioning/dashboards/local_dashboard_old.json index 7aeca0129..71fb84826 100644 --- a/tools/docker-network/grafana/provisioning/dashboards/local_dashboard_old.json +++ b/tools/docker-network/grafana/provisioning/dashboards/local_dashboard_old.json @@ -4847,8 +4847,8 @@ { "current": { "selected": false, - "text": "faucet:9311", - "value": "faucet:9311" + "text": "validator-3:9311", + "value": "validator-3:9311" }, "datasource": { "type": "prometheus", diff --git a/tools/docker-network/grafana/provisioning/dashboards/scheduler-metrics.json b/tools/docker-network/grafana/provisioning/dashboards/scheduler-metrics.json index 6208935e4..c3d8798c3 100644 --- a/tools/docker-network/grafana/provisioning/dashboards/scheduler-metrics.json +++ b/tools/docker-network/grafana/provisioning/dashboards/scheduler-metrics.json @@ -772,8 +772,8 @@ { "current": { "selected": true, - "text": "peer_master2:9311", - "value": "peer_master2:9311" + "text": "validator-2:9311", + "value": "validator-2:9311" }, "datasource": { "type": "prometheus", diff --git a/tools/docker-network/prometheus.yml b/tools/docker-network/prometheus.yml index 749ea03f1..28817e795 100644 --- a/tools/docker-network/prometheus.yml +++ b/tools/docker-network/prometheus.yml @@ -3,11 +3,11 @@ scrape_configs: scrape_interval: 5s static_configs: - targets: - - peer_master:9311 - - faucet:9311 - - peer_master2:9311 - - peer_nomana:9311 - - peer_nomana2:9311 + - validator-1:9311 + - validator-2:9311 + - validator-3:9311 + - node-1:9311 + - node-2:9311 dns_sd_configs: - names: - 'peer_replica' diff --git a/tools/docker-network/run.sh b/tools/docker-network/run.sh index 924fdce0f..46a728c16 100755 --- a/tools/docker-network/run.sh +++ b/tools/docker-network/run.sh @@ -38,6 +38,8 @@ fi echo $DOCKER_BUILD_CONTEXT $DOCKERFILE_PATH docker compose -f $DOCKER_COMPOSE_FILE build --build-arg WITH_GO_WORK=${WITH_GO_WORK:-0} --build-arg DOCKER_BUILD_CONTEXT=${DOCKER_BUILD_CONTEXT} --build-arg DOCKERFILE_PATH=${DOCKERFILE_PATH} +docker compose pull inx-indexer inx-blockissuer inx-faucet + # check exit code of builder if [ $? -ne 0 ] then diff --git a/tools/evil-spammer/config.go b/tools/evil-spammer/config.go index c8fc6e93d..a62e16dca 100644 --- a/tools/evil-spammer/config.go +++ b/tools/evil-spammer/config.go @@ -52,7 +52,7 @@ var ( // Duration: time.Second * 20, // TimeUnit: time.Second, // NetworkAlias: "docker", - // SpammerAlias: "peer_master", + // SpammerAlias: "validator-1", // ValidAlias: accountwallet.FaucetAccountAlias, // CommitmentType: "latest", // ForkAfter: 10, diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 08e67f735..89b8bdd05 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -10,13 +10,13 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/ethereum/go-ethereum v1.13.4 github.com/google/martian v2.1.0+incompatible - github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2 + github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 github.com/iotaledger/iota-core/tools/genesis-snapshot v0.0.0-00010101000000-000000000000 github.com/iotaledger/iota.go/v4 v4.0.0-20231019112751-e9872df31648 @@ -38,13 +38,13 @@ require ( github.com/holiman/uint256 v1.2.3 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 // indirect - github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2 // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index 6b3aaff4e..66d6fc334 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -173,34 +173,34 @@ github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJ github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PTNgli6EbS4tV9qu3QAm/kBU3XaYZV2xdzys= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= -github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2 h1:asyE+LxMChmcSix5rsms0L23jrlzJt616UoDijPpWTY= -github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:IFh0gDfeMgZtfCo+5afK59IDR4xXh+cTR9YtLnZPcbY= -github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2 h1:ZjcC0WoYVs64iMFHzodM8qsdncA9O2ItWA3A98JhHMo= -github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:8ZbIKR84oQd/3iQ5eeT7xpudO9/ytzXP7veIYnk7Orc= -github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2 h1:QPDVoivTVVJIYfXuWW2GpEZLFaJQutkevr2Wm/VKdu4= -github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2 h1:oVnQnvYgLEzlFxEu4DcHYfGqT5v+8fVQfAGyPMmZL6c= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2/go.mod h1:Mc+ACqBGPxrPMIPUBOm6/HL0J6m0iVMwjtIEKW3uow8= -github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2 h1:CTbrWBYM98pfpfdYNGfx/a8ub4SXrltjmeGjpB7Jkx4= -github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:h3o6okvMSEK3KOX6pOp3yq1h9ohTkTfo6X8MzEadeb0= -github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2 h1:8i4bvVO+paY/ZxWKr0OHw1xx8Kz9CUIg3+B5gVl7fjk= -github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:3XkUSKfHaVxGbT0XAvjNlVYqPzhfLTGhDtdNA5UBPco= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2 h1:rpBz3vmvDd2rab6kZE4b4NXkaNSKsJ7v74DLOsbBUlA= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2 h1:fgKzJkRaLIGUZpQaB6koK3tYagN2nSaGo1qXmNaKRaA= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:O/U3jtiUDeqqM0MZQFu2UPqS9fUm0C5hNISxlmg/thE= -github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2 h1:BUsL7XFucscD/7jtEpS/EbgFI08PhP4Af3gHNMRqkKA= -github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:s4kzx9QY1MVWHJralj+3q5kI0eARtrJhphYD/iBbPfo= -github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2 h1:Pm1UzKTgobqi1SSX7VG3wMYtahq4vagtOLI/xUypoto= -github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:JvokzmpmFZPDskMlUqqjgHtD8usVJU4nAY/TNMGge8M= -github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2 h1:+LqfdkgC1ahuAhTbXPIyydmni8IsvxNgZziM1cZKfmc= -github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:aBfAfIB2GO/IblhYt5ipCbyeL9bXSNeAwtYVA3hZaHg= -github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2 h1:7keivgxNXi2yqt6yx3TWMmZf9vBEaGM4UNpFuaRxg8E= -github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:jRw8yFipiPaqmTPHh7hTcxAP9u6pjRGpByS3REJKkbY= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2 h1:as3d3f7gH2/fR1997OWmRPpKwjY0E1X7Twc4LWBTEuE= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2/go.mod h1:SdK26z8/VhWtxaqCuQrufm80SELgowQPmu9T/8eUQ8g= -github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2 h1:virnPQxZvZ00VqcZBzTvPo5DLUZgIvH06YEhktwW224= -github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38 h1:/Td52GNRrMzh0lVKwQu/BbVciwrKn5LwtkWAzd41X4Q= +github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38/go.mod h1:IFh0gDfeMgZtfCo+5afK59IDR4xXh+cTR9YtLnZPcbY= +github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38 h1:t60nsq/lI168gM0WqIP44FDHk784uXy35P6uKt9WbMU= +github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38/go.mod h1:8ZbIKR84oQd/3iQ5eeT7xpudO9/ytzXP7veIYnk7Orc= +github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38 h1:xYh6+dUl+iocWofo0Z/0/OJGSdxYaPV1oYo1HlFj8+s= +github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38 h1:3OUYK9wgyH4U6xfGnLdU1QdYQ5dpS/6WRju+eXP051E= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38/go.mod h1:Mc+ACqBGPxrPMIPUBOm6/HL0J6m0iVMwjtIEKW3uow8= +github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38 h1:iXqM0/Y4poiiuNf+0tu3nUj9Dzp4slrWHJ8GXKgt2Zk= +github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38/go.mod h1:h3o6okvMSEK3KOX6pOp3yq1h9ohTkTfo6X8MzEadeb0= +github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38 h1:xyaKXgNt8CQ4t14Raqu/4+aBRZQunGOlK+T+99egkSA= +github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38/go.mod h1:3XkUSKfHaVxGbT0XAvjNlVYqPzhfLTGhDtdNA5UBPco= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38 h1:6I6PEdLuwiIpmiXFVEW5lPaNe+xFdaBR6NSHsNZ3o6c= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38 h1:SCBXTAhrLFs0o9EJxO9ZBGPyfq1VhOdb5pP7+vFhdtk= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38/go.mod h1:O/U3jtiUDeqqM0MZQFu2UPqS9fUm0C5hNISxlmg/thE= +github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38 h1:qks472rk/MjwwFvDrlpckxWTf4c1yd+k7ve/IkeuPYk= +github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38/go.mod h1:s4kzx9QY1MVWHJralj+3q5kI0eARtrJhphYD/iBbPfo= +github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38 h1:6HIBNKOWLXY5Gk1s+q93D6IsTcqwANigfMO3ePtV3HQ= +github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38/go.mod h1:JvokzmpmFZPDskMlUqqjgHtD8usVJU4nAY/TNMGge8M= +github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38 h1:lTp8+8GgFH63IMY0G9B90v2vmOlgo+c3XiZg4f0Te+I= +github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38/go.mod h1:aBfAfIB2GO/IblhYt5ipCbyeL9bXSNeAwtYVA3hZaHg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38 h1:lPiKbh8o/SN2FGCN9RF7iN1zE+KXCidp815GSOieU8s= +github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38/go.mod h1:jRw8yFipiPaqmTPHh7hTcxAP9u6pjRGpByS3REJKkbY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38 h1:njGr4TrKdpa66XyioxhDU3slV9gZOZeEg7/M8bjXw7M= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38/go.mod h1:SdK26z8/VhWtxaqCuQrufm80SELgowQPmu9T/8eUQ8g= +github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38 h1:jh0LHzzLqVO+SW9NkvNIgYo1g3CyTBnR8Qv3+PNH+dY= +github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota.go/v4 v4.0.0-20231019112751-e9872df31648 h1:Lhk/aEyFwDflE03kdI6Xeap/awDJbxVsBzKh08U9hTY= github.com/iotaledger/iota.go/v4 v4.0.0-20231019112751-e9872df31648/go.mod h1:XFwcDfAF0hv6wB/trCsyDmQyPLjEZ60yTrllJ2bprN8= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= diff --git a/tools/evil-spammer/identity/config.go b/tools/evil-spammer/identity/config.go index 8c93b8fc3..4529b5055 100644 --- a/tools/evil-spammer/identity/config.go +++ b/tools/evil-spammer/identity/config.go @@ -14,15 +14,15 @@ var Config = Params{} var identityConfigJSON = `{ "docker": { - "peer_master": [ + "validator-1": [ "8q491c3YWjbPwLmF2WD95YmCgh61j2kenCKHfGfByoWi", "http://localhost:8080" ], - "peer_master2": [ + "validator-2": [ "4ata8GcTRMJ5sSv2jQJWmSYYTHct748p3tXmCFYm7wjA", "http://localhost:8070" ], - "faucet": [ + "validator-3": [ "3YX6e7AL28hHihZewKdq6CMkEYVsTJBLgRiprUNiNq5E", "http://localhost:8090" ] diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index 56fbd2aa2..9ffe27b94 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -5,7 +5,7 @@ go 1.21 replace github.com/iotaledger/iota-core => ../../ require ( - github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2 + github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38 github.com/iotaledger/hive.go/apputils v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 ) @@ -58,19 +58,19 @@ require ( github.com/huin/goupnp v1.3.0 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 // indirect - github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2 // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20231011161248-cf0bd6e08811 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20231011154428-257141868dad // indirect github.com/iotaledger/iota.go/v4 v4.0.0-20231019112751-e9872df31648 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 2f44e3778..593c433c4 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -279,36 +279,36 @@ github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJ github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PTNgli6EbS4tV9qu3QAm/kBU3XaYZV2xdzys= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= -github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2 h1:asyE+LxMChmcSix5rsms0L23jrlzJt616UoDijPpWTY= -github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:IFh0gDfeMgZtfCo+5afK59IDR4xXh+cTR9YtLnZPcbY= -github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2 h1:ZjcC0WoYVs64iMFHzodM8qsdncA9O2ItWA3A98JhHMo= -github.com/iotaledger/hive.go/app v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:8ZbIKR84oQd/3iQ5eeT7xpudO9/ytzXP7veIYnk7Orc= +github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38 h1:/Td52GNRrMzh0lVKwQu/BbVciwrKn5LwtkWAzd41X4Q= +github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38/go.mod h1:IFh0gDfeMgZtfCo+5afK59IDR4xXh+cTR9YtLnZPcbY= +github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38 h1:t60nsq/lI168gM0WqIP44FDHk784uXy35P6uKt9WbMU= +github.com/iotaledger/hive.go/app v0.0.0-20231019113503-7986872a7a38/go.mod h1:8ZbIKR84oQd/3iQ5eeT7xpudO9/ytzXP7veIYnk7Orc= github.com/iotaledger/hive.go/apputils v0.0.0-20230829152614-7afc7a4d89b3 h1:4aVJTc0KS77uEw0Tny4r0n1ORwcbAQDECaCclgf/6lE= github.com/iotaledger/hive.go/apputils v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:TZeAqieDu+xDOZp2e9+S+8pZp1PrfgcwLUnxmd8IgLU= -github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2 h1:QPDVoivTVVJIYfXuWW2GpEZLFaJQutkevr2Wm/VKdu4= -github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2 h1:oVnQnvYgLEzlFxEu4DcHYfGqT5v+8fVQfAGyPMmZL6c= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2/go.mod h1:Mc+ACqBGPxrPMIPUBOm6/HL0J6m0iVMwjtIEKW3uow8= -github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2 h1:CTbrWBYM98pfpfdYNGfx/a8ub4SXrltjmeGjpB7Jkx4= -github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:h3o6okvMSEK3KOX6pOp3yq1h9ohTkTfo6X8MzEadeb0= -github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2 h1:8i4bvVO+paY/ZxWKr0OHw1xx8Kz9CUIg3+B5gVl7fjk= -github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:3XkUSKfHaVxGbT0XAvjNlVYqPzhfLTGhDtdNA5UBPco= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2 h1:rpBz3vmvDd2rab6kZE4b4NXkaNSKsJ7v74DLOsbBUlA= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2 h1:fgKzJkRaLIGUZpQaB6koK3tYagN2nSaGo1qXmNaKRaA= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:O/U3jtiUDeqqM0MZQFu2UPqS9fUm0C5hNISxlmg/thE= -github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2 h1:BUsL7XFucscD/7jtEpS/EbgFI08PhP4Af3gHNMRqkKA= -github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:s4kzx9QY1MVWHJralj+3q5kI0eARtrJhphYD/iBbPfo= -github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2 h1:Pm1UzKTgobqi1SSX7VG3wMYtahq4vagtOLI/xUypoto= -github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:JvokzmpmFZPDskMlUqqjgHtD8usVJU4nAY/TNMGge8M= -github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2 h1:+LqfdkgC1ahuAhTbXPIyydmni8IsvxNgZziM1cZKfmc= -github.com/iotaledger/hive.go/logger v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:aBfAfIB2GO/IblhYt5ipCbyeL9bXSNeAwtYVA3hZaHg= -github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2 h1:7keivgxNXi2yqt6yx3TWMmZf9vBEaGM4UNpFuaRxg8E= -github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:jRw8yFipiPaqmTPHh7hTcxAP9u6pjRGpByS3REJKkbY= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2 h1:as3d3f7gH2/fR1997OWmRPpKwjY0E1X7Twc4LWBTEuE= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2/go.mod h1:SdK26z8/VhWtxaqCuQrufm80SELgowQPmu9T/8eUQ8g= -github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2 h1:virnPQxZvZ00VqcZBzTvPo5DLUZgIvH06YEhktwW224= -github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38 h1:xYh6+dUl+iocWofo0Z/0/OJGSdxYaPV1oYo1HlFj8+s= +github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38 h1:3OUYK9wgyH4U6xfGnLdU1QdYQ5dpS/6WRju+eXP051E= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38/go.mod h1:Mc+ACqBGPxrPMIPUBOm6/HL0J6m0iVMwjtIEKW3uow8= +github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38 h1:iXqM0/Y4poiiuNf+0tu3nUj9Dzp4slrWHJ8GXKgt2Zk= +github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38/go.mod h1:h3o6okvMSEK3KOX6pOp3yq1h9ohTkTfo6X8MzEadeb0= +github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38 h1:xyaKXgNt8CQ4t14Raqu/4+aBRZQunGOlK+T+99egkSA= +github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38/go.mod h1:3XkUSKfHaVxGbT0XAvjNlVYqPzhfLTGhDtdNA5UBPco= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38 h1:6I6PEdLuwiIpmiXFVEW5lPaNe+xFdaBR6NSHsNZ3o6c= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38 h1:SCBXTAhrLFs0o9EJxO9ZBGPyfq1VhOdb5pP7+vFhdtk= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38/go.mod h1:O/U3jtiUDeqqM0MZQFu2UPqS9fUm0C5hNISxlmg/thE= +github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38 h1:qks472rk/MjwwFvDrlpckxWTf4c1yd+k7ve/IkeuPYk= +github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38/go.mod h1:s4kzx9QY1MVWHJralj+3q5kI0eARtrJhphYD/iBbPfo= +github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38 h1:6HIBNKOWLXY5Gk1s+q93D6IsTcqwANigfMO3ePtV3HQ= +github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38/go.mod h1:JvokzmpmFZPDskMlUqqjgHtD8usVJU4nAY/TNMGge8M= +github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38 h1:lTp8+8GgFH63IMY0G9B90v2vmOlgo+c3XiZg4f0Te+I= +github.com/iotaledger/hive.go/logger v0.0.0-20231019113503-7986872a7a38/go.mod h1:aBfAfIB2GO/IblhYt5ipCbyeL9bXSNeAwtYVA3hZaHg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38 h1:lPiKbh8o/SN2FGCN9RF7iN1zE+KXCidp815GSOieU8s= +github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38/go.mod h1:jRw8yFipiPaqmTPHh7hTcxAP9u6pjRGpByS3REJKkbY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38 h1:njGr4TrKdpa66XyioxhDU3slV9gZOZeEg7/M8bjXw7M= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38/go.mod h1:SdK26z8/VhWtxaqCuQrufm80SELgowQPmu9T/8eUQ8g= +github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38 h1:jh0LHzzLqVO+SW9NkvNIgYo1g3CyTBnR8Qv3+PNH+dY= +github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20231011161248-cf0bd6e08811 h1:nR8uTm1Htn2RQOT53RV2zdCIflpuF8N00Tv2FWYimY0= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20231011161248-cf0bd6e08811/go.mod h1:rmclNpXw5sKJDHU0e51Ar/9zL00P7Uu9hkfaM7vAAiE= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20231011154428-257141868dad h1:TRM9EkAole9fYY1vHEVQ6zCEOGuvCWq/bczZ98Al5Ec= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 04606fec3..15d39c92a 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -5,10 +5,10 @@ go 1.21 replace github.com/iotaledger/iota-core => ../../ require ( - github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2 - github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2 + github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38 + github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 github.com/iotaledger/iota.go/v4 v4.0.0-20231019112751-e9872df31648 github.com/mr-tron/base58 v1.2.0 @@ -26,14 +26,14 @@ require ( github.com/holiman/uint256 v1.2.3 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 // indirect - github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2 // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2 // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/kr/text v0.2.0 // indirect diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 4f7a7b50c..1fe1cefe1 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -28,30 +28,30 @@ github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJ github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PTNgli6EbS4tV9qu3QAm/kBU3XaYZV2xdzys= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= -github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2 h1:asyE+LxMChmcSix5rsms0L23jrlzJt616UoDijPpWTY= -github.com/iotaledger/hive.go/ads v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:IFh0gDfeMgZtfCo+5afK59IDR4xXh+cTR9YtLnZPcbY= -github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2 h1:QPDVoivTVVJIYfXuWW2GpEZLFaJQutkevr2Wm/VKdu4= -github.com/iotaledger/hive.go/constraints v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2 h1:oVnQnvYgLEzlFxEu4DcHYfGqT5v+8fVQfAGyPMmZL6c= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019082730-54e1c06ab9c2/go.mod h1:Mc+ACqBGPxrPMIPUBOm6/HL0J6m0iVMwjtIEKW3uow8= -github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2 h1:CTbrWBYM98pfpfdYNGfx/a8ub4SXrltjmeGjpB7Jkx4= -github.com/iotaledger/hive.go/crypto v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:h3o6okvMSEK3KOX6pOp3yq1h9ohTkTfo6X8MzEadeb0= -github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2 h1:8i4bvVO+paY/ZxWKr0OHw1xx8Kz9CUIg3+B5gVl7fjk= -github.com/iotaledger/hive.go/ds v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:3XkUSKfHaVxGbT0XAvjNlVYqPzhfLTGhDtdNA5UBPco= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2 h1:rpBz3vmvDd2rab6kZE4b4NXkaNSKsJ7v74DLOsbBUlA= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2 h1:fgKzJkRaLIGUZpQaB6koK3tYagN2nSaGo1qXmNaKRaA= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:O/U3jtiUDeqqM0MZQFu2UPqS9fUm0C5hNISxlmg/thE= -github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2 h1:BUsL7XFucscD/7jtEpS/EbgFI08PhP4Af3gHNMRqkKA= -github.com/iotaledger/hive.go/lo v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:s4kzx9QY1MVWHJralj+3q5kI0eARtrJhphYD/iBbPfo= -github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2 h1:Pm1UzKTgobqi1SSX7VG3wMYtahq4vagtOLI/xUypoto= -github.com/iotaledger/hive.go/log v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:JvokzmpmFZPDskMlUqqjgHtD8usVJU4nAY/TNMGge8M= -github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2 h1:7keivgxNXi2yqt6yx3TWMmZf9vBEaGM4UNpFuaRxg8E= -github.com/iotaledger/hive.go/runtime v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:jRw8yFipiPaqmTPHh7hTcxAP9u6pjRGpByS3REJKkbY= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2 h1:as3d3f7gH2/fR1997OWmRPpKwjY0E1X7Twc4LWBTEuE= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019082730-54e1c06ab9c2/go.mod h1:SdK26z8/VhWtxaqCuQrufm80SELgowQPmu9T/8eUQ8g= -github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2 h1:virnPQxZvZ00VqcZBzTvPo5DLUZgIvH06YEhktwW224= -github.com/iotaledger/hive.go/stringify v0.0.0-20231019082730-54e1c06ab9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38 h1:/Td52GNRrMzh0lVKwQu/BbVciwrKn5LwtkWAzd41X4Q= +github.com/iotaledger/hive.go/ads v0.0.0-20231019113503-7986872a7a38/go.mod h1:IFh0gDfeMgZtfCo+5afK59IDR4xXh+cTR9YtLnZPcbY= +github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38 h1:xYh6+dUl+iocWofo0Z/0/OJGSdxYaPV1oYo1HlFj8+s= +github.com/iotaledger/hive.go/constraints v0.0.0-20231019113503-7986872a7a38/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38 h1:3OUYK9wgyH4U6xfGnLdU1QdYQ5dpS/6WRju+eXP051E= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231019113503-7986872a7a38/go.mod h1:Mc+ACqBGPxrPMIPUBOm6/HL0J6m0iVMwjtIEKW3uow8= +github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38 h1:iXqM0/Y4poiiuNf+0tu3nUj9Dzp4slrWHJ8GXKgt2Zk= +github.com/iotaledger/hive.go/crypto v0.0.0-20231019113503-7986872a7a38/go.mod h1:h3o6okvMSEK3KOX6pOp3yq1h9ohTkTfo6X8MzEadeb0= +github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38 h1:xyaKXgNt8CQ4t14Raqu/4+aBRZQunGOlK+T+99egkSA= +github.com/iotaledger/hive.go/ds v0.0.0-20231019113503-7986872a7a38/go.mod h1:3XkUSKfHaVxGbT0XAvjNlVYqPzhfLTGhDtdNA5UBPco= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38 h1:6I6PEdLuwiIpmiXFVEW5lPaNe+xFdaBR6NSHsNZ3o6c= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231019113503-7986872a7a38/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38 h1:SCBXTAhrLFs0o9EJxO9ZBGPyfq1VhOdb5pP7+vFhdtk= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231019113503-7986872a7a38/go.mod h1:O/U3jtiUDeqqM0MZQFu2UPqS9fUm0C5hNISxlmg/thE= +github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38 h1:qks472rk/MjwwFvDrlpckxWTf4c1yd+k7ve/IkeuPYk= +github.com/iotaledger/hive.go/lo v0.0.0-20231019113503-7986872a7a38/go.mod h1:s4kzx9QY1MVWHJralj+3q5kI0eARtrJhphYD/iBbPfo= +github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38 h1:6HIBNKOWLXY5Gk1s+q93D6IsTcqwANigfMO3ePtV3HQ= +github.com/iotaledger/hive.go/log v0.0.0-20231019113503-7986872a7a38/go.mod h1:JvokzmpmFZPDskMlUqqjgHtD8usVJU4nAY/TNMGge8M= +github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38 h1:lPiKbh8o/SN2FGCN9RF7iN1zE+KXCidp815GSOieU8s= +github.com/iotaledger/hive.go/runtime v0.0.0-20231019113503-7986872a7a38/go.mod h1:jRw8yFipiPaqmTPHh7hTcxAP9u6pjRGpByS3REJKkbY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38 h1:njGr4TrKdpa66XyioxhDU3slV9gZOZeEg7/M8bjXw7M= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231019113503-7986872a7a38/go.mod h1:SdK26z8/VhWtxaqCuQrufm80SELgowQPmu9T/8eUQ8g= +github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38 h1:jh0LHzzLqVO+SW9NkvNIgYo1g3CyTBnR8Qv3+PNH+dY= +github.com/iotaledger/hive.go/stringify v0.0.0-20231019113503-7986872a7a38/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota.go/v4 v4.0.0-20231019112751-e9872df31648 h1:Lhk/aEyFwDflE03kdI6Xeap/awDJbxVsBzKh08U9hTY= github.com/iotaledger/iota.go/v4 v4.0.0-20231019112751-e9872df31648/go.mod h1:XFwcDfAF0hv6wB/trCsyDmQyPLjEZ60yTrllJ2bprN8= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= diff --git a/tools/genesis-snapshot/presets/presets.go b/tools/genesis-snapshot/presets/presets.go index 4e76be0ce..b97e6069a 100644 --- a/tools/genesis-snapshot/presets/presets.go +++ b/tools/genesis-snapshot/presets/presets.go @@ -36,59 +36,75 @@ var Base = []options.Option[snapshotcreator.Options]{ var Docker = []options.Option[snapshotcreator.Options]{ snapshotcreator.WithFilePath("docker-network.snapshot"), + snapshotcreator.WithBasicOutputs( + /* + inx-faucet + + ed25519 private key: de52b9964dda96564e9fab362ab16c2669c715c6a2a853bece8a25fc58c599755b938327ea463e0c323c0fd44f6fc1843ed94daecc6909c6043d06b7152e4737 + ed25519 public key: 5b938327ea463e0c323c0fd44f6fc1843ed94daecc6909c6043d06b7152e4737 + ed25519 address: 2f64f9d179991f50542b01e034fa043b195403875b8677efaf196b41c88803d0 + bech32 address: rms1qqhkf7w30xv375z59vq7qd86qsa3j4qrsadcval04uvkkswg3qpaqf4hga2 + + => restricted address with mana enabled: rms19qqz7e8e69uej86s2s4srcp5lgzrkx25qwr4hpnha7h3j66pezyq85qpqgqjjc5k + */ + snapshotcreator.BasicOutputDetails{ + Address: lo.Return2(iotago.ParseBech32("rms19qqz7e8e69uej86s2s4srcp5lgzrkx25qwr4hpnha7h3j66pezyq85qpqgqjjc5k")), + Amount: 5_000_000_000, + Mana: 10_000_000, + }, + ), snapshotcreator.WithAccounts( - snapshotcreator.AccountDetails{ // master + snapshotcreator.AccountDetails{ // validator-1 AccountID: blake2b.Sum256(lo.PanicOnErr(hexutil.DecodeHex("0x293dc170d9a59474e6d81cfba7f7d924c09b25d7166bcfba606e53114d0a758b"))), Address: iotago.Ed25519AddressFromPubKey(lo.PanicOnErr(hexutil.DecodeHex("0x293dc170d9a59474e6d81cfba7f7d924c09b25d7166bcfba606e53114d0a758b"))), Amount: testsuite.MinValidatorAccountAmount, IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0x293dc170d9a59474e6d81cfba7f7d924c09b25d7166bcfba606e53114d0a758b")))), ExpirySlot: iotago.MaxSlotIndex, - BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 2, + BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 4, StakingEpochEnd: iotago.MaxEpochIndex, FixedCost: 1, StakedAmount: testsuite.MinValidatorAccountAmount, Mana: iotago.Mana(testsuite.MinValidatorAccountAmount), }, - snapshotcreator.AccountDetails{ // master2 + snapshotcreator.AccountDetails{ // validator-2 AccountID: blake2b.Sum256(lo.PanicOnErr(hexutil.DecodeHex("0x05c1de274451db8de8182d64c6ee0dca3ae0c9077e0b4330c976976171d79064"))), Address: iotago.Ed25519AddressFromPubKey(lo.PanicOnErr(hexutil.DecodeHex("0x05c1de274451db8de8182d64c6ee0dca3ae0c9077e0b4330c976976171d79064"))), Amount: testsuite.MinValidatorAccountAmount, IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0x05c1de274451db8de8182d64c6ee0dca3ae0c9077e0b4330c976976171d79064")))), ExpirySlot: iotago.MaxSlotIndex, - BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 2, + BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 4, StakingEpochEnd: iotago.MaxEpochIndex, FixedCost: 1, StakedAmount: testsuite.MinValidatorAccountAmount, Mana: iotago.Mana(testsuite.MinValidatorAccountAmount), }, - snapshotcreator.AccountDetails{ // faucet + snapshotcreator.AccountDetails{ // validator-3 AccountID: blake2b.Sum256(lo.PanicOnErr(hexutil.DecodeHex("0x1e4b21eb51dcddf65c20db1065e1f1514658b23a3ddbf48d30c0efc926a9a648"))), Address: iotago.Ed25519AddressFromPubKey(lo.PanicOnErr(hexutil.DecodeHex("0x1e4b21eb51dcddf65c20db1065e1f1514658b23a3ddbf48d30c0efc926a9a648"))), Amount: testsuite.MinValidatorAccountAmount, IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0x1e4b21eb51dcddf65c20db1065e1f1514658b23a3ddbf48d30c0efc926a9a648")))), ExpirySlot: iotago.MaxSlotIndex, - BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 2, + BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 4, StakingEpochEnd: iotago.MaxEpochIndex, FixedCost: 1, StakedAmount: testsuite.MinValidatorAccountAmount, Mana: iotago.Mana(testsuite.MinValidatorAccountAmount), }, - snapshotcreator.AccountDetails{ // nomana - AccountID: blake2b.Sum256(lo.PanicOnErr(hexutil.DecodeHex("0xa54fafa44a88e4a6a37796526ea884f613a24d84337871226eb6360f022d8b39"))), - Address: iotago.Ed25519AddressFromPubKey(lo.PanicOnErr(hexutil.DecodeHex("0xa54fafa44a88e4a6a37796526ea884f613a24d84337871226eb6360f022d8b39"))), - Amount: testsuite.MinIssuerAccountAmount, - IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0xa54fafa44a88e4a6a37796526ea884f613a24d84337871226eb6360f022d8b39")))), - ExpirySlot: iotago.MaxSlotIndex, - BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 2, - Mana: iotago.Mana(testsuite.MinIssuerAccountAmount), - }, - snapshotcreator.AccountDetails{ // nomana2 - AccountID: blake2b.Sum256(lo.PanicOnErr(hexutil.DecodeHex("0xcb5ea14175ce649149ee41217c44aa70c3205b9939968449eae408727a71f91b"))), - Address: iotago.Ed25519AddressFromPubKey(lo.PanicOnErr(hexutil.DecodeHex("0xcb5ea14175ce649149ee41217c44aa70c3205b9939968449eae408727a71f91b"))), + snapshotcreator.AccountDetails{ + /* + inx-blockissuer + + ed25519 private key: 432c624ca3260f910df35008d5c740593b222f1e196e6cdb8cd1ad080f0d4e33997be92a22b1933f36e26fba5f721756f95811d6b4ae21564197c2bfa4f28270 + ed25519 public key: 997be92a22b1933f36e26fba5f721756f95811d6b4ae21564197c2bfa4f28270 + ed25519 address: edc1c3a42a60a04b69c2fbb6e886414c71c464afbc7d19fb63b36a8065334ada + bech32 address: rms1prkursay9fs2qjmfctamd6yxg9x8r3ry47786x0mvwek4qr9xd9d5c6gkun + */ + AccountID: blake2b.Sum256(lo.PanicOnErr(hexutil.DecodeHex("0x997be92a22b1933f36e26fba5f721756f95811d6b4ae21564197c2bfa4f28270"))), + Address: iotago.Ed25519AddressFromPubKey(lo.PanicOnErr(hexutil.DecodeHex("0x997be92a22b1933f36e26fba5f721756f95811d6b4ae21564197c2bfa4f28270"))), Amount: testsuite.MinIssuerAccountAmount, - IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0xcb5ea14175ce649149ee41217c44aa70c3205b9939968449eae408727a71f91b")))), + IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0x997be92a22b1933f36e26fba5f721756f95811d6b4ae21564197c2bfa4f28270")))), ExpirySlot: iotago.MaxSlotIndex, - BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 2, + BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 4, Mana: iotago.Mana(testsuite.MinIssuerAccountAmount), }, ), @@ -115,7 +131,7 @@ var Feature = []options.Option[snapshotcreator.Options]{ Amount: testsuite.MinValidatorAccountAmount, IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0x01fb6b9db5d96240aef00bc950d1c67a6494513f6d7cf784e57b4972b96ab2fe")))), ExpirySlot: iotago.MaxSlotIndex, - BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 2, + BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 4, StakingEpochEnd: iotago.MaxEpochIndex, FixedCost: 1, StakedAmount: testsuite.MinValidatorAccountAmount, @@ -127,7 +143,7 @@ var Feature = []options.Option[snapshotcreator.Options]{ Amount: testsuite.MinValidatorAccountAmount, IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0x83e7f71a440afd48981a8b4684ddae24434b7182ce5c47cfb56ac528525fd4b6")))), ExpirySlot: iotago.MaxSlotIndex, - BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 2, + BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 4, StakingEpochEnd: iotago.MaxEpochIndex, FixedCost: 1, StakedAmount: testsuite.MinValidatorAccountAmount, @@ -139,7 +155,7 @@ var Feature = []options.Option[snapshotcreator.Options]{ Amount: testsuite.MinValidatorAccountAmount, IssuerKey: iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519.PublicKey(lo.PanicOnErr(hexutil.DecodeHex("0xac628986b2ef52a1679f2289fcd7b4198476976dea4c30ae34ff04ae52e14805")))), ExpirySlot: iotago.MaxSlotIndex, - BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 2, + BlockIssuanceCredits: iotago.MaxBlockIssuanceCredits / 4, StakingEpochEnd: iotago.MaxEpochIndex, FixedCost: 1, StakedAmount: testsuite.MinValidatorAccountAmount,