From 8bdaf79bccd49de1026c683e992fe23b12104642 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:04:23 +0800 Subject: [PATCH 01/18] Adjust signaling test to check for persistence of upgrade signals after signals are decided --- pkg/storage/permanent/settings.go | 2 + pkg/tests/upgrade_signaling_test.go | 128 ++++++++++++++++++++-------- 2 files changed, 93 insertions(+), 37 deletions(-) diff --git a/pkg/storage/permanent/settings.go b/pkg/storage/permanent/settings.go index def431988..f785020ee 100644 --- a/pkg/storage/permanent/settings.go +++ b/pkg/storage/permanent/settings.go @@ -186,6 +186,8 @@ func (s *Settings) StoreFutureProtocolParametersHash(version iotago.Version, has return err } + // TODO: don't we need to store to protocolVersionEpochMapping here as well? + s.apiProvider.AddFutureVersion(version, hash, epoch) return nil diff --git a/pkg/tests/upgrade_signaling_test.go b/pkg/tests/upgrade_signaling_test.go index 5b9c6ed30..6f12ab141 100644 --- a/pkg/tests/upgrade_signaling_test.go +++ b/pkg/tests/upgrade_signaling_test.go @@ -238,45 +238,99 @@ func Test_Upgrade_Signaling(t *testing.T) { ts.IssueBlocksAtEpoch("", 6, 4, "47.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeE.1"), true, nil) ts.IssueBlocksAtEpoch("", 7, 4, "55.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeE.1"), true, nil) - ts.AssertEpochVersions(map[iotago.Version]iotago.EpochIndex{ - 3: 0, - 5: 13, - }, ts.Nodes()...) + // Restart node (and add protocol parameters) and add another node from snapshot (also with protocol parameters already set). + { + var expectedRootBlocks []*blocks.Block + for _, slot := range []iotago.SlotIndex{59, 60, 61} { + expectedRootBlocks = append(expectedRootBlocks, ts.BlocksWithPrefix(fmt.Sprintf("%d.3-", slot))...) + } - ts.AssertVersionAndProtocolParameters(map[iotago.Version]iotago.ProtocolParameters{ - 3: ts.API.ProtocolParameters(), - 5: nil, - }, ts.Nodes()...) + ts.AssertNodeState(ts.Nodes(), + testsuite.WithLatestCommitmentSlotIndex(61), + testsuite.WithActiveRootBlocks(expectedRootBlocks), + ) - ts.AssertVersionAndProtocolParametersHashes(map[iotago.Version]iotago.Identifier{ - 3: lo.PanicOnErr(ts.API.ProtocolParameters().Hash()), - 5: hash1, - }, ts.Nodes()...) + // Shutdown nodeE.1 and restart it from disk. Verify state. + { + nodeE1 := ts.Node("nodeE.1") + nodeE1.Shutdown() + ts.RemoveNode("nodeE.1") - // check account data at the end of the test - ts.AssertAccountData(&accounts.AccountData{ - ID: ts.Node("nodeA").AccountID, - Credits: &accounts.BlockIssuanceCredits{Value: math.MaxInt64, UpdateTime: 0}, - ExpirySlot: math.MaxUint64, - OutputID: iotago.OutputIDFromTransactionIDAndIndex(snapshotcreator.GenesisTransactionID, 1), - BlockIssuerKeys: ds.NewSet[iotago.BlockIssuerKey](iotago.BlockIssuerKeyEd25519FromPublicKey(ed25519.PublicKey(ts.Node("nodeA").PubKey))), - ValidatorStake: testsuite.MinValidatorAccountAmount, - DelegationStake: 0, - FixedCost: 0, - StakeEndEpoch: math.MaxUint64, - LatestSupportedProtocolVersionAndHash: model.VersionAndHash{Version: 5, Hash: hash1}, - }, ts.Nodes()...) + nodeE2 := ts.AddNode("nodeE.2") + nodeE2.CopyIdentityFromNode(nodeE1) + nodeE2.Initialize(true, + append(nodeOptions, + protocol.WithBaseDirectory(ts.Directory.Path(nodeE1.Name)), + )..., + ) + ts.Wait() + } - ts.AssertAccountData(&accounts.AccountData{ - ID: ts.Node("nodeD").AccountID, - Credits: &accounts.BlockIssuanceCredits{Value: math.MaxInt64, UpdateTime: 0}, - ExpirySlot: math.MaxUint64, - OutputID: iotago.OutputIDFromTransactionIDAndIndex(snapshotcreator.GenesisTransactionID, 4), - BlockIssuerKeys: ds.NewSet[iotago.BlockIssuerKey](iotago.BlockIssuerKeyEd25519FromPublicKey(ed25519.PublicKey(ts.Node("nodeD").PubKey))), - ValidatorStake: testsuite.MinValidatorAccountAmount, - DelegationStake: 0, - FixedCost: 0, - StakeEndEpoch: math.MaxUint64, - LatestSupportedProtocolVersionAndHash: model.VersionAndHash{Version: 5, Hash: hash2}, - }, ts.Nodes()...) + // // Create snapshot. + // snapshotPath := ts.Directory.Path(fmt.Sprintf("%d_snapshot", time.Now().Unix())) + // require.NoError(t, ts.Node("nodeA").Protocol.MainEngineInstance().WriteSnapshot(snapshotPath)) + // + // { + // nodeG := ts.AddNode("nodeG") + // nodeG.Initialize(true, + // append(nodeOptions, + // protocol.WithSnapshotPath(snapshotPath), + // protocol.WithBaseDirectory(ts.Directory.PathWithCreate(nodeG.Name)), + // )..., + // ) + // ts.Wait() + // + ts.AssertNodeState(ts.Nodes(), + testsuite.WithLatestCommitmentSlotIndex(61), + testsuite.WithActiveRootBlocks(expectedRootBlocks), + ) + // } + } + + // Verify final state of all nodes. + { + ts.AssertEpochVersions(map[iotago.Version]iotago.EpochIndex{ + 3: 0, + 5: 13, + }, ts.Nodes()...) + + ts.AssertVersionAndProtocolParameters(map[iotago.Version]iotago.ProtocolParameters{ + 3: ts.API.ProtocolParameters(), + 5: nil, + }, ts.Nodes()...) + + ts.AssertVersionAndProtocolParametersHashes(map[iotago.Version]iotago.Identifier{ + 3: lo.PanicOnErr(ts.API.ProtocolParameters().Hash()), + 5: hash1, + }, ts.Nodes()...) + + // check account data at the end of the test + ts.AssertAccountData(&accounts.AccountData{ + ID: ts.Node("nodeA").AccountID, + Credits: &accounts.BlockIssuanceCredits{Value: math.MaxInt64, UpdateTime: 0}, + ExpirySlot: math.MaxUint64, + OutputID: iotago.OutputIDFromTransactionIDAndIndex(snapshotcreator.GenesisTransactionID, 1), + BlockIssuerKeys: ds.NewSet[iotago.BlockIssuerKey](iotago.BlockIssuerKeyEd25519FromPublicKey(ed25519.PublicKey(ts.Node("nodeA").PubKey))), + ValidatorStake: testsuite.MinValidatorAccountAmount, + DelegationStake: 0, + FixedCost: 0, + StakeEndEpoch: math.MaxUint64, + LatestSupportedProtocolVersionAndHash: model.VersionAndHash{Version: 5, Hash: hash1}, + }, ts.Nodes()...) + + ts.AssertAccountData(&accounts.AccountData{ + ID: ts.Node("nodeD").AccountID, + Credits: &accounts.BlockIssuanceCredits{Value: math.MaxInt64, UpdateTime: 0}, + ExpirySlot: math.MaxUint64, + OutputID: iotago.OutputIDFromTransactionIDAndIndex(snapshotcreator.GenesisTransactionID, 4), + BlockIssuerKeys: ds.NewSet[iotago.BlockIssuerKey](iotago.BlockIssuerKeyEd25519FromPublicKey(ed25519.PublicKey(ts.Node("nodeD").PubKey))), + ValidatorStake: testsuite.MinValidatorAccountAmount, + DelegationStake: 0, + FixedCost: 0, + StakeEndEpoch: math.MaxUint64, + LatestSupportedProtocolVersionAndHash: model.VersionAndHash{Version: 5, Hash: hash2}, + }, ts.Nodes()...) + } + + // TODO: Check that issuing still produces the same commitments } From 83a74ddd76bb3fbb9583e7529c457362435d585b Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:56:14 +0800 Subject: [PATCH 02/18] Fix issue where future version is not persisted to settings --- pkg/storage/permanent/settings.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/storage/permanent/settings.go b/pkg/storage/permanent/settings.go index f785020ee..50dfc62ee 100644 --- a/pkg/storage/permanent/settings.go +++ b/pkg/storage/permanent/settings.go @@ -186,7 +186,9 @@ func (s *Settings) StoreFutureProtocolParametersHash(version iotago.Version, has return err } - // TODO: don't we need to store to protocolVersionEpochMapping here as well? + if err := s.store.Set([]byte{protocolVersionEpochMappingKey, byte(version)}, epochBytes); err != nil { + return err + } s.apiProvider.AddFutureVersion(version, hash, epoch) From cf3302ce8df0f95b71f2b4b4f598b998f0400ec8 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Mon, 4 Sep 2023 20:10:57 +0800 Subject: [PATCH 03/18] Update to changes from iota.go and initialize api provider --- go.mod | 2 +- go.sum | 4 ++-- .../upgrade/signalingupgradeorchestrator/orchestrator.go | 8 +++++--- pkg/protocol/snapshotcreator/snapshotcreator.go | 1 + pkg/storage/permanent/settings.go | 4 +++- tools/evil-spammer/go.mod | 2 +- tools/evil-spammer/go.sum | 4 ++-- tools/gendoc/go.mod | 2 +- tools/gendoc/go.sum | 4 ++-- tools/genesis-snapshot/go.mod | 2 +- tools/genesis-snapshot/go.sum | 4 ++-- 11 files changed, 21 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 8ee963cad..a56ef24ed 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b - github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 + github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 github.com/libp2p/go-libp2p v0.30.0 diff --git a/go.sum b/go.sum index 0b10673ac..aa814beb4 100644 --- a/go.sum +++ b/go.sum @@ -292,8 +292,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc h1:WZEFBEUITYsVwOePpMnEfq4I3HG2TAiGdIy2LCcWSuw= +github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/pkg/protocol/engine/upgrade/signalingupgradeorchestrator/orchestrator.go b/pkg/protocol/engine/upgrade/signalingupgradeorchestrator/orchestrator.go index 6c99e955a..01b6a295f 100644 --- a/pkg/protocol/engine/upgrade/signalingupgradeorchestrator/orchestrator.go +++ b/pkg/protocol/engine/upgrade/signalingupgradeorchestrator/orchestrator.go @@ -90,11 +90,13 @@ func NewProvider(opts ...options.Option[Orchestrator]) module.Provider[*engine.E for _, protocolParams := range o.optsProtocolParameters { storedProtocolParams := e.Storage.Settings().APIProvider().ProtocolParameters(protocolParams.Version()) if storedProtocolParams != nil { - if lo.PanicOnErr(storedProtocolParams.Hash()) == lo.PanicOnErr(protocolParams.Hash()) { - continue + if lo.PanicOnErr(storedProtocolParams.Hash()) != lo.PanicOnErr(protocolParams.Hash()) { + panic(ierrors.Errorf("protocol parameters for version %d already exist with different hash", protocolParams.Version())) } - panic(ierrors.Errorf("protocol parameters for version %d already exist with different hash", protocolParams.Version())) + if !storedProtocolParams.Equals(protocolParams) { + panic(ierrors.Errorf("protocol parameters for version %d already exist but are not equal", protocolParams.Version())) + } } if err := e.Storage.Settings().StoreProtocolParameters(protocolParams); err != nil { diff --git a/pkg/protocol/snapshotcreator/snapshotcreator.go b/pkg/protocol/snapshotcreator/snapshotcreator.go index a12056a7f..a5728fdcb 100644 --- a/pkg/protocol/snapshotcreator/snapshotcreator.go +++ b/pkg/protocol/snapshotcreator/snapshotcreator.go @@ -60,6 +60,7 @@ func CreateSnapshot(opts ...options.Option[Options]) error { if err := s.Settings().StoreProtocolParametersForStartEpoch(opt.ProtocolParameters, 0); err != nil { return ierrors.Wrap(err, "failed to store the protocol parameters for epoch 0") } + s.Settings().APIProvider().Initialize(0) api := s.Settings().APIProvider().CurrentAPI() if err := s.Commitments().Store(model.NewEmptyCommitment(api)); err != nil { diff --git a/pkg/storage/permanent/settings.go b/pkg/storage/permanent/settings.go index 50dfc62ee..46e0841bc 100644 --- a/pkg/storage/permanent/settings.go +++ b/pkg/storage/permanent/settings.go @@ -42,7 +42,7 @@ func NewSettings(store kvstore.KVStore) (settings *Settings) { s.loadFutureProtocolParameters() s.loadProtocolParameters() if s.IsSnapshotImported() { - s.apiProvider.SetCurrentSlot(s.latestCommitment().Index()) + s.apiProvider.Initialize(s.latestCommitment().Index()) } return s @@ -509,6 +509,8 @@ func (s *Settings) Import(reader io.ReadSeeker) (err error) { return ierrors.Wrap(err, "failed to parse commitment") } + s.apiProvider.Initialize(commitment.Index()) + if err := s.SetLatestCommitment(commitment); err != nil { return ierrors.Wrap(err, "failed to set latest commitment") } diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index aa5a72036..ad61a090a 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 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-20230829160021-46cad51e89d1 + github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index d31d588ba..def21d930 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -197,8 +197,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc h1:WZEFBEUITYsVwOePpMnEfq4I3HG2TAiGdIy2LCcWSuw= +github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index b1d915b61..945db088b 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -68,7 +68,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index d9e9dff98..2659c2a59 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -296,8 +296,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc h1:WZEFBEUITYsVwOePpMnEfq4I3HG2TAiGdIy2LCcWSuw= +github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 7c79aeb82..6a8d7f5a4 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 + github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.12.0 diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 93ed44b04..2e3b13b5b 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -50,8 +50,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc h1:WZEFBEUITYsVwOePpMnEfq4I3HG2TAiGdIy2LCcWSuw= +github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= From b0a1319d776636ef73e3033f6ea52bf27742d07e Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Mon, 4 Sep 2023 21:05:01 +0800 Subject: [PATCH 04/18] Extend upgrade signaling test to check for parameters of restarted and from snapshot started node after upgrade is decided. Make sure that all nodes commit to the correct parameters as well --- pkg/tests/upgrade_signaling_test.go | 83 +++++++++++++++++++---------- pkg/testsuite/upgrades.go | 4 ++ 2 files changed, 60 insertions(+), 27 deletions(-) diff --git a/pkg/tests/upgrade_signaling_test.go b/pkg/tests/upgrade_signaling_test.go index 6f12ab141..266cef3b8 100644 --- a/pkg/tests/upgrade_signaling_test.go +++ b/pkg/tests/upgrade_signaling_test.go @@ -19,6 +19,7 @@ import ( "github.com/iotaledger/iota-core/pkg/protocol/engine" "github.com/iotaledger/iota-core/pkg/protocol/engine/accounts" "github.com/iotaledger/iota-core/pkg/protocol/engine/blocks" + "github.com/iotaledger/iota-core/pkg/protocol/engine/upgrade/signalingupgradeorchestrator" "github.com/iotaledger/iota-core/pkg/protocol/snapshotcreator" "github.com/iotaledger/iota-core/pkg/storage" "github.com/iotaledger/iota-core/pkg/testsuite" @@ -72,7 +73,16 @@ func Test_Upgrade_Signaling(t *testing.T) { ts.Wait() - hash1 := iotago.Identifier{1} + v5ProtocolParameters := iotago.NewV3ProtocolParameters( + iotago.WithVersion(5), + iotago.WithTimeProviderOptions( + ts.API.TimeProvider().GenesisUnixTime(), + uint8(ts.API.TimeProvider().SlotDurationSeconds()), + uint8(math.Log2(float64(ts.API.TimeProvider().EpochDurationSlots()))), + ), + ) + + hash1 := lo.PanicOnErr(v5ProtocolParameters.Hash()) hash2 := iotago.Identifier{2} ts.AssertAccountData(&accounts.AccountData{ @@ -197,7 +207,7 @@ func Test_Upgrade_Signaling(t *testing.T) { nodeE.Shutdown() ts.RemoveNode("nodeE") - nodeE1 := ts.AddNode("nodeE.1") + nodeE1 := ts.AddNode("nodeE1") nodeE1.CopyIdentityFromNode(nodeE) nodeE1.Initialize(true, append(nodeOptions, @@ -233,10 +243,10 @@ func Test_Upgrade_Signaling(t *testing.T) { // TODO: would be great to dynamically add accounts for later nodes. // Can't issue on nodeG as its account is not known. - ts.IssueBlocksAtSlots("", []iotago.SlotIndex{45, 46, 47}, 4, "44.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeE.1"), true, nil) + ts.IssueBlocksAtSlots("", []iotago.SlotIndex{45, 46, 47}, 4, "44.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeE1"), true, nil) - ts.IssueBlocksAtEpoch("", 6, 4, "47.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeE.1"), true, nil) - ts.IssueBlocksAtEpoch("", 7, 4, "55.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeE.1"), true, nil) + ts.IssueBlocksAtEpoch("", 6, 4, "47.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeE1"), true, nil) + ts.IssueBlocksAtEpoch("", 7, 4, "55.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeE1"), true, nil) // Restart node (and add protocol parameters) and add another node from snapshot (also with protocol parameters already set). { @@ -250,41 +260,49 @@ func Test_Upgrade_Signaling(t *testing.T) { testsuite.WithActiveRootBlocks(expectedRootBlocks), ) - // Shutdown nodeE.1 and restart it from disk. Verify state. + // Shutdown nodeE1 and restart it from disk as nodeE2. Verify state. { - nodeE1 := ts.Node("nodeE.1") + nodeE1 := ts.Node("nodeE1") nodeE1.Shutdown() - ts.RemoveNode("nodeE.1") + ts.RemoveNode("nodeE1") - nodeE2 := ts.AddNode("nodeE.2") + nodeE2 := ts.AddNode("nodeE2") nodeE2.CopyIdentityFromNode(nodeE1) nodeE2.Initialize(true, append(nodeOptions, - protocol.WithBaseDirectory(ts.Directory.Path(nodeE1.Name)), + protocol.WithBaseDirectory(ts.Directory.Path("nodeE")), + protocol.WithUpgradeOrchestratorProvider( + signalingupgradeorchestrator.NewProvider(signalingupgradeorchestrator.WithProtocolParameters(v5ProtocolParameters)), + ), + )..., + ) + ts.Wait() + } + + // Create snapshot and start new nodeH from it. + { + snapshotPath := ts.Directory.Path(fmt.Sprintf("%d_snapshot", time.Now().Unix())) + require.NoError(t, ts.Node("nodeE2").Protocol.MainEngineInstance().WriteSnapshot(snapshotPath)) + + nodeG := ts.AddNode("nodeH") + nodeG.Initialize(true, + append(nodeOptions, + protocol.WithSnapshotPath(snapshotPath), + protocol.WithBaseDirectory(ts.Directory.PathWithCreate(nodeG.Name)), + protocol.WithUpgradeOrchestratorProvider( + signalingupgradeorchestrator.NewProvider(signalingupgradeorchestrator.WithProtocolParameters(v5ProtocolParameters)), + ), )..., ) ts.Wait() } - // // Create snapshot. - // snapshotPath := ts.Directory.Path(fmt.Sprintf("%d_snapshot", time.Now().Unix())) - // require.NoError(t, ts.Node("nodeA").Protocol.MainEngineInstance().WriteSnapshot(snapshotPath)) - // - // { - // nodeG := ts.AddNode("nodeG") - // nodeG.Initialize(true, - // append(nodeOptions, - // protocol.WithSnapshotPath(snapshotPath), - // protocol.WithBaseDirectory(ts.Directory.PathWithCreate(nodeG.Name)), - // )..., - // ) - // ts.Wait() - // ts.AssertNodeState(ts.Nodes(), testsuite.WithLatestCommitmentSlotIndex(61), + testsuite.WithEqualStoredCommitmentAtIndex(61), + testsuite.WithActiveRootBlocks(expectedRootBlocks), ) - // } } // Verify final state of all nodes. @@ -297,7 +315,13 @@ func Test_Upgrade_Signaling(t *testing.T) { ts.AssertVersionAndProtocolParameters(map[iotago.Version]iotago.ProtocolParameters{ 3: ts.API.ProtocolParameters(), 5: nil, - }, ts.Nodes()...) + }, ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF", "nodeG")...) + + // We've started nodeH with the v5 protocol parameters set. Therefore, they should be available. + ts.AssertVersionAndProtocolParameters(map[iotago.Version]iotago.ProtocolParameters{ + 3: ts.API.ProtocolParameters(), + 5: v5ProtocolParameters, + }, ts.Nodes("nodeE2", "nodeH")...) ts.AssertVersionAndProtocolParametersHashes(map[iotago.Version]iotago.Identifier{ 3: lo.PanicOnErr(ts.API.ProtocolParameters().Hash()), @@ -332,5 +356,10 @@ func Test_Upgrade_Signaling(t *testing.T) { }, ts.Nodes()...) } - // TODO: Check that issuing still produces the same commitments + // Check that issuing still produces the same commitments + ts.IssueBlocksAtEpoch("", 8, 4, "63.3", ts.Nodes("nodeA", "nodeB", "nodeC", "nodeD", "nodeF"), true, nil) + ts.AssertNodeState(ts.Nodes(), + testsuite.WithLatestCommitmentSlotIndex(69), + testsuite.WithEqualStoredCommitmentAtIndex(69), + ) } diff --git a/pkg/testsuite/upgrades.go b/pkg/testsuite/upgrades.go index 00fdfb424..cb79bfa36 100644 --- a/pkg/testsuite/upgrades.go +++ b/pkg/testsuite/upgrades.go @@ -50,6 +50,10 @@ func (t *TestSuite) AssertVersionAndProtocolParameters(versionsAndProtocolParame return ierrors.Errorf("AssertVersionAndProtocolParameters: %s: for version %d protocol parameters not equal. expected %s, got nil", node.Name, version, lo.PanicOnErr(expectedProtocolParameters.Hash())) } + if !expectedProtocolParameters.Equals(protocolParameters) { + return ierrors.Errorf("AssertVersionAndProtocolParameters: %s: for version %d protocol parameters not equal. expected %v, got %v", node.Name, version, expectedProtocolParameters, protocolParameters) + } + if lo.PanicOnErr(expectedProtocolParameters.Hash()) != lo.PanicOnErr(protocolParameters.Hash()) { return ierrors.Errorf("AssertVersionAndProtocolParameters: %s: for version %d protocol parameters not equal. expected %s, got %s", node.Name, version, lo.PanicOnErr(expectedProtocolParameters.Hash()), lo.PanicOnErr(protocolParameters.Hash())) } From 26b16a2e3d73f654dbefbe7eb9eb368edce260d7 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Wed, 6 Sep 2023 10:35:40 +0800 Subject: [PATCH 05/18] Adjust to changes in iota.go --- go.mod | 2 +- go.sum | 4 ++-- .../snapshotcreator/snapshotcreator.go | 1 - pkg/storage/options.go | 7 +++++++ pkg/storage/permanent/options.go | 12 +++++++++++ pkg/storage/permanent/permanent.go | 5 ++++- pkg/storage/permanent/settings.go | 21 +++++++++++-------- pkg/storage/storage.go | 3 ++- pkg/storage/testframework_test.go | 2 +- pkg/tests/upgrade_signaling_test.go | 9 ++++++++ tools/evil-spammer/go.mod | 2 +- tools/evil-spammer/go.sum | 4 ++-- tools/gendoc/go.mod | 2 +- tools/gendoc/go.sum | 4 ++-- tools/genesis-snapshot/go.mod | 2 +- tools/genesis-snapshot/go.sum | 4 ++-- 16 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 pkg/storage/permanent/options.go diff --git a/go.mod b/go.mod index a56ef24ed..9cb2e2706 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b - github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc + github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 github.com/libp2p/go-libp2p v0.30.0 diff --git a/go.sum b/go.sum index aa814beb4..9902148ca 100644 --- a/go.sum +++ b/go.sum @@ -292,8 +292,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc h1:WZEFBEUITYsVwOePpMnEfq4I3HG2TAiGdIy2LCcWSuw= -github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf h1:8es1TDpsOUR9t65kK8aqMt+DwUaK9wVfvRV/CKZz6LU= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/pkg/protocol/snapshotcreator/snapshotcreator.go b/pkg/protocol/snapshotcreator/snapshotcreator.go index a5728fdcb..a12056a7f 100644 --- a/pkg/protocol/snapshotcreator/snapshotcreator.go +++ b/pkg/protocol/snapshotcreator/snapshotcreator.go @@ -60,7 +60,6 @@ func CreateSnapshot(opts ...options.Option[Options]) error { if err := s.Settings().StoreProtocolParametersForStartEpoch(opt.ProtocolParameters, 0); err != nil { return ierrors.Wrap(err, "failed to store the protocol parameters for epoch 0") } - s.Settings().APIProvider().Initialize(0) api := s.Settings().APIProvider().CurrentAPI() if err := s.Commitments().Store(model.NewEmptyCommitment(api)); err != nil { diff --git a/pkg/storage/options.go b/pkg/storage/options.go index 15e6703d2..21751e106 100644 --- a/pkg/storage/options.go +++ b/pkg/storage/options.go @@ -5,6 +5,7 @@ import ( hivedb "github.com/iotaledger/hive.go/kvstore/database" "github.com/iotaledger/hive.go/runtime/options" + "github.com/iotaledger/iota-core/pkg/storage/permanent" "github.com/iotaledger/iota-core/pkg/storage/prunable" iotago "github.com/iotaledger/iota.go/v4" ) @@ -56,3 +57,9 @@ func WithPruningSizeCooldownTime(cooldown time.Duration) options.Option[Storage] p.optsPruningSizeCooldownTime = cooldown } } + +func WithPermanentOptions(opts ...options.Option[permanent.Permanent]) options.Option[Storage] { + return func(s *Storage) { + s.optsPermanent = append(s.optsPermanent, opts...) + } +} diff --git a/pkg/storage/permanent/options.go b/pkg/storage/permanent/options.go new file mode 100644 index 000000000..300615baa --- /dev/null +++ b/pkg/storage/permanent/options.go @@ -0,0 +1,12 @@ +package permanent + +import ( + "github.com/iotaledger/hive.go/runtime/options" + "github.com/iotaledger/iota.go/v4/api" +) + +func WithEpochBasedProviderOptions(opts ...options.Option[api.EpochBasedProvider]) options.Option[Permanent] { + return func(p *Permanent) { + p.optsEpochBasedProvider = append(p.optsEpochBasedProvider, opts...) + } +} diff --git a/pkg/storage/permanent/permanent.go b/pkg/storage/permanent/permanent.go index 72ce83a9f..1d81d4399 100644 --- a/pkg/storage/permanent/permanent.go +++ b/pkg/storage/permanent/permanent.go @@ -9,6 +9,7 @@ import ( "github.com/iotaledger/iota-core/pkg/protocol/engine/utxoledger" "github.com/iotaledger/iota-core/pkg/storage/database" iotago "github.com/iotaledger/iota.go/v4" + "github.com/iotaledger/iota.go/v4/api" ) const ( @@ -30,6 +31,8 @@ type Permanent struct { utxoLedger *utxoledger.Manager accounts kvstore.KVStore latestNonEmptySlot kvstore.KVStore + + optsEpochBasedProvider []options.Option[api.EpochBasedProvider] } // New returns a new permanent storage instance. @@ -39,7 +42,7 @@ func New(dbConfig database.Config, errorHandler func(error), opts ...options.Opt dbConfig: dbConfig, }, opts, func(p *Permanent) { p.store = database.NewDBInstance(p.dbConfig) - p.settings = NewSettings(lo.PanicOnErr(p.store.KVStore().WithExtendedRealm(kvstore.Realm{settingsPrefix}))) + p.settings = NewSettings(lo.PanicOnErr(p.store.KVStore().WithExtendedRealm(kvstore.Realm{settingsPrefix})), p.optsEpochBasedProvider...) p.commitments = NewCommitments(lo.PanicOnErr(p.store.KVStore().WithExtendedRealm(kvstore.Realm{commitmentsPrefix})), p.settings.APIProvider()) p.utxoLedger = utxoledger.New(lo.PanicOnErr(p.store.KVStore().WithExtendedRealm(kvstore.Realm{ledgerPrefix})), p.settings.APIProvider()) p.accounts = lo.PanicOnErr(p.store.KVStore().WithExtendedRealm(kvstore.Realm{accountsPrefix})) diff --git a/pkg/storage/permanent/settings.go b/pkg/storage/permanent/settings.go index 46e0841bc..cd67d1d76 100644 --- a/pkg/storage/permanent/settings.go +++ b/pkg/storage/permanent/settings.go @@ -7,6 +7,7 @@ import ( "github.com/iotaledger/hive.go/ierrors" "github.com/iotaledger/hive.go/kvstore" "github.com/iotaledger/hive.go/lo" + "github.com/iotaledger/hive.go/runtime/options" "github.com/iotaledger/hive.go/runtime/syncutils" "github.com/iotaledger/hive.go/serializer/v2/byteutils" "github.com/iotaledger/hive.go/serializer/v2/stream" @@ -32,17 +33,17 @@ type Settings struct { apiProvider *api.EpochBasedProvider } -func NewSettings(store kvstore.KVStore) (settings *Settings) { +func NewSettings(store kvstore.KVStore, opts ...options.Option[api.EpochBasedProvider]) (settings *Settings) { s := &Settings{ store: store, - apiProvider: api.NewEpochBasedProvider(), + apiProvider: api.NewEpochBasedProvider(opts...), } - s.loadProtocolParametersEpochMappings() - s.loadFutureProtocolParameters() s.loadProtocolParameters() + s.loadFutureProtocolParameters() + s.loadProtocolParametersEpochMappings() if s.IsSnapshotImported() { - s.apiProvider.Initialize(s.latestCommitment().Index()) + s.apiProvider.SetCurrentSlot(s.latestCommitment().Index()) } return s @@ -122,11 +123,15 @@ func (s *Settings) APIProvider() *api.EpochBasedProvider { } func (s *Settings) StoreProtocolParametersForStartEpoch(params iotago.ProtocolParameters, startEpoch iotago.EpochIndex) error { + if err := s.StoreProtocolParameters(params); err != nil { + return ierrors.Wrap(err, "failed to store protocol parameters") + } + if err := s.storeProtocolParametersEpochMapping(params.Version(), startEpoch); err != nil { - return err + return ierrors.Wrap(err, "failed to store protocol version epoch mapping") } - return s.StoreProtocolParameters(params) + return nil } func (s *Settings) StoreProtocolParameters(params iotago.ProtocolParameters) error { @@ -509,8 +514,6 @@ func (s *Settings) Import(reader io.ReadSeeker) (err error) { return ierrors.Wrap(err, "failed to parse commitment") } - s.apiProvider.Initialize(commitment.Index()) - if err := s.SetLatestCommitment(commitment); err != nil { return ierrors.Wrap(err, "failed to set latest commitment") } diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index ee220e88c..ddbfa90af 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -48,6 +48,7 @@ type Storage struct { optsPruningSizeReductionPercentage float64 optsBucketManagerOptions []options.Option[prunable.BucketManager] optsPruningSizeCooldownTime time.Duration + optsPermanent []options.Option[permanent.Permanent] } // New creates a new storage instance with the named database version in the given directory. @@ -71,7 +72,7 @@ func New(directory string, dbVersion byte, errorHandler func(error), opts ...opt PrefixHealth: []byte{storePrefixHealth}, } - s.permanent = permanent.New(dbConfig, errorHandler) + s.permanent = permanent.New(dbConfig, errorHandler, s.optsPermanent...) s.prunable = prunable.New(dbConfig.WithDirectory(s.dir.PathWithCreate(prunableDirName)), s.Settings().APIProvider(), s.errorHandler, s.optsBucketManagerOptions...) }) } diff --git a/pkg/storage/testframework_test.go b/pkg/storage/testframework_test.go index b684efb96..86cd2ff7c 100644 --- a/pkg/storage/testframework_test.go +++ b/pkg/storage/testframework_test.go @@ -79,7 +79,7 @@ func (t *TestFramework) RestoreFromDisk() { func (t *TestFramework) SetLatestFinalizedEpoch(epoch iotago.EpochIndex) { // We make sure that the given epoch is seen as finalized by setting the latest finalized slot to the start slot of the next epoch. - startSlotNextEpoch := t.Instance.Settings().APIProvider().CurrentAPI().TimeProvider().EpochStart(epoch + 1) + startSlotNextEpoch := t.Instance.Settings().APIProvider().LatestAPI().TimeProvider().EpochStart(epoch + 1) require.NoError(t.t, t.Instance.Settings().SetLatestFinalizedSlot(startSlotNextEpoch)) } diff --git a/pkg/tests/upgrade_signaling_test.go b/pkg/tests/upgrade_signaling_test.go index 266cef3b8..0783ac2d1 100644 --- a/pkg/tests/upgrade_signaling_test.go +++ b/pkg/tests/upgrade_signaling_test.go @@ -22,8 +22,10 @@ import ( "github.com/iotaledger/iota-core/pkg/protocol/engine/upgrade/signalingupgradeorchestrator" "github.com/iotaledger/iota-core/pkg/protocol/snapshotcreator" "github.com/iotaledger/iota-core/pkg/storage" + "github.com/iotaledger/iota-core/pkg/storage/permanent" "github.com/iotaledger/iota-core/pkg/testsuite" iotago "github.com/iotaledger/iota.go/v4" + "github.com/iotaledger/iota.go/v4/api" ) func Test_Upgrade_Signaling(t *testing.T) { @@ -52,6 +54,13 @@ func Test_Upgrade_Signaling(t *testing.T) { ), protocol.WithStorageOptions( storage.WithPruningDelay(20), + storage.WithPermanentOptions( + permanent.WithEpochBasedProviderOptions( + api.WithAPIForMissingVersionCallback(func(version iotago.Version) (iotago.API, error) { + return ts.API, nil + }), + ), + ), ), } diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index ad61a090a..ceee59fed 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 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-20230904121139-7d02629e2ffc + github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index def21d930..2cc1767db 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -197,8 +197,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc h1:WZEFBEUITYsVwOePpMnEfq4I3HG2TAiGdIy2LCcWSuw= -github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf h1:8es1TDpsOUR9t65kK8aqMt+DwUaK9wVfvRV/CKZz6LU= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index 945db088b..bcab74050 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -68,7 +68,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 2659c2a59..6aefd870a 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -296,8 +296,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc h1:WZEFBEUITYsVwOePpMnEfq4I3HG2TAiGdIy2LCcWSuw= -github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf h1:8es1TDpsOUR9t65kK8aqMt+DwUaK9wVfvRV/CKZz6LU= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 6a8d7f5a4..de8a0b019 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc + github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.12.0 diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 2e3b13b5b..55efb67d4 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -50,8 +50,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc h1:WZEFBEUITYsVwOePpMnEfq4I3HG2TAiGdIy2LCcWSuw= -github.com/iotaledger/iota.go/v4 v4.0.0-20230904121139-7d02629e2ffc/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf h1:8es1TDpsOUR9t65kK8aqMt+DwUaK9wVfvRV/CKZz6LU= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= From ca91c3ebcafd96abebb51299eedced1a258356a3 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Wed, 6 Sep 2023 11:23:24 +0800 Subject: [PATCH 06/18] Don't export future protocol parameters --- go.mod | 2 +- go.sum | 4 ++-- pkg/storage/permanent/settings.go | 33 ++++++++++++++++++------------- tools/evil-spammer/go.mod | 2 +- tools/evil-spammer/go.sum | 4 ++-- tools/gendoc/go.mod | 2 +- tools/gendoc/go.sum | 4 ++-- tools/genesis-snapshot/go.mod | 2 +- tools/genesis-snapshot/go.sum | 4 ++-- 9 files changed, 31 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 9cb2e2706..8c53e8035 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b - github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf + github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 github.com/libp2p/go-libp2p v0.30.0 diff --git a/go.sum b/go.sum index 9902148ca..b99e003a4 100644 --- a/go.sum +++ b/go.sum @@ -292,8 +292,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf h1:8es1TDpsOUR9t65kK8aqMt+DwUaK9wVfvRV/CKZz6LU= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/pkg/storage/permanent/settings.go b/pkg/storage/permanent/settings.go index cd67d1d76..f4f6d70d5 100644 --- a/pkg/storage/permanent/settings.go +++ b/pkg/storage/permanent/settings.go @@ -149,9 +149,6 @@ func (s *Settings) StoreProtocolParameters(params iotago.ProtocolParameters) err s.apiProvider.AddProtocolParameters(params) - // Delete the old future protocol parameters if they exist. - _ = s.store.Delete([]byte{futureProtocolParametersKey, byte(params.Version())}) - return nil } @@ -227,6 +224,9 @@ func (s *Settings) SetLatestCommitment(latestCommitment *model.Commitment) (err s.apiProvider.SetCurrentSlot(latestCommitment.Index()) + // Delete the old future protocol parameters if they exist. + _ = s.store.Delete([]byte{futureProtocolParametersKey, byte(s.apiProvider.VersionForSlot(latestCommitment.Index()))}) + return s.store.Set([]byte{latestCommitmentKey}, latestCommitment.Data()) } @@ -294,11 +294,11 @@ func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commit return ierrors.Wrap(err, "failed to write latest finalized slot") } + s.mutex.RLock() + defer s.mutex.RUnlock() + // Export protocol versions if err := stream.WriteCollection(writer, func() (uint64, error) { - s.mutex.RLock() - defer s.mutex.RUnlock() - var count uint64 var innerErr error if err := s.store.Iterate([]byte{protocolVersionEpochMappingKey}, func(key kvstore.Key, value kvstore.Value) bool { @@ -341,9 +341,6 @@ func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commit // Export future protocol parameters if err := stream.WriteCollection(writer, func() (uint64, error) { - s.mutex.RLock() - defer s.mutex.RUnlock() - var count uint64 var innerErr error if err := s.store.Iterate([]byte{futureProtocolParametersKey}, func(key kvstore.Key, value kvstore.Value) bool { @@ -395,14 +392,22 @@ func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commit return ierrors.Wrap(err, "failed to stream write future protocol parameters") } - // Export protocol parameters + // Export protocol parameters: we only export the parameters up until the current active ones. if err := stream.WriteCollection(writer, func() (uint64, error) { - s.mutex.RLock() - defer s.mutex.RUnlock() - var paramsCount uint64 var innerErr error - if err := s.store.Iterate([]byte{protocolParametersKey}, func(_ kvstore.Key, value kvstore.Value) bool { + if err := s.store.Iterate([]byte{protocolParametersKey}, func(key kvstore.Key, value kvstore.Value) bool { + version, _, err := iotago.VersionFromBytes(key[1:]) + if err != nil { + innerErr = ierrors.Wrap(err, "failed to read version") + return false + } + + if s.apiProvider.IsFutureVersion(version) { + // We don't export future protocol parameters, just skip to the next ones. + return true + } + if err := stream.WriteBlob(writer, value); err != nil { innerErr = err return false diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index ceee59fed..399287917 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 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-20230906015126-84a03f46bcbf + github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index 2cc1767db..a2c114086 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -197,8 +197,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf h1:8es1TDpsOUR9t65kK8aqMt+DwUaK9wVfvRV/CKZz6LU= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index bcab74050..6c5c8c41b 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -68,7 +68,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 6aefd870a..01da59b0f 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -296,8 +296,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf h1:8es1TDpsOUR9t65kK8aqMt+DwUaK9wVfvRV/CKZz6LU= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index de8a0b019..95e22b30c 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf + github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.12.0 diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 55efb67d4..9cebf2928 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -50,8 +50,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf h1:8es1TDpsOUR9t65kK8aqMt+DwUaK9wVfvRV/CKZz6LU= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906015126-84a03f46bcbf/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= From 4148ad652a5a744c311b33233901adef4851c1fc Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Wed, 6 Sep 2023 12:55:32 +0800 Subject: [PATCH 07/18] Simplify settings store --- pkg/storage/permanent/settings.go | 170 ++++++++++++------------------ 1 file changed, 65 insertions(+), 105 deletions(-) diff --git a/pkg/storage/permanent/settings.go b/pkg/storage/permanent/settings.go index f4f6d70d5..21ace4d09 100644 --- a/pkg/storage/permanent/settings.go +++ b/pkg/storage/permanent/settings.go @@ -4,6 +4,7 @@ import ( "fmt" "io" + "github.com/iotaledger/hive.go/ds/types" "github.com/iotaledger/hive.go/ierrors" "github.com/iotaledger/hive.go/kvstore" "github.com/iotaledger/hive.go/lo" @@ -27,8 +28,11 @@ const ( ) type Settings struct { - mutex syncutils.RWMutex - store kvstore.KVStore + mutex syncutils.RWMutex + store kvstore.KVStore + storeProtocolVersionEpochMapping *kvstore.TypedStore[iotago.Version, iotago.EpochIndex] + storeFutureProtocolParameters *kvstore.TypedStore[iotago.Version, *types.Tuple[iotago.EpochIndex, iotago.Identifier]] + storeProtocolParameters *kvstore.TypedStore[iotago.Version, iotago.ProtocolParameters] apiProvider *api.EpochBasedProvider } @@ -37,6 +41,41 @@ func NewSettings(store kvstore.KVStore, opts ...options.Option[api.EpochBasedPro s := &Settings{ store: store, apiProvider: api.NewEpochBasedProvider(opts...), + storeProtocolVersionEpochMapping: kvstore.NewTypedStore[iotago.Version, iotago.EpochIndex]( + lo.PanicOnErr(store.WithExtendedRealm([]byte{protocolVersionEpochMappingKey})), + iotago.Version.Bytes, + iotago.VersionFromBytes, + iotago.EpochIndex.Bytes, + iotago.EpochIndexFromBytes, + ), + storeFutureProtocolParameters: kvstore.NewTypedStore[iotago.Version, *types.Tuple[iotago.EpochIndex, iotago.Identifier]]( + lo.PanicOnErr(store.WithExtendedRealm([]byte{futureProtocolParametersKey})), + iotago.Version.Bytes, + iotago.VersionFromBytes, + func(t *types.Tuple[iotago.EpochIndex, iotago.Identifier]) ([]byte, error) { + return byteutils.ConcatBytes(t.A.MustBytes(), lo.PanicOnErr(t.B.Bytes())), nil + }, + func(b []byte) (*types.Tuple[iotago.EpochIndex, iotago.Identifier], int, error) { + epoch, consumedBytes, err := iotago.EpochIndexFromBytes(b) + if err != nil { + return nil, 0, ierrors.Wrap(err, "failed to parse epoch index") + } + + hash, consumedBytes2, err := iotago.IdentifierFromBytes(b[consumedBytes:]) + if err != nil { + return nil, 0, ierrors.Wrap(err, "failed to parse identifier") + } + + return types.NewTuple(epoch, hash), consumedBytes + consumedBytes2, nil + }, + ), + storeProtocolParameters: kvstore.NewTypedStore[iotago.Version, iotago.ProtocolParameters]( + lo.PanicOnErr(store.WithExtendedRealm([]byte{protocolParametersKey})), + iotago.Version.Bytes, + iotago.VersionFromBytes, + iotago.ProtocolParameters.Bytes, + iotago.ProtocolParametersFromBytes, + ), } s.loadProtocolParameters() @@ -53,17 +92,7 @@ func (s *Settings) loadProtocolParametersEpochMappings() { s.mutex.Lock() defer s.mutex.Unlock() - if err := s.store.Iterate([]byte{protocolVersionEpochMappingKey}, func(key kvstore.Key, value kvstore.Value) bool { - version, _, err := iotago.VersionFromBytes(key[1:]) - if err != nil { - panic(err) - } - - epoch, _, err := iotago.EpochIndexFromBytes(value) - if err != nil { - panic(err) - } - + if err := s.storeProtocolVersionEpochMapping.Iterate(kvstore.EmptyPrefix, func(version iotago.Version, epoch iotago.EpochIndex) bool { s.apiProvider.AddVersion(version, epoch) return true @@ -76,12 +105,7 @@ func (s *Settings) loadProtocolParameters() { s.mutex.Lock() defer s.mutex.Unlock() - if err := s.store.Iterate([]byte{protocolParametersKey}, func(key kvstore.Key, value kvstore.Value) bool { - protocolParams, _, err := iotago.ProtocolParametersFromBytes(value) - if err != nil { - return true // skip over invalid protocol parameters - } - + if err := s.storeProtocolParameters.Iterate(kvstore.EmptyPrefix, func(version iotago.Version, protocolParams iotago.ProtocolParameters) bool { s.apiProvider.AddProtocolParameters(protocolParams) return true @@ -94,23 +118,8 @@ func (s *Settings) loadFutureProtocolParameters() { s.mutex.Lock() defer s.mutex.Unlock() - if err := s.store.Iterate([]byte{futureProtocolParametersKey}, func(key kvstore.Key, value kvstore.Value) bool { - version, _, err := iotago.VersionFromBytes(key[1:]) - if err != nil { - panic(err) - } - - epoch, read, err := iotago.EpochIndexFromBytes(value) - if err != nil { - panic(err) - } - - hash, _, err := iotago.IdentifierFromBytes(value[read:]) - if err != nil { - panic(err) - } - - s.apiProvider.AddFutureVersion(version, hash, epoch) + if err := s.storeFutureProtocolParameters.Iterate(kvstore.EmptyPrefix, func(version iotago.Version, tuple *types.Tuple[iotago.EpochIndex, iotago.Identifier]) bool { + s.apiProvider.AddFutureVersion(version, tuple.B, tuple.A) return true }); err != nil { @@ -138,13 +147,8 @@ func (s *Settings) StoreProtocolParameters(params iotago.ProtocolParameters) err s.mutex.Lock() defer s.mutex.Unlock() - bytes, err := params.Bytes() - if err != nil { - return err - } - - if err := s.store.Set([]byte{protocolParametersKey, byte(params.Version())}, bytes); err != nil { - return err + if err := s.storeProtocolParameters.Set(params.Version(), params); err != nil { + return ierrors.Wrap(err, "failed to store protocol parameters") } s.apiProvider.AddProtocolParameters(params) @@ -156,13 +160,8 @@ func (s *Settings) storeProtocolParametersEpochMapping(version iotago.Version, e s.mutex.Lock() defer s.mutex.Unlock() - epochBytes, err := epoch.Bytes() - if err != nil { - return err - } - - if err := s.store.Set([]byte{protocolVersionEpochMappingKey, byte(version)}, epochBytes); err != nil { - return err + if err := s.storeProtocolVersionEpochMapping.Set(version, epoch); err != nil { + return ierrors.Wrap(err, "failed to store protocol version epoch mapping") } s.apiProvider.AddVersion(version, epoch) @@ -174,22 +173,12 @@ func (s *Settings) StoreFutureProtocolParametersHash(version iotago.Version, has s.mutex.Lock() defer s.mutex.Unlock() - epochBytes, err := epoch.Bytes() - if err != nil { - return err + if err := s.storeFutureProtocolParameters.Set(version, types.NewTuple(epoch, hash)); err != nil { + return ierrors.Wrap(err, "failed to store future protocol parameters") } - hashBytes, err := hash.Bytes() - if err != nil { - return err - } - - if err := s.store.Set([]byte{futureProtocolParametersKey, byte(version)}, byteutils.ConcatBytes(epochBytes, hashBytes)); err != nil { - return err - } - - if err := s.store.Set([]byte{protocolVersionEpochMappingKey, byte(version)}, epochBytes); err != nil { - return err + if err := s.storeProtocolVersionEpochMapping.Set(version, epoch); err != nil { + return ierrors.Wrap(err, "failed to store protocol version epoch mapping") } s.apiProvider.AddFutureVersion(version, hash, epoch) @@ -225,7 +214,7 @@ func (s *Settings) SetLatestCommitment(latestCommitment *model.Commitment) (err s.apiProvider.SetCurrentSlot(latestCommitment.Index()) // Delete the old future protocol parameters if they exist. - _ = s.store.Delete([]byte{futureProtocolParametersKey, byte(s.apiProvider.VersionForSlot(latestCommitment.Index()))}) + _ = s.storeFutureProtocolParameters.Delete(s.apiProvider.VersionForSlot(latestCommitment.Index())) return s.store.Set([]byte{latestCommitmentKey}, latestCommitment.Data()) } @@ -301,24 +290,13 @@ func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commit if err := stream.WriteCollection(writer, func() (uint64, error) { var count uint64 var innerErr error - if err := s.store.Iterate([]byte{protocolVersionEpochMappingKey}, func(key kvstore.Key, value kvstore.Value) bool { - version, _, err := iotago.VersionFromBytes(key[1:]) - if err != nil { - innerErr = ierrors.Wrap(err, "failed to read version") - return false - } + if err := s.storeProtocolVersionEpochMapping.Iterate(kvstore.EmptyPrefix, func(version iotago.Version, epoch iotago.EpochIndex) bool { if err := stream.Write(writer, version); err != nil { innerErr = ierrors.Wrap(err, "failed to encode version") return false } - epoch, _, err := iotago.EpochIndexFromBytes(value) - if err != nil { - innerErr = ierrors.Wrap(err, "failed to encode epoch") - return false - } - if err := stream.Write(writer, epoch); err != nil { innerErr = ierrors.Wrap(err, "failed to encode epoch") return false @@ -330,6 +308,7 @@ func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commit }); err != nil { return 0, ierrors.Wrap(err, "failed to iterate over protocol version epoch mapping") } + if innerErr != nil { return 0, ierrors.Wrap(innerErr, "failed to write protocol version epoch mapping") } @@ -343,36 +322,19 @@ func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commit if err := stream.WriteCollection(writer, func() (uint64, error) { var count uint64 var innerErr error - if err := s.store.Iterate([]byte{futureProtocolParametersKey}, func(key kvstore.Key, value kvstore.Value) bool { - version, _, err := iotago.VersionFromBytes(key[1:]) - if err != nil { - innerErr = ierrors.Wrap(err, "failed to read version") - return false - } + if err := s.storeFutureProtocolParameters.Iterate(kvstore.EmptyPrefix, func(version iotago.Version, tuple *types.Tuple[iotago.EpochIndex, iotago.Identifier]) bool { if err := stream.Write(writer, version); err != nil { innerErr = ierrors.Wrap(err, "failed to encode version") return false } - epoch, read, err := iotago.EpochIndexFromBytes(value) - if err != nil { - innerErr = ierrors.Wrap(err, "failed to encode epoch") - return false - } - - if err := stream.Write(writer, epoch); err != nil { + if err := stream.Write(writer, tuple.A); err != nil { innerErr = ierrors.Wrap(err, "failed to encode epoch") return false } - hash, _, err := iotago.IdentifierFromBytes(value[read:]) - if err != nil { - innerErr = ierrors.Wrap(err, "failed to read hash") - return false - } - - if err := stream.Write(writer, hash); err != nil { + if err := stream.Write(writer, tuple.B); err != nil { innerErr = ierrors.Wrap(err, "failed to encode hash") return false } @@ -383,6 +345,7 @@ func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commit }); err != nil { return 0, ierrors.Wrap(err, "failed to iterate over future protocol parameters") } + if innerErr != nil { return 0, ierrors.Wrap(innerErr, "failed to write future protocol parameters") } @@ -396,8 +359,9 @@ func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commit if err := stream.WriteCollection(writer, func() (uint64, error) { var paramsCount uint64 var innerErr error - if err := s.store.Iterate([]byte{protocolParametersKey}, func(key kvstore.Key, value kvstore.Value) bool { - version, _, err := iotago.VersionFromBytes(key[1:]) + + if err := s.storeProtocolParameters.KVStore().Iterate(kvstore.EmptyPrefix, func(key kvstore.Key, value kvstore.Value) bool { + version, _, err := iotago.VersionFromBytes(key) if err != nil { innerErr = ierrors.Wrap(err, "failed to read version") return false @@ -534,12 +498,8 @@ func (s *Settings) String() string { builder.AddField(stringify.NewStructField("IsSnapshotImported", lo.PanicOnErr(s.store.Has([]byte{snapshotImportedKey})))) builder.AddField(stringify.NewStructField("LatestCommitment", s.latestCommitment())) builder.AddField(stringify.NewStructField("LatestFinalizedSlot", s.latestFinalizedSlot())) - if err := s.store.Iterate([]byte{protocolParametersKey}, func(key kvstore.Key, value kvstore.Value) bool { - params, _, err := iotago.ProtocolParametersFromBytes(value) - if err != nil { - panic(err) - } - builder.AddField(stringify.NewStructField(fmt.Sprintf("ProtocolParameters(%d)", key[1]), params)) + if err := s.storeProtocolParameters.Iterate(kvstore.EmptyPrefix, func(version iotago.Version, protocolParams iotago.ProtocolParameters) bool { + builder.AddField(stringify.NewStructField(fmt.Sprintf("ProtocolParameters(%d)", version), protocolParams)) return true }); err != nil { From c19859cf80a88d75e3335a13a51352f4e2257fb0 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Wed, 6 Sep 2023 13:29:46 +0800 Subject: [PATCH 08/18] Use TypedValue to simplify settings store --- go.mod | 38 ++++++++-------- go.sum | 75 +++++++++++++++--------------- pkg/storage/permanent/settings.go | 67 ++++++++++++++++++++------- tools/evil-spammer/go.mod | 38 ++++++++-------- tools/evil-spammer/go.sum | 76 +++++++++++++++---------------- tools/gendoc/go.mod | 38 ++++++++-------- tools/gendoc/go.sum | 75 +++++++++++++++--------------- tools/genesis-snapshot/go.mod | 28 ++++++------ tools/genesis-snapshot/go.sum | 56 +++++++++++------------ 9 files changed, 263 insertions(+), 228 deletions(-) diff --git a/go.mod b/go.mod index 8c53e8035..35e46ff65 100644 --- a/go.mod +++ b/go.mod @@ -9,20 +9,20 @@ 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-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/app v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/autopeering v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 + github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 @@ -38,7 +38,7 @@ require ( github.com/zyedidia/generic v1.2.1 go.uber.org/atomic v1.11.0 go.uber.org/dig v1.17.0 - golang.org/x/crypto v0.12.0 + golang.org/x/crypto v0.13.0 google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 ) @@ -124,7 +124,7 @@ require ( github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect - github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect + github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pokt-network/smt v0.6.1 // indirect @@ -149,10 +149,10 @@ require ( golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect golang.org/x/image v0.11.0 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect diff --git a/go.sum b/go.sum index b99e003a4..60317e48a 100644 --- a/go.sum +++ b/go.sum @@ -260,34 +260,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-20230829152614-7afc7a4d89b3 h1:bXN+DN/qKguM0OE+8dj7Y3kRb1UBtYCvZ55QxlGSSNs= -github.com/iotaledger/hive.go/ads v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= -github.com/iotaledger/hive.go/app v0.0.0-20230829152614-7afc7a4d89b3 h1:LeaRBaBnQmuu60yoAhdPJTv9w+YSsR323Fj1FTRCp2U= -github.com/iotaledger/hive.go/app v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230829152614-7afc7a4d89b3 h1:7DUDEmD07w86zaUZVCHJjkMva7TZ3aC1nr4x0+Wavf8= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= -github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3 h1:n03Q+VxmhzDf072BM+73gU91lhiVXaQkQqo0hbKATwo= -github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3 h1:050Lk+UXtoHcAeXpQmf2Qjoxzk4FPVZnr/EmdmBhXsY= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= -github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3 h1:ljemi2tZRpZTuE53wzxB8lXrKMxNSDZkIggHn1kAGso= -github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= -github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3 h1:L5INqiENOYTIOwKhL2oXztLdsW7KettZTlGGnCN3Vns= -github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3 h1:pMz5HyIGsp9VRB2gwqOgaEDhmlqbdvgS8G3tDu9PkkQ= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3 h1:UWXIrONiYfolMZqHz61MLY2wHzlAuRVeP1P7ltNNSww= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= -github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 h1:ZAg8B2w9Je/m0+JN+S7qW8bELfX1I2BjpNjLhU4IpQU= -github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= -github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3 h1:JdCeAesfEyBSxx7nVp0zSL4rEGg2PtRtmL4qtxCPy7A= -github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= -github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 h1:fwJri2b4PXJJ19/W0iGjZSpu/vwK4QAytJ7PwDPNjMM= -github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3 h1:WpL8R5ltMAf8rgksjBgdO2FXDa3zKN2R29lZ2C6pJGU= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= -github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= -github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b h1:rT8MMxVUat9NgZkuEGmnxwVaMNlBUiI4dC1ihQ9V8O0= +github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= +github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b h1:G2Hh8yNOhu/EwyYS3NX6psBBgELUnlvpOtHtIz6vYu0= +github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= +github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b h1:Kks9DiOx/SI7DLmB+Q/LJ6/qD/KZ15LaqEMk5QzHi2k= +github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b h1:fJblhX/3DlxXT3p3bUlowS5BUgT2fmP1O/Ia1AyH770= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b h1:MtiUQvsu03AFJrcJ3npfUDFWROVEV1SmHNzUx9c6MJY= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b h1:d+nxFwbHev69UPKjgc3fFBOUzMhihlzqFH0pgIyZQ1c= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b h1:IG1iYMvp3nu/rHarBnDrRrNLCTOPosscVrVSZ8UCk+Y= +github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b h1:yYGDORz2m+E7BPOUmShsNXWout+ubOHPKx+NaTLG8Y8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b h1:fAbsXIpdbsidT8jB45utn6aGubUE/JwIcouFPSl8igQ= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b h1:VgCD98j9DvPT1itNvNaO0WebUF5e4Y0OTG44N7tjJEE= +github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b h1:EnIB+pjVtPxxDLGpPyl3EqoybA0/LGjK9+edsCpPozI= +github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b h1:I3cLnuH9D/+unWpRQchp666wizhNBWwEXdnll7EcMes= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b h1:Uem4LqW9VQA764AJb4D7IIppwVE5AVP5II+/+fGKsII= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b h1:U3UIXfVYOGlVz2qxF6mBV3ADws9XYPqJXtwdtUY+KII= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQxUYo9aZ4XYuh8EbXWtZBdh7WvL7oh2unWNUFMo= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= @@ -479,8 +479,8 @@ github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAv github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b h1:vab8deKC4QoIfm9fJM59iuNz1ELGsuLoYYpiF+pHiG8= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc h1:8bQZVK1X6BJR/6nYUPxQEP+ReTsceJTKizeuwjWOPUA= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -644,8 +644,8 @@ golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= @@ -690,8 +690,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -757,8 +757,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -771,8 +771,9 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/pkg/storage/permanent/settings.go b/pkg/storage/permanent/settings.go index 21ace4d09..b678aa7ff 100644 --- a/pkg/storage/permanent/settings.go +++ b/pkg/storage/permanent/settings.go @@ -30,6 +30,9 @@ const ( type Settings struct { mutex syncutils.RWMutex store kvstore.KVStore + storeSnapshotImported *kvstore.TypedValue[byte] + storeLatestCommitment *kvstore.TypedValue[*model.Commitment] + storeLatestFinalizedSlot *kvstore.TypedValue[iotago.SlotIndex] storeProtocolVersionEpochMapping *kvstore.TypedStore[iotago.Version, iotago.EpochIndex] storeFutureProtocolParameters *kvstore.TypedStore[iotago.Version, *types.Tuple[iotago.EpochIndex, iotago.Identifier]] storeProtocolParameters *kvstore.TypedStore[iotago.Version, iotago.ProtocolParameters] @@ -38,17 +41,51 @@ type Settings struct { } func NewSettings(store kvstore.KVStore, opts ...options.Option[api.EpochBasedProvider]) (settings *Settings) { + apiProvider := api.NewEpochBasedProvider(opts...) + s := &Settings{ store: store, - apiProvider: api.NewEpochBasedProvider(opts...), - storeProtocolVersionEpochMapping: kvstore.NewTypedStore[iotago.Version, iotago.EpochIndex]( + apiProvider: apiProvider, + storeSnapshotImported: kvstore.NewTypedValue( + store, + []byte{snapshotImportedKey}, + func(v byte) ([]byte, error) { + return []byte{v}, nil + }, + func(bytes []byte) (byte, int, error) { + return bytes[0], 1, nil + }, + ), + storeLatestCommitment: kvstore.NewTypedValue( + store, + []byte{latestCommitmentKey}, + func(commitment *model.Commitment) ([]byte, error) { + return commitment.Data(), nil + }, + func(bytes []byte) (*model.Commitment, int, error) { + commitment, err := model.CommitmentFromBytes(bytes, apiProvider) + if err != nil { + return nil, 0, err + } + + return commitment, len(bytes), nil + }, + ), + storeLatestFinalizedSlot: kvstore.NewTypedValue( + store, + []byte{latestFinalizedSlotKey}, + iotago.SlotIndex.Bytes, + iotago.SlotIndexFromBytes, + ), + + storeProtocolVersionEpochMapping: kvstore.NewTypedStore( lo.PanicOnErr(store.WithExtendedRealm([]byte{protocolVersionEpochMappingKey})), iotago.Version.Bytes, iotago.VersionFromBytes, iotago.EpochIndex.Bytes, iotago.EpochIndexFromBytes, ), - storeFutureProtocolParameters: kvstore.NewTypedStore[iotago.Version, *types.Tuple[iotago.EpochIndex, iotago.Identifier]]( + storeFutureProtocolParameters: kvstore.NewTypedStore( lo.PanicOnErr(store.WithExtendedRealm([]byte{futureProtocolParametersKey})), iotago.Version.Bytes, iotago.VersionFromBytes, @@ -69,7 +106,7 @@ func NewSettings(store kvstore.KVStore, opts ...options.Option[api.EpochBasedPro return types.NewTuple(epoch, hash), consumedBytes + consumedBytes2, nil }, ), - storeProtocolParameters: kvstore.NewTypedStore[iotago.Version, iotago.ProtocolParameters]( + storeProtocolParameters: kvstore.NewTypedStore( lo.PanicOnErr(store.WithExtendedRealm([]byte{protocolParametersKey})), iotago.Version.Bytes, iotago.VersionFromBytes, @@ -190,14 +227,14 @@ func (s *Settings) IsSnapshotImported() bool { s.mutex.RLock() defer s.mutex.RUnlock() - return lo.PanicOnErr(s.store.Has([]byte{snapshotImportedKey})) + return lo.PanicOnErr(s.storeSnapshotImported.Has()) } func (s *Settings) SetSnapshotImported() (err error) { s.mutex.Lock() defer s.mutex.Unlock() - return s.store.Set([]byte{snapshotImportedKey}, []byte{1}) + return s.storeSnapshotImported.Set(1) } func (s *Settings) LatestCommitment() *model.Commitment { @@ -216,11 +253,11 @@ func (s *Settings) SetLatestCommitment(latestCommitment *model.Commitment) (err // Delete the old future protocol parameters if they exist. _ = s.storeFutureProtocolParameters.Delete(s.apiProvider.VersionForSlot(latestCommitment.Index())) - return s.store.Set([]byte{latestCommitmentKey}, latestCommitment.Data()) + return s.storeLatestCommitment.Set(latestCommitment) } func (s *Settings) latestCommitment() *model.Commitment { - bytes, err := s.store.Get([]byte{latestCommitmentKey}) + commitment, err := s.storeLatestCommitment.Get() if err != nil { if ierrors.Is(err, kvstore.ErrKeyNotFound) { @@ -229,7 +266,7 @@ func (s *Settings) latestCommitment() *model.Commitment { panic(err) } - return lo.PanicOnErr(model.CommitmentFromBytes(bytes, s.apiProvider)) + return commitment } func (s *Settings) LatestFinalizedSlot() iotago.SlotIndex { @@ -243,23 +280,19 @@ func (s *Settings) SetLatestFinalizedSlot(index iotago.SlotIndex) (err error) { s.mutex.Lock() defer s.mutex.Unlock() - return s.store.Set([]byte{latestFinalizedSlotKey}, index.MustBytes()) + return s.storeLatestFinalizedSlot.Set(index) } func (s *Settings) latestFinalizedSlot() iotago.SlotIndex { - bytes, err := s.store.Get([]byte{latestFinalizedSlotKey}) + latestFinalizedSlot, err := s.storeLatestFinalizedSlot.Get() if err != nil { if ierrors.Is(err, kvstore.ErrKeyNotFound) { return 0 } panic(err) } - i, _, err := iotago.SlotIndexFromBytes(bytes) - if err != nil { - panic(err) - } - return i + return latestFinalizedSlot } func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commitment) error { @@ -495,7 +528,7 @@ func (s *Settings) String() string { defer s.mutex.RUnlock() builder := stringify.NewStructBuilder("Settings") - builder.AddField(stringify.NewStructField("IsSnapshotImported", lo.PanicOnErr(s.store.Has([]byte{snapshotImportedKey})))) + builder.AddField(stringify.NewStructField("IsSnapshotImported", lo.PanicOnErr(s.storeSnapshotImported.Has()))) builder.AddField(stringify.NewStructField("LatestCommitment", s.latestCommitment())) builder.AddField(stringify.NewStructField("LatestFinalizedSlot", s.latestFinalizedSlot())) if err := s.storeProtocolParameters.Iterate(kvstore.EmptyPrefix, func(version iotago.Version, protocolParams iotago.ProtocolParameters) bool { diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 399287917..3a5bc5ed3 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -8,13 +8,13 @@ replace github.com/iotaledger/iota-core/tools/genesis-snapshot => ../genesis-sna require ( github.com/AlecAivazis/survey/v2 v2.3.7 - github.com/iotaledger/hive.go/app v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 + github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b 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-20230906032145-2d27eaf15ed7 @@ -37,12 +37,12 @@ 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-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/kr/text v0.2.0 // indirect @@ -54,7 +54,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect - github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect + github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pokt-network/smt v0.6.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect @@ -65,12 +65,12 @@ require ( github.com/zyedidia/generic v1.2.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.25.0 // indirect - golang.org/x/crypto v0.12.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/crypto v0.13.0 // indirect + golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/term v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index a2c114086..fe0e94b86 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -171,32 +171,32 @@ 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-20230829152614-7afc7a4d89b3 h1:bXN+DN/qKguM0OE+8dj7Y3kRb1UBtYCvZ55QxlGSSNs= -github.com/iotaledger/hive.go/ads v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= -github.com/iotaledger/hive.go/app v0.0.0-20230829152614-7afc7a4d89b3 h1:LeaRBaBnQmuu60yoAhdPJTv9w+YSsR323Fj1FTRCp2U= -github.com/iotaledger/hive.go/app v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= -github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3 h1:n03Q+VxmhzDf072BM+73gU91lhiVXaQkQqo0hbKATwo= -github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3 h1:050Lk+UXtoHcAeXpQmf2Qjoxzk4FPVZnr/EmdmBhXsY= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= -github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3 h1:ljemi2tZRpZTuE53wzxB8lXrKMxNSDZkIggHn1kAGso= -github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= -github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3 h1:L5INqiENOYTIOwKhL2oXztLdsW7KettZTlGGnCN3Vns= -github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3 h1:pMz5HyIGsp9VRB2gwqOgaEDhmlqbdvgS8G3tDu9PkkQ= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3 h1:UWXIrONiYfolMZqHz61MLY2wHzlAuRVeP1P7ltNNSww= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= -github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 h1:ZAg8B2w9Je/m0+JN+S7qW8bELfX1I2BjpNjLhU4IpQU= -github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= -github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3 h1:JdCeAesfEyBSxx7nVp0zSL4rEGg2PtRtmL4qtxCPy7A= -github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= -github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 h1:fwJri2b4PXJJ19/W0iGjZSpu/vwK4QAytJ7PwDPNjMM= -github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3 h1:WpL8R5ltMAf8rgksjBgdO2FXDa3zKN2R29lZ2C6pJGU= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= -github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= -github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b h1:rT8MMxVUat9NgZkuEGmnxwVaMNlBUiI4dC1ihQ9V8O0= +github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= +github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b h1:G2Hh8yNOhu/EwyYS3NX6psBBgELUnlvpOtHtIz6vYu0= +github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b h1:fJblhX/3DlxXT3p3bUlowS5BUgT2fmP1O/Ia1AyH770= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b h1:MtiUQvsu03AFJrcJ3npfUDFWROVEV1SmHNzUx9c6MJY= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b h1:d+nxFwbHev69UPKjgc3fFBOUzMhihlzqFH0pgIyZQ1c= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b h1:IG1iYMvp3nu/rHarBnDrRrNLCTOPosscVrVSZ8UCk+Y= +github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b h1:yYGDORz2m+E7BPOUmShsNXWout+ubOHPKx+NaTLG8Y8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b h1:fAbsXIpdbsidT8jB45utn6aGubUE/JwIcouFPSl8igQ= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b h1:VgCD98j9DvPT1itNvNaO0WebUF5e4Y0OTG44N7tjJEE= +github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b h1:EnIB+pjVtPxxDLGpPyl3EqoybA0/LGjK9+edsCpPozI= +github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b h1:I3cLnuH9D/+unWpRQchp666wizhNBWwEXdnll7EcMes= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b h1:Uem4LqW9VQA764AJb4D7IIppwVE5AVP5II+/+fGKsII= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b h1:U3UIXfVYOGlVz2qxF6mBV3ADws9XYPqJXtwdtUY+KII= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -282,8 +282,8 @@ github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAv github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b h1:vab8deKC4QoIfm9fJM59iuNz1ELGsuLoYYpiF+pHiG8= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc h1:8bQZVK1X6BJR/6nYUPxQEP+ReTsceJTKizeuwjWOPUA= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -369,8 +369,8 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -399,8 +399,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -452,12 +452,12 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -466,8 +466,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index 6c5c8c41b..c4f0ef4e2 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-20230829152614-7afc7a4d89b3 + github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b github.com/iotaledger/hive.go/apputils v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 ) @@ -53,19 +53,19 @@ require ( github.com/huin/goupnp v1.2.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-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/autopeering v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 // indirect @@ -117,7 +117,7 @@ require ( github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect - github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect + github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pokt-network/smt v0.6.1 // indirect @@ -144,14 +144,14 @@ require ( go.uber.org/fx v1.20.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.25.0 // indirect - golang.org/x/crypto v0.12.0 // indirect + golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect golang.org/x/image v0.11.0 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 01da59b0f..23de5a1d8 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -262,36 +262,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-20230829152614-7afc7a4d89b3 h1:bXN+DN/qKguM0OE+8dj7Y3kRb1UBtYCvZ55QxlGSSNs= -github.com/iotaledger/hive.go/ads v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= -github.com/iotaledger/hive.go/app v0.0.0-20230829152614-7afc7a4d89b3 h1:LeaRBaBnQmuu60yoAhdPJTv9w+YSsR323Fj1FTRCp2U= -github.com/iotaledger/hive.go/app v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= +github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b h1:rT8MMxVUat9NgZkuEGmnxwVaMNlBUiI4dC1ihQ9V8O0= +github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= +github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b h1:G2Hh8yNOhu/EwyYS3NX6psBBgELUnlvpOtHtIz6vYu0= +github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= 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/autopeering v0.0.0-20230829152614-7afc7a4d89b3 h1:7DUDEmD07w86zaUZVCHJjkMva7TZ3aC1nr4x0+Wavf8= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= -github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3 h1:n03Q+VxmhzDf072BM+73gU91lhiVXaQkQqo0hbKATwo= -github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3 h1:050Lk+UXtoHcAeXpQmf2Qjoxzk4FPVZnr/EmdmBhXsY= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= -github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3 h1:ljemi2tZRpZTuE53wzxB8lXrKMxNSDZkIggHn1kAGso= -github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= -github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3 h1:L5INqiENOYTIOwKhL2oXztLdsW7KettZTlGGnCN3Vns= -github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3 h1:pMz5HyIGsp9VRB2gwqOgaEDhmlqbdvgS8G3tDu9PkkQ= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3 h1:UWXIrONiYfolMZqHz61MLY2wHzlAuRVeP1P7ltNNSww= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= -github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 h1:ZAg8B2w9Je/m0+JN+S7qW8bELfX1I2BjpNjLhU4IpQU= -github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= -github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3 h1:JdCeAesfEyBSxx7nVp0zSL4rEGg2PtRtmL4qtxCPy7A= -github.com/iotaledger/hive.go/logger v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= -github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 h1:fwJri2b4PXJJ19/W0iGjZSpu/vwK4QAytJ7PwDPNjMM= -github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3 h1:WpL8R5ltMAf8rgksjBgdO2FXDa3zKN2R29lZ2C6pJGU= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= -github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= -github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b h1:Kks9DiOx/SI7DLmB+Q/LJ6/qD/KZ15LaqEMk5QzHi2k= +github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b h1:fJblhX/3DlxXT3p3bUlowS5BUgT2fmP1O/Ia1AyH770= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b h1:MtiUQvsu03AFJrcJ3npfUDFWROVEV1SmHNzUx9c6MJY= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b h1:d+nxFwbHev69UPKjgc3fFBOUzMhihlzqFH0pgIyZQ1c= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b h1:IG1iYMvp3nu/rHarBnDrRrNLCTOPosscVrVSZ8UCk+Y= +github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b h1:yYGDORz2m+E7BPOUmShsNXWout+ubOHPKx+NaTLG8Y8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b h1:fAbsXIpdbsidT8jB45utn6aGubUE/JwIcouFPSl8igQ= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b h1:VgCD98j9DvPT1itNvNaO0WebUF5e4Y0OTG44N7tjJEE= +github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b h1:EnIB+pjVtPxxDLGpPyl3EqoybA0/LGjK9+edsCpPozI= +github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b h1:I3cLnuH9D/+unWpRQchp666wizhNBWwEXdnll7EcMes= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b h1:Uem4LqW9VQA764AJb4D7IIppwVE5AVP5II+/+fGKsII= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b h1:U3UIXfVYOGlVz2qxF6mBV3ADws9XYPqJXtwdtUY+KII= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQxUYo9aZ4XYuh8EbXWtZBdh7WvL7oh2unWNUFMo= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= @@ -483,8 +483,8 @@ github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAv github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b h1:vab8deKC4QoIfm9fJM59iuNz1ELGsuLoYYpiF+pHiG8= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc h1:8bQZVK1X6BJR/6nYUPxQEP+ReTsceJTKizeuwjWOPUA= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -646,8 +646,8 @@ golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= @@ -692,8 +692,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -759,8 +759,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -773,8 +773,9 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 95e22b30c..ffddd25cc 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -5,15 +5,15 @@ go 1.21 replace github.com/iotaledger/iota-core => ../../ require ( - github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 - github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 + github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 - golang.org/x/crypto v0.12.0 + golang.org/x/crypto v0.13.0 ) require ( @@ -27,17 +27,17 @@ 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-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3 // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b // indirect github.com/kr/text v0.2.0 // indirect github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect - github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect + github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pokt-network/smt v0.6.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect @@ -45,7 +45,7 @@ require ( github.com/wollac/iota-crypto-demo v0.0.0-20221117162917-b10619eccb98 // indirect github.com/zyedidia/generic v1.2.1 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/sys v0.11.0 // indirect + golang.org/x/sys v0.12.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 9cebf2928..d98261d75 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -28,28 +28,28 @@ 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-20230829152614-7afc7a4d89b3 h1:bXN+DN/qKguM0OE+8dj7Y3kRb1UBtYCvZ55QxlGSSNs= -github.com/iotaledger/hive.go/ads v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= -github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3 h1:n03Q+VxmhzDf072BM+73gU91lhiVXaQkQqo0hbKATwo= -github.com/iotaledger/hive.go/constraints v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3 h1:050Lk+UXtoHcAeXpQmf2Qjoxzk4FPVZnr/EmdmBhXsY= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230829152614-7afc7a4d89b3/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= -github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3 h1:ljemi2tZRpZTuE53wzxB8lXrKMxNSDZkIggHn1kAGso= -github.com/iotaledger/hive.go/crypto v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= -github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3 h1:L5INqiENOYTIOwKhL2oXztLdsW7KettZTlGGnCN3Vns= -github.com/iotaledger/hive.go/ds v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3 h1:pMz5HyIGsp9VRB2gwqOgaEDhmlqbdvgS8G3tDu9PkkQ= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3 h1:UWXIrONiYfolMZqHz61MLY2wHzlAuRVeP1P7ltNNSww= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= -github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 h1:ZAg8B2w9Je/m0+JN+S7qW8bELfX1I2BjpNjLhU4IpQU= -github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= -github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 h1:fwJri2b4PXJJ19/W0iGjZSpu/vwK4QAytJ7PwDPNjMM= -github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3 h1:WpL8R5ltMAf8rgksjBgdO2FXDa3zKN2R29lZ2C6pJGU= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= -github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= -github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b h1:rT8MMxVUat9NgZkuEGmnxwVaMNlBUiI4dC1ihQ9V8O0= +github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b h1:fJblhX/3DlxXT3p3bUlowS5BUgT2fmP1O/Ia1AyH770= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b h1:MtiUQvsu03AFJrcJ3npfUDFWROVEV1SmHNzUx9c6MJY= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b h1:d+nxFwbHev69UPKjgc3fFBOUzMhihlzqFH0pgIyZQ1c= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b h1:IG1iYMvp3nu/rHarBnDrRrNLCTOPosscVrVSZ8UCk+Y= +github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b h1:yYGDORz2m+E7BPOUmShsNXWout+ubOHPKx+NaTLG8Y8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b h1:fAbsXIpdbsidT8jB45utn6aGubUE/JwIcouFPSl8igQ= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b h1:VgCD98j9DvPT1itNvNaO0WebUF5e4Y0OTG44N7tjJEE= +github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b h1:I3cLnuH9D/+unWpRQchp666wizhNBWwEXdnll7EcMes= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b h1:Uem4LqW9VQA764AJb4D7IIppwVE5AVP5II+/+fGKsII= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b h1:U3UIXfVYOGlVz2qxF6mBV3ADws9XYPqJXtwdtUY+KII= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -65,8 +65,8 @@ github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c/go.mod h1:1iCZ0433 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b h1:vab8deKC4QoIfm9fJM59iuNz1ELGsuLoYYpiF+pHiG8= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc h1:8bQZVK1X6BJR/6nYUPxQEP+ReTsceJTKizeuwjWOPUA= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pokt-network/smt v0.6.1 h1:u5yTGNNND6edXv3vMQrAcjku1Ig4osehdu+EMYSXHUU= @@ -90,10 +90,10 @@ github.com/zyedidia/generic v1.2.1 h1:Zv5KS/N2m0XZZiuLS82qheRG4X1o5gsWreGb0hR7XD github.com/zyedidia/generic v1.2.1/go.mod h1:ly2RBz4mnz1yeuVbQA/VFwGjK3mnHGRj1JuoG336Bis= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= From f2b9234e8e2769eb2ba214856588070af1afcc09 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 6 Sep 2023 14:44:32 +0800 Subject: [PATCH 09/18] Improve BlockFailureReason in booker --- pkg/protocol/engine/booker/inmemorybooker/booker.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/protocol/engine/booker/inmemorybooker/booker.go b/pkg/protocol/engine/booker/inmemorybooker/booker.go index 92107ad2e..99a68e178 100644 --- a/pkg/protocol/engine/booker/inmemorybooker/booker.go +++ b/pkg/protocol/engine/booker/inmemorybooker/booker.go @@ -76,7 +76,7 @@ func New(workers *workerpool.Group, blockCache *blocks.Blocks, errorHandler func b.book, b.markInvalid, (*blocks.Block).Parents, - causalorder.WithReferenceValidator[iotago.SlotIndex, iotago.BlockID](isReferenceValid), + causalorder.WithReferenceValidator[iotago.SlotIndex, iotago.BlockID](b.isReferenceValid), ) blockCache.Evict.Hook(b.evict) @@ -137,7 +137,6 @@ func (b *Booker) book(block *blocks.Block) error { func (b *Booker) markInvalid(block *blocks.Block, err error) { if block.SetInvalid() { - b.retainBlockFailure(block.ID(), apimodels.BlockFailureBookingFailure) b.events.BlockInvalid.Trigger(block, ierrors.Wrap(err, "block marked as invalid in Booker")) } } @@ -149,6 +148,7 @@ func (b *Booker) inheritConflicts(block *blocks.Block) (conflictIDs ds.Set[iotag for _, parent := range block.ParentsWithType() { parentBlock, exists := b.blockCache.Block(parent.ID) if !exists { + b.retainBlockFailure(block.ID(), apimodels.BlockFailureParentNotFound) return nil, ierrors.Errorf("parent %s does not exist", parent.ID) } @@ -180,8 +180,9 @@ func (b *Booker) inheritConflicts(block *blocks.Block) (conflictIDs ds.Set[iotag } // isReferenceValid checks if the reference between the child and its parent is valid. -func isReferenceValid(child *blocks.Block, parent *blocks.Block) (err error) { +func (b *Booker) isReferenceValid(child *blocks.Block, parent *blocks.Block) (err error) { if parent.IsInvalid() { + b.retainBlockFailure(child.ID(), apimodels.BlockFailureParentInvalid) return ierrors.Errorf("parent %s of child %s is marked as invalid", parent.ID(), child.ID()) } From 0d489be96e2b82e186084dc614bfd75a4c8ca549 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 6 Sep 2023 14:53:28 +0800 Subject: [PATCH 10/18] Update iota.go version --- go.mod | 2 +- go.sum | 4 ++-- tools/evil-spammer/go.mod | 2 +- tools/evil-spammer/go.sum | 4 ++-- tools/gendoc/go.mod | 2 +- tools/gendoc/go.sum | 4 ++-- tools/genesis-snapshot/go.mod | 2 +- tools/genesis-snapshot/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 8ee963cad..511471096 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b - github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 + github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722 github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 github.com/libp2p/go-libp2p v0.30.0 diff --git a/go.sum b/go.sum index 0b10673ac..42b89e054 100644 --- a/go.sum +++ b/go.sum @@ -292,8 +292,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722 h1:dwMS+qtjk1UkHfmtLNtxFA8UdWadmZIbjJXkDbgqNtU= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index aa5a72036..064e8f244 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 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-20230829160021-46cad51e89d1 + github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722 github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index d31d588ba..5fa60f25d 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -197,8 +197,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722 h1:dwMS+qtjk1UkHfmtLNtxFA8UdWadmZIbjJXkDbgqNtU= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index b1d915b61..a9d5ff8ed 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -68,7 +68,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index d9e9dff98..06a169526 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -296,8 +296,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722 h1:dwMS+qtjk1UkHfmtLNtxFA8UdWadmZIbjJXkDbgqNtU= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 7c79aeb82..9dca9fcb3 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/hive.go/runtime v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 + github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722 github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.12.0 diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 93ed44b04..ab5792d54 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -50,8 +50,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230829152614-7afc7a4d89b3/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3 h1:iJ+AkAO6hj5tzoOvEFIfm67eG8g5UvvGYP+6xMA98sg= github.com/iotaledger/hive.go/stringify v0.0.0-20230829152614-7afc7a4d89b3/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY= -github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722 h1:dwMS+qtjk1UkHfmtLNtxFA8UdWadmZIbjJXkDbgqNtU= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064820-d722b78e7722/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= From dba98a277b19e1f3c802fc25558080e8ed4cfcc8 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:31:32 +0800 Subject: [PATCH 11/18] Make storeSnapshotImported bool instead of byte --- pkg/storage/permanent/settings.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkg/storage/permanent/settings.go b/pkg/storage/permanent/settings.go index b678aa7ff..94f81603e 100644 --- a/pkg/storage/permanent/settings.go +++ b/pkg/storage/permanent/settings.go @@ -30,7 +30,7 @@ const ( type Settings struct { mutex syncutils.RWMutex store kvstore.KVStore - storeSnapshotImported *kvstore.TypedValue[byte] + storeSnapshotImported *kvstore.TypedValue[bool] storeLatestCommitment *kvstore.TypedValue[*model.Commitment] storeLatestFinalizedSlot *kvstore.TypedValue[iotago.SlotIndex] storeProtocolVersionEpochMapping *kvstore.TypedStore[iotago.Version, iotago.EpochIndex] @@ -49,11 +49,15 @@ func NewSettings(store kvstore.KVStore, opts ...options.Option[api.EpochBasedPro storeSnapshotImported: kvstore.NewTypedValue( store, []byte{snapshotImportedKey}, - func(v byte) ([]byte, error) { - return []byte{v}, nil + func(v bool) ([]byte, error) { + return []byte{lo.Cond[byte](v, 1, 0)}, nil }, - func(bytes []byte) (byte, int, error) { - return bytes[0], 1, nil + func(b []byte) (bool, int, error) { + if len(b) != 1 { + return false, 0, ierrors.Errorf("expected 1 byte, but got %d", len(b)) + } + + return b[0] == 1, 1, nil }, ), storeLatestCommitment: kvstore.NewTypedValue( @@ -234,7 +238,7 @@ func (s *Settings) SetSnapshotImported() (err error) { s.mutex.Lock() defer s.mutex.Unlock() - return s.storeSnapshotImported.Set(1) + return s.storeSnapshotImported.Set(true) } func (s *Settings) LatestCommitment() *model.Commitment { From faa11f55e36fab6496d61008a96c3c00695f3722 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:09:29 +0800 Subject: [PATCH 12/18] Make sure that we have the protocol parameters for the latest supported iota.go protocol version of the software --- pkg/protocol/engine/engine.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/protocol/engine/engine.go b/pkg/protocol/engine/engine.go index ce5bc1bc5..e05967481 100644 --- a/pkg/protocol/engine/engine.go +++ b/pkg/protocol/engine/engine.go @@ -162,6 +162,14 @@ func New( (*Engine).setupPruning, (*Engine).acceptanceHandler, (*Engine).TriggerConstructed, + func(e *Engine) { + // Make sure that we have the protocol parameters for the latest supported iota.go protocol version of the software. + // If not the user needs to update the protocol parameters file. + // This can only happen after a user updated the node version and the new protocol version is not yet active. + if _, err := e.APIForVersion(iotago.LatestProtocolVersion()); err != nil { + panic(ierrors.Wrap(err, "no protocol parameters for latest protocol version found")) + } + }, func(e *Engine) { // Import the rest of the snapshot if needed. if needsToImportSnapshot { From 29e554b796050b05b1688cd1fdb47f61713af771 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:52:45 +0800 Subject: [PATCH 13/18] Add reading of parameters from json file --- components/protocol/component.go | 52 +++++++++++++++++++++++++++----- components/protocol/params.go | 2 ++ 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/components/protocol/component.go b/components/protocol/component.go index daec6534f..b14ee9f32 100644 --- a/components/protocol/component.go +++ b/components/protocol/component.go @@ -2,6 +2,7 @@ package protocol import ( "context" + "os" "time" "github.com/labstack/gommon/bytes" @@ -59,11 +60,43 @@ type dependencies struct { Protocol *protocol.Protocol } +func readProtocolParameters() []iotago.ProtocolParameters { + fileBytes, err := os.ReadFile(ParamsProtocol.ProtocolParametersPath) + if err != nil { + Component.LogInfof("No protocol parameters file (%s) found, skipping import: %s", ParamsProtocol.ProtocolParametersPath, err) + return nil + } + + type jsonProtocolParameters struct { + ProtocolParameters []iotago.ProtocolParameters `serix:"0,mapKey=protocolParameters"` + } + + parsedParams := &jsonProtocolParameters{} + if err := iotago.CommonSerixAPI().JSONDecode(context.Background(), fileBytes, parsedParams); err != nil { + Component.LogWarnf("Error parsing protocol parameters file (%s): %s", ParamsProtocol.ProtocolParametersPath, err) + return nil + } + + bytesToWrite, err := iotago.CommonSerixAPI().JSONEncode(context.Background(), jsonProtocolParameters{}) + if err != nil { + Component.LogInfof("Error writing protocol parameters file (%s): %s", ParamsProtocol.ProtocolParametersPath, err) + return parsedParams.ProtocolParameters + } + + if err := os.WriteFile(ParamsProtocol.ProtocolParametersPath, bytesToWrite, 0600); err != nil { + Component.LogInfof("Error writing protocol parameters file (%s): %s", ParamsProtocol.ProtocolParametersPath, err) + return parsedParams.ProtocolParameters + } + + return parsedParams.ProtocolParameters +} + func initConfigParams(c *dig.Container) error { type cfgResult struct { dig.Out - DatabaseEngine hivedb.Engine `name:"databaseEngine"` - BaseToken *BaseToken + DatabaseEngine hivedb.Engine `name:"databaseEngine"` + BaseToken *BaseToken + ProtocolParameters []iotago.ProtocolParameters } if err := c.Provide(func() cfgResult { @@ -73,8 +106,9 @@ func initConfigParams(c *dig.Container) error { } return cfgResult{ - DatabaseEngine: dbEngine, - BaseToken: &ParamsProtocol.BaseToken, + DatabaseEngine: dbEngine, + BaseToken: &ParamsProtocol.BaseToken, + ProtocolParameters: readProtocolParameters(), } }); err != nil { Component.LogPanic(err) @@ -87,8 +121,9 @@ func provide(c *dig.Container) error { type protocolDeps struct { dig.In - DatabaseEngine hivedb.Engine `name:"databaseEngine"` - P2PManager *p2p.Manager + DatabaseEngine hivedb.Engine `name:"databaseEngine"` + ProtocolParameters []iotago.ProtocolParameters + P2PManager *p2p.Manager } return c.Provide(func(deps protocolDeps) *protocol.Protocol { @@ -132,8 +167,9 @@ func provide(c *dig.Container) error { blockfilter.WithMaxAllowedWallClockDrift(ParamsProtocol.Filter.MaxAllowedClockDrift), ), ), - // TODO: here we should pass the protocol parameters from the config. - protocol.WithUpgradeOrchestratorProvider(signalingupgradeorchestrator.NewProvider()), + protocol.WithUpgradeOrchestratorProvider( + signalingupgradeorchestrator.NewProvider(signalingupgradeorchestrator.WithProtocolParameters(deps.ProtocolParameters...)), + ), ) }) } diff --git a/components/protocol/params.go b/components/protocol/params.go index 4f825998b..596a83a16 100644 --- a/components/protocol/params.go +++ b/components/protocol/params.go @@ -21,6 +21,8 @@ type ParametersProtocol struct { MaxAllowedClockDrift time.Duration `default:"5s" usage:"the maximum drift our wall clock can have to future blocks being received from the network"` } + ProtocolParametersPath string `default:"testnet/protocol_parameters.json" usage:"the path of the protocol parameters file"` + BaseToken BaseToken } From a0e631039110d5fb89187bfa7b0586d5f2ce5f2a Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Thu, 7 Sep 2023 09:23:08 +0800 Subject: [PATCH 14/18] Update go.mod --- go.mod | 30 +++++++++--------- go.sum | 60 +++++++++++++++++------------------ tools/evil-spammer/go.mod | 28 ++++++++-------- tools/evil-spammer/go.sum | 59 +++++++++++++++++----------------- tools/gendoc/go.mod | 30 +++++++++--------- tools/gendoc/go.sum | 60 +++++++++++++++++------------------ tools/genesis-snapshot/go.mod | 24 +++++++------- tools/genesis-snapshot/go.sum | 52 +++++++++++++++--------------- 8 files changed, 171 insertions(+), 172 deletions(-) diff --git a/go.mod b/go.mod index 35e46ff65..fa21e58db 100644 --- a/go.mod +++ b/go.mod @@ -9,23 +9,23 @@ 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-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b - github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 + github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 github.com/libp2p/go-libp2p v0.30.0 diff --git a/go.sum b/go.sum index 60317e48a..1874f5d29 100644 --- a/go.sum +++ b/go.sum @@ -260,40 +260,40 @@ 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-20230906052258-a389ac8eb77b h1:rT8MMxVUat9NgZkuEGmnxwVaMNlBUiI4dC1ihQ9V8O0= -github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= -github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b h1:G2Hh8yNOhu/EwyYS3NX6psBBgELUnlvpOtHtIz6vYu0= -github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b h1:Kks9DiOx/SI7DLmB+Q/LJ6/qD/KZ15LaqEMk5QzHi2k= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= -github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b h1:fJblhX/3DlxXT3p3bUlowS5BUgT2fmP1O/Ia1AyH770= -github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b h1:MtiUQvsu03AFJrcJ3npfUDFWROVEV1SmHNzUx9c6MJY= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= -github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b h1:d+nxFwbHev69UPKjgc3fFBOUzMhihlzqFH0pgIyZQ1c= -github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= -github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b h1:IG1iYMvp3nu/rHarBnDrRrNLCTOPosscVrVSZ8UCk+Y= -github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b h1:yYGDORz2m+E7BPOUmShsNXWout+ubOHPKx+NaTLG8Y8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b h1:fAbsXIpdbsidT8jB45utn6aGubUE/JwIcouFPSl8igQ= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= -github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b h1:VgCD98j9DvPT1itNvNaO0WebUF5e4Y0OTG44N7tjJEE= -github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= -github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b h1:EnIB+pjVtPxxDLGpPyl3EqoybA0/LGjK9+edsCpPozI= -github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= -github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b h1:I3cLnuH9D/+unWpRQchp666wizhNBWwEXdnll7EcMes= -github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b h1:Uem4LqW9VQA764AJb4D7IIppwVE5AVP5II+/+fGKsII= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= -github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b h1:U3UIXfVYOGlVz2qxF6mBV3ADws9XYPqJXtwdtUY+KII= -github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 h1:C8oOO8iHniK2yiQiphft8MXT/x97InWgUww+moQh2DU= +github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= +github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 h1:0iwjkfvNdJftw83lhJSnniZeY0FLtEAavZT91QIkFGc= +github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= +github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2 h1:7u+EZ+bv70KC2jPPSc35IOrFmLt6IqEoIyZKqbydSBs= +github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 h1:sck44Y5VB79MaG7p3s6/gRyXvBk31f0Alxxl/fFP/Ac= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 h1:g9vVD1/Hx/KL4NLVJ7vsQXDIBKGxtPYBQBoillNqjxM= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 h1:yNF7+4K/f4okb8v5BiBIJ8sIq3LUWdLDEPYZ38rCEAE= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 h1:BayCsCFoK5Ij0ZZn0Wejw+sKFvxTbkOGcoDBWZtyYAk= +github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:ZrqsjIJS2QCgGp7Ki+l4hWJQgzfBObUCemb5Upwlx18= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2 h1:G6rcO7YWSPzhUfp+Z+ubusFVEbWxmXFqqjH43agoap8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 h1:PBc7/OrBkfXV70odqXdGJzKqvImx/R46R65OO9RMRpw= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 h1:wLZPoEOVv+L2rVDtRqcoOKmQuEw+Uw61fviYAmBWp98= +github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 h1:vVs4Zh6VWZdpduOJqo/LRuZRnLkWtg5aQnWXyjTkT9s= +github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 h1:jpX2K+d9+FaCngP3dTjSIabm+OIxThc/AQPKvp2d23c= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 h1:kEakiZRk/LUb2CxQvSOsdTgUXK1Ee4BNec9ps40+iXQ= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQxUYo9aZ4XYuh8EbXWtZBdh7WvL7oh2unWNUFMo= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 3a5bc5ed3..129d6c521 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -8,16 +8,16 @@ replace github.com/iotaledger/iota-core/tools/genesis-snapshot => ../genesis-sna require ( github.com/AlecAivazis/survey/v2 v2.3.7 - github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 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-20230906032145-2d27eaf15ed7 + github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) @@ -37,12 +37,12 @@ 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-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/kr/text v0.2.0 // indirect diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index fe0e94b86..bcce03981 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -171,34 +171,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-20230906052258-a389ac8eb77b h1:rT8MMxVUat9NgZkuEGmnxwVaMNlBUiI4dC1ihQ9V8O0= -github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= -github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b h1:G2Hh8yNOhu/EwyYS3NX6psBBgELUnlvpOtHtIz6vYu0= -github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= -github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b h1:fJblhX/3DlxXT3p3bUlowS5BUgT2fmP1O/Ia1AyH770= -github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b h1:MtiUQvsu03AFJrcJ3npfUDFWROVEV1SmHNzUx9c6MJY= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= -github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b h1:d+nxFwbHev69UPKjgc3fFBOUzMhihlzqFH0pgIyZQ1c= -github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= -github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b h1:IG1iYMvp3nu/rHarBnDrRrNLCTOPosscVrVSZ8UCk+Y= -github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b h1:yYGDORz2m+E7BPOUmShsNXWout+ubOHPKx+NaTLG8Y8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b h1:fAbsXIpdbsidT8jB45utn6aGubUE/JwIcouFPSl8igQ= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= -github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b h1:VgCD98j9DvPT1itNvNaO0WebUF5e4Y0OTG44N7tjJEE= -github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= -github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b h1:EnIB+pjVtPxxDLGpPyl3EqoybA0/LGjK9+edsCpPozI= -github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= -github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b h1:I3cLnuH9D/+unWpRQchp666wizhNBWwEXdnll7EcMes= -github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b h1:Uem4LqW9VQA764AJb4D7IIppwVE5AVP5II+/+fGKsII= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= -github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b h1:U3UIXfVYOGlVz2qxF6mBV3ADws9XYPqJXtwdtUY+KII= -github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 h1:C8oOO8iHniK2yiQiphft8MXT/x97InWgUww+moQh2DU= +github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= +github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 h1:0iwjkfvNdJftw83lhJSnniZeY0FLtEAavZT91QIkFGc= +github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 h1:sck44Y5VB79MaG7p3s6/gRyXvBk31f0Alxxl/fFP/Ac= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 h1:g9vVD1/Hx/KL4NLVJ7vsQXDIBKGxtPYBQBoillNqjxM= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 h1:yNF7+4K/f4okb8v5BiBIJ8sIq3LUWdLDEPYZ38rCEAE= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 h1:BayCsCFoK5Ij0ZZn0Wejw+sKFvxTbkOGcoDBWZtyYAk= +github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:ZrqsjIJS2QCgGp7Ki+l4hWJQgzfBObUCemb5Upwlx18= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2 h1:G6rcO7YWSPzhUfp+Z+ubusFVEbWxmXFqqjH43agoap8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 h1:PBc7/OrBkfXV70odqXdGJzKqvImx/R46R65OO9RMRpw= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 h1:wLZPoEOVv+L2rVDtRqcoOKmQuEw+Uw61fviYAmBWp98= +github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 h1:vVs4Zh6VWZdpduOJqo/LRuZRnLkWtg5aQnWXyjTkT9s= +github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 h1:jpX2K+d9+FaCngP3dTjSIabm+OIxThc/AQPKvp2d23c= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 h1:kEakiZRk/LUb2CxQvSOsdTgUXK1Ee4BNec9ps40+iXQ= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= @@ -517,9 +517,8 @@ google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index c4f0ef4e2..ef1fe13a3 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-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/apputils v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 ) @@ -53,22 +53,22 @@ require ( github.com/huin/goupnp v1.2.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-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 23de5a1d8..5dd49034b 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -262,42 +262,42 @@ 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-20230906052258-a389ac8eb77b h1:rT8MMxVUat9NgZkuEGmnxwVaMNlBUiI4dC1ihQ9V8O0= -github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= -github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b h1:G2Hh8yNOhu/EwyYS3NX6psBBgELUnlvpOtHtIz6vYu0= -github.com/iotaledger/hive.go/app v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= +github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 h1:C8oOO8iHniK2yiQiphft8MXT/x97InWgUww+moQh2DU= +github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= +github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 h1:0iwjkfvNdJftw83lhJSnniZeY0FLtEAavZT91QIkFGc= +github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= 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/autopeering v0.0.0-20230906052258-a389ac8eb77b h1:Kks9DiOx/SI7DLmB+Q/LJ6/qD/KZ15LaqEMk5QzHi2k= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= -github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b h1:fJblhX/3DlxXT3p3bUlowS5BUgT2fmP1O/Ia1AyH770= -github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b h1:MtiUQvsu03AFJrcJ3npfUDFWROVEV1SmHNzUx9c6MJY= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= -github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b h1:d+nxFwbHev69UPKjgc3fFBOUzMhihlzqFH0pgIyZQ1c= -github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= -github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b h1:IG1iYMvp3nu/rHarBnDrRrNLCTOPosscVrVSZ8UCk+Y= -github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b h1:yYGDORz2m+E7BPOUmShsNXWout+ubOHPKx+NaTLG8Y8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b h1:fAbsXIpdbsidT8jB45utn6aGubUE/JwIcouFPSl8igQ= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= -github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b h1:VgCD98j9DvPT1itNvNaO0WebUF5e4Y0OTG44N7tjJEE= -github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= -github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b h1:EnIB+pjVtPxxDLGpPyl3EqoybA0/LGjK9+edsCpPozI= -github.com/iotaledger/hive.go/logger v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= -github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b h1:I3cLnuH9D/+unWpRQchp666wizhNBWwEXdnll7EcMes= -github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b h1:Uem4LqW9VQA764AJb4D7IIppwVE5AVP5II+/+fGKsII= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= -github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b h1:U3UIXfVYOGlVz2qxF6mBV3ADws9XYPqJXtwdtUY+KII= -github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2 h1:7u+EZ+bv70KC2jPPSc35IOrFmLt6IqEoIyZKqbydSBs= +github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 h1:sck44Y5VB79MaG7p3s6/gRyXvBk31f0Alxxl/fFP/Ac= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 h1:g9vVD1/Hx/KL4NLVJ7vsQXDIBKGxtPYBQBoillNqjxM= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 h1:yNF7+4K/f4okb8v5BiBIJ8sIq3LUWdLDEPYZ38rCEAE= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 h1:BayCsCFoK5Ij0ZZn0Wejw+sKFvxTbkOGcoDBWZtyYAk= +github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:ZrqsjIJS2QCgGp7Ki+l4hWJQgzfBObUCemb5Upwlx18= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2 h1:G6rcO7YWSPzhUfp+Z+ubusFVEbWxmXFqqjH43agoap8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 h1:PBc7/OrBkfXV70odqXdGJzKqvImx/R46R65OO9RMRpw= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 h1:wLZPoEOVv+L2rVDtRqcoOKmQuEw+Uw61fviYAmBWp98= +github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 h1:vVs4Zh6VWZdpduOJqo/LRuZRnLkWtg5aQnWXyjTkT9s= +github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 h1:jpX2K+d9+FaCngP3dTjSIabm+OIxThc/AQPKvp2d23c= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 h1:kEakiZRk/LUb2CxQvSOsdTgUXK1Ee4BNec9ps40+iXQ= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQxUYo9aZ4XYuh8EbXWtZBdh7WvL7oh2unWNUFMo= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index ffddd25cc..9d0babd0f 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -5,12 +5,12 @@ go 1.21 replace github.com/iotaledger/iota-core => ../../ require ( - github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b - github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b + github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 + github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.13.0 @@ -27,13 +27,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-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b // indirect + github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/kr/text v0.2.0 // indirect github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index d98261d75..546795355 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-20230906052258-a389ac8eb77b h1:rT8MMxVUat9NgZkuEGmnxwVaMNlBUiI4dC1ihQ9V8O0= -github.com/iotaledger/hive.go/ads v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= -github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b h1:fJblhX/3DlxXT3p3bUlowS5BUgT2fmP1O/Ia1AyH770= -github.com/iotaledger/hive.go/constraints v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b h1:MtiUQvsu03AFJrcJ3npfUDFWROVEV1SmHNzUx9c6MJY= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906052258-a389ac8eb77b/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= -github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b h1:d+nxFwbHev69UPKjgc3fFBOUzMhihlzqFH0pgIyZQ1c= -github.com/iotaledger/hive.go/crypto v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= -github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b h1:IG1iYMvp3nu/rHarBnDrRrNLCTOPosscVrVSZ8UCk+Y= -github.com/iotaledger/hive.go/ds v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:G4azdfQMwAkSU5lHZNRAdGfRoLHNHF4+DfCudWTTKF8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b h1:yYGDORz2m+E7BPOUmShsNXWout+ubOHPKx+NaTLG8Y8= -github.com/iotaledger/hive.go/ierrors v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b h1:fAbsXIpdbsidT8jB45utn6aGubUE/JwIcouFPSl8igQ= -github.com/iotaledger/hive.go/kvstore v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= -github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b h1:VgCD98j9DvPT1itNvNaO0WebUF5e4Y0OTG44N7tjJEE= -github.com/iotaledger/hive.go/lo v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= -github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b h1:I3cLnuH9D/+unWpRQchp666wizhNBWwEXdnll7EcMes= -github.com/iotaledger/hive.go/runtime v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b h1:Uem4LqW9VQA764AJb4D7IIppwVE5AVP5II+/+fGKsII= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906052258-a389ac8eb77b/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= -github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b h1:U3UIXfVYOGlVz2qxF6mBV3ADws9XYPqJXtwdtUY+KII= -github.com/iotaledger/hive.go/stringify v0.0.0-20230906052258-a389ac8eb77b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7 h1:xUpBJeULtcwEtdTMjEZ6CMIg4qpsyxoqjDXoPqWZXqc= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906032145-2d27eaf15ed7/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 h1:C8oOO8iHniK2yiQiphft8MXT/x97InWgUww+moQh2DU= +github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 h1:sck44Y5VB79MaG7p3s6/gRyXvBk31f0Alxxl/fFP/Ac= +github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 h1:g9vVD1/Hx/KL4NLVJ7vsQXDIBKGxtPYBQBoillNqjxM= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 h1:yNF7+4K/f4okb8v5BiBIJ8sIq3LUWdLDEPYZ38rCEAE= +github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 h1:BayCsCFoK5Ij0ZZn0Wejw+sKFvxTbkOGcoDBWZtyYAk= +github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:ZrqsjIJS2QCgGp7Ki+l4hWJQgzfBObUCemb5Upwlx18= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2 h1:G6rcO7YWSPzhUfp+Z+ubusFVEbWxmXFqqjH43agoap8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 h1:PBc7/OrBkfXV70odqXdGJzKqvImx/R46R65OO9RMRpw= +github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:DeP4JF4N995LteD0+/o7NsW1bO5IXURIJ27A69Ca5+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 h1:wLZPoEOVv+L2rVDtRqcoOKmQuEw+Uw61fviYAmBWp98= +github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 h1:jpX2K+d9+FaCngP3dTjSIabm+OIxThc/AQPKvp2d23c= +github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 h1:kEakiZRk/LUb2CxQvSOsdTgUXK1Ee4BNec9ps40+iXQ= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= +github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= +github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -99,8 +99,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From a7b0e6c6250b7b05e952ae6a1bce201fac752ffb Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Thu, 7 Sep 2023 09:31:12 +0800 Subject: [PATCH 15/18] Update go.mod --- go.mod | 23 +++++++++- go.sum | 82 ++++++++++++++++++++++++++++++++++- tools/evil-spammer/go.mod | 15 +++++++ tools/evil-spammer/go.sum | 31 +++++++++++++ tools/gendoc/go.mod | 23 +++++++++- tools/gendoc/go.sum | 82 ++++++++++++++++++++++++++++++++++- tools/genesis-snapshot/go.mod | 15 +++++++ tools/genesis-snapshot/go.sum | 31 +++++++++++++ 8 files changed, 296 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index fa21e58db..afcb553f1 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 - github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 @@ -29,6 +28,7 @@ require ( github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 github.com/libp2p/go-libp2p v0.30.0 + github.com/libp2p/go-libp2p-kad-dht v0.25.1 github.com/multiformats/go-multiaddr v0.11.0 github.com/multiformats/go-varint v0.0.7 github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e @@ -66,6 +66,8 @@ require ( github.com/fogleman/gg v1.3.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -76,15 +78,23 @@ require ( github.com/google/go-querystring v1.1.0 // indirect github.com/google/gopacket v1.1.19 // indirect github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/holiman/uint256 v1.2.3 // indirect github.com/huin/goupnp v1.2.0 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 // 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 + github.com/ipfs/go-log v1.0.5 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect + github.com/ipld/go-ipld-prime v0.20.0 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect + github.com/jbenet/goprocess v0.1.4 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/knadh/koanf v1.5.0 // indirect @@ -94,6 +104,9 @@ require ( github.com/libp2p/go-cidranger v1.1.0 // indirect github.com/libp2p/go-flow-metrics v0.1.0 // indirect github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect + github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect + github.com/libp2p/go-libp2p-record v0.2.0 // indirect + github.com/libp2p/go-libp2p-routing-helpers v0.7.2 // indirect github.com/libp2p/go-msgio v0.3.0 // indirect github.com/libp2p/go-nat v0.2.0 // indirect github.com/libp2p/go-netroute v0.2.1 // indirect @@ -121,6 +134,7 @@ require ( github.com/multiformats/go-multistream v0.4.1 // indirect github.com/onsi/ginkgo/v2 v2.12.0 // indirect github.com/opencontainers/runtime-spec v1.1.0 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect @@ -128,6 +142,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pokt-network/smt v0.6.1 // indirect + github.com/polydawn/refmt v0.89.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect @@ -143,6 +158,11 @@ require ( github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect + github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/fx v1.20.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.25.0 // indirect @@ -155,6 +175,7 @@ require ( golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect + gonum.org/v1/gonum v0.13.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 1874f5d29..a06ce8ca0 100644 --- a/go.sum +++ b/go.sum @@ -129,12 +129,16 @@ github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= github.com/goccy/go-graphviz v0.1.1 h1:MGrsnzBxTyt7KG8FhHsFPDTGvF7UaQMmSa6A610DqPg= github.com/goccy/go-graphviz v0.1.1/go.mod h1:lpnwvVDjskayq84ZxG8tGCPeZX/WxP88W+OJajh+gFk= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -150,6 +154,9 @@ github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzq github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -179,6 +186,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -198,12 +206,15 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f h1:pDhu5sgp8yJlEF/g6osliIIpF9K4F5jvkULXa4daRDQ= github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4= +github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= @@ -216,6 +227,8 @@ github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplb github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= @@ -225,6 +238,8 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= @@ -239,6 +254,8 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -264,8 +281,6 @@ github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2 h1:C8oOO8iH github.com/iotaledger/hive.go/ads v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:IAWZ/5It5P8B41mWyJXJVcG0vuikVRaTFKQnr2D2q+c= github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 h1:0iwjkfvNdJftw83lhJSnniZeY0FLtEAavZT91QIkFGc= github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2 h1:7u+EZ+bv70KC2jPPSc35IOrFmLt6IqEoIyZKqbydSBs= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 h1:sck44Y5VB79MaG7p3s6/gRyXvBk31f0Alxxl/fFP/Ac= github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 h1:g9vVD1/Hx/KL4NLVJ7vsQXDIBKGxtPYBQBoillNqjxM= @@ -294,16 +309,30 @@ github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+i github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= +github.com/ipfs/boxo v0.10.0/go.mod h1:Fg+BnfxZ0RPzR0nOodzdIq3A7KgoWAOWsEIImrIQdBM= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= +github.com/ipfs/go-datastore v0.6.0 h1:JKyz+Gvz1QEZw0LsX1IBn+JFCJQH4SJVFtM4uWU0Myk= +github.com/ipfs/go-datastore v0.6.0/go.mod h1:rt5M3nNbSO/8q1t4LNkLyUwRs8HupMeN/8O4Vn9YAT8= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps= +github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8= +github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ= +github.com/ipfs/go-log v1.0.5 h1:2dOuUCB1Z7uoczMWgAyDck5JLb72zHzrMnGnCNNbvY8= +github.com/ipfs/go-log v1.0.5/go.mod h1:j0b8ZoR+7+R99LD9jZ6+AJsrzkPbSXbZfGakb5JPtIo= +github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g= github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY= github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI= +github.com/ipld/go-ipld-prime v0.20.0 h1:Ud3VwE9ClxpO2LkCYP7vWPc0Fo+dYdYzgxUJZ3uRG4g= +github.com/ipld/go-ipld-prime v0.20.0/go.mod h1:PzqZ/ZR981eKbgdr3y2DJYeD/8bgMawdGVlJDE8kK+M= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA= github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk= github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk= +github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o= +github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= @@ -314,6 +343,8 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -354,6 +385,14 @@ github.com/libp2p/go-libp2p v0.30.0 h1:9EZwFtJPFBcs/yJTnP90TpN1hgrT/EsFfM+OZuwV8 github.com/libp2p/go-libp2p v0.30.0/go.mod h1:nr2g5V7lfftwgiJ78/HrID+pwvayLyqKCEirT2Y3Byg= github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s= github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w= +github.com/libp2p/go-libp2p-kad-dht v0.25.1 h1:ofFNrf6MMEy4vi3R1VbJ7LOcTn3Csh0cDcaWHTxtWNA= +github.com/libp2p/go-libp2p-kad-dht v0.25.1/go.mod h1:6za56ncRHYXX4Nc2vn8z7CZK0P4QiMcrn77acKLM2Oo= +github.com/libp2p/go-libp2p-kbucket v0.6.3 h1:p507271wWzpy2f1XxPzCQG9NiN6R6lHL9GiSErbQQo0= +github.com/libp2p/go-libp2p-kbucket v0.6.3/go.mod h1:RCseT7AH6eJWxxk2ol03xtP9pEHetYSPXOaJnOiD8i0= +github.com/libp2p/go-libp2p-record v0.2.0 h1:oiNUOCWno2BFuxt3my4i1frNrt7PerzB3queqa1NkQ0= +github.com/libp2p/go-libp2p-record v0.2.0/go.mod h1:I+3zMkvvg5m2OcSdoL0KPljyJyvNDFGKX7QdlpYUcwk= +github.com/libp2p/go-libp2p-routing-helpers v0.7.2 h1:xJMFyhQ3Iuqnk9Q2dYE1eUTzsah7NLw3Qs2zjUV78T0= +github.com/libp2p/go-libp2p-routing-helpers v0.7.2/go.mod h1:cN4mJAD/7zfPKXBcs9ze31JGYAZgzdABEm+q/hkswb8= github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg= github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0= @@ -465,6 +504,8 @@ github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3ev github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e h1:s2RNOM/IGdY0Y6qfTeUKhDawdHDpK9RGBdx80qN4Ttw= github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e/go.mod h1:nBdnFKj15wFbf94Rwfq4m30eAcyY9V/IyKAGQFtqkW0= @@ -490,6 +531,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pokt-network/smt v0.6.1 h1:u5yTGNNND6edXv3vMQrAcjku1Ig4osehdu+EMYSXHUU= github.com/pokt-network/smt v0.6.1/go.mod h1:CWgC9UzDxXJNkL7TEADnJXutZVMYzK/+dmBb37RWkeQ= +github.com/polydawn/refmt v0.89.0 h1:ADJTApkvkeBZsN0tBTx8QjpD9JkmxbKp0cxfr9qszm4= +github.com/polydawn/refmt v0.89.0/go.mod h1:/zvteZs/GwLtCgZ4BL6CBsk9IKIlexP43ObX9AxTqTw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -530,6 +573,7 @@ github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtB github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -568,6 +612,10 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= +github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= +github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= @@ -589,12 +637,14 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e h1:IWllFTiDjjLIf2oeKxpIUmtiDV5sn71VgeQgg6vcE7k= github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkTYKSv5m6MCKkOQlHwaShTMl3HjqSGW3XtVhXM= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= @@ -602,6 +652,10 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ= +github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= +github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k= +github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc= github.com/wollac/iota-crypto-demo v0.0.0-20221117162917-b10619eccb98 h1:i7k63xHOX2ntuHrhHewfKro67c834jug2DIk599fqAA= github.com/wollac/iota-crypto-demo v0.0.0-20221117162917-b10619eccb98/go.mod h1:Knu2XMRWe8SkwTlHc/+ghP+O9DEaZRQQEyTjvLJ5Cck= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -614,6 +668,15 @@ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dY go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= @@ -624,9 +687,12 @@ go.uber.org/fx v1.20.0/go.mod h1:qCUj0btiR3/JnanEr1TYEePfSw6o/4qYJscgvzQ5Ub0= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= @@ -637,6 +703,7 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -658,6 +725,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -684,6 +752,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= @@ -786,8 +855,12 @@ golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -803,6 +876,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= +gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= @@ -831,6 +906,7 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= @@ -854,6 +930,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -876,6 +953,7 @@ honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 129d6c521..354edeb7a 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -43,21 +43,34 @@ require ( github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // 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 github.com/knadh/koanf v1.5.0 // indirect github.com/kr/text v0.2.0 // indirect + github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/libp2p/go-libp2p v0.30.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect + github.com/minio/sha256-simd v1.0.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/multiformats/go-base32 v0.1.0 // indirect + github.com/multiformats/go-base36 v0.2.0 // indirect + github.com/multiformats/go-multiaddr v0.11.0 // indirect + github.com/multiformats/go-multibase v0.2.0 // indirect + github.com/multiformats/go-multicodec v0.9.0 // indirect + github.com/multiformats/go-multihash v0.2.3 // indirect + github.com/multiformats/go-varint v0.0.7 // indirect github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pokt-network/smt v0.6.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect + github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect @@ -66,6 +79,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.25.0 // indirect golang.org/x/crypto v0.13.0 // indirect + golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.12.0 // indirect @@ -74,4 +88,5 @@ require ( google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + lukechampine.com/blake3 v1.2.1 // indirect ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index bcce03981..0f58ae65e 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -199,6 +199,8 @@ github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:ex github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= +github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= @@ -213,6 +215,8 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNU github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -226,6 +230,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= +github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= +github.com/libp2p/go-libp2p v0.30.0 h1:9EZwFtJPFBcs/yJTnP90TpN1hgrT/EsFfM+OZuwV87U= +github.com/libp2p/go-libp2p v0.30.0/go.mod h1:nr2g5V7lfftwgiJ78/HrID+pwvayLyqKCEirT2Y3Byg= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -245,6 +253,8 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1f github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= +github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= @@ -267,6 +277,20 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE= +github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= +github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= +github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= +github.com/multiformats/go-multiaddr v0.11.0 h1:XqGyJ8ufbCE0HmTDwx2kPdsrQ36AGPZNZX6s6xfJH10= +github.com/multiformats/go-multiaddr v0.11.0/go.mod h1:gWUm0QLR4thQ6+ZF6SXUw8YjtwQSPapICM+NmCkxHSM= +github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g= +github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk= +github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg= +github.com/multiformats/go-multicodec v0.9.0/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k= +github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U= +github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM= +github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8= +github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= @@ -322,6 +346,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -372,6 +398,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -451,6 +479,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -537,4 +566,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= +lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index ef1fe13a3..5d90d3eb9 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -33,6 +33,8 @@ require ( github.com/fogleman/gg v1.3.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/goccy/go-graphviz v0.1.1 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect @@ -48,13 +50,15 @@ require ( github.com/google/uuid v1.3.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/holiman/uint256 v1.2.3 // indirect github.com/huin/goupnp v1.2.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-20230906114834-b50190b9f9c2 // indirect - github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/crypto v0.0.0-20230906114834-b50190b9f9c2 // indirect @@ -69,10 +73,15 @@ require ( github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 // 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 + github.com/ipfs/go-log v1.0.5 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect + github.com/ipld/go-ipld-prime v0.20.0 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect + github.com/jbenet/goprocess v0.1.4 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/knadh/koanf v1.5.0 // indirect @@ -85,6 +94,10 @@ require ( github.com/libp2p/go-flow-metrics v0.1.0 // indirect github.com/libp2p/go-libp2p v0.30.0 // indirect github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect + github.com/libp2p/go-libp2p-kad-dht v0.25.1 // indirect + github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect + github.com/libp2p/go-libp2p-record v0.2.0 // indirect + github.com/libp2p/go-libp2p-routing-helpers v0.7.2 // indirect github.com/libp2p/go-msgio v0.3.0 // indirect github.com/libp2p/go-nat v0.2.0 // indirect github.com/libp2p/go-netroute v0.2.1 // indirect @@ -114,6 +127,7 @@ require ( github.com/multiformats/go-varint v0.0.7 // indirect github.com/onsi/ginkgo/v2 v2.12.0 // indirect github.com/opencontainers/runtime-spec v1.1.0 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect @@ -121,6 +135,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pokt-network/smt v0.6.1 // indirect + github.com/polydawn/refmt v0.89.0 // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect @@ -138,7 +153,12 @@ require ( github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect + github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect github.com/zyedidia/generic v1.2.1 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.17.0 // indirect go.uber.org/fx v1.20.0 // indirect @@ -154,6 +174,7 @@ require ( golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect + gonum.org/v1/gonum v0.13.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 5dd49034b..5f4967123 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -131,12 +131,16 @@ github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= github.com/goccy/go-graphviz v0.1.1 h1:MGrsnzBxTyt7KG8FhHsFPDTGvF7UaQMmSa6A610DqPg= github.com/goccy/go-graphviz v0.1.1/go.mod h1:lpnwvVDjskayq84ZxG8tGCPeZX/WxP88W+OJajh+gFk= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -152,6 +156,9 @@ github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzq github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -181,6 +188,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -200,12 +208,15 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f h1:pDhu5sgp8yJlEF/g6osliIIpF9K4F5jvkULXa4daRDQ= github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4= +github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= @@ -218,6 +229,8 @@ github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplb github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= @@ -227,6 +240,8 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= @@ -241,6 +256,8 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -268,8 +285,6 @@ github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2 h1:0iwjkfvN github.com/iotaledger/hive.go/app v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= 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/autopeering v0.0.0-20230906114834-b50190b9f9c2 h1:7u+EZ+bv70KC2jPPSc35IOrFmLt6IqEoIyZKqbydSBs= -github.com/iotaledger/hive.go/autopeering v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:2phgMkiTJtSGUtpA5A0b2atRfbXGCsWuz1SKpy9eoPQ= github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 h1:sck44Y5VB79MaG7p3s6/gRyXvBk31f0Alxxl/fFP/Ac= github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 h1:g9vVD1/Hx/KL4NLVJ7vsQXDIBKGxtPYBQBoillNqjxM= @@ -298,16 +313,30 @@ github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+i github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= +github.com/ipfs/boxo v0.10.0/go.mod h1:Fg+BnfxZ0RPzR0nOodzdIq3A7KgoWAOWsEIImrIQdBM= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= +github.com/ipfs/go-datastore v0.6.0 h1:JKyz+Gvz1QEZw0LsX1IBn+JFCJQH4SJVFtM4uWU0Myk= +github.com/ipfs/go-datastore v0.6.0/go.mod h1:rt5M3nNbSO/8q1t4LNkLyUwRs8HupMeN/8O4Vn9YAT8= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps= +github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8= +github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ= +github.com/ipfs/go-log v1.0.5 h1:2dOuUCB1Z7uoczMWgAyDck5JLb72zHzrMnGnCNNbvY8= +github.com/ipfs/go-log v1.0.5/go.mod h1:j0b8ZoR+7+R99LD9jZ6+AJsrzkPbSXbZfGakb5JPtIo= +github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g= github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY= github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI= +github.com/ipld/go-ipld-prime v0.20.0 h1:Ud3VwE9ClxpO2LkCYP7vWPc0Fo+dYdYzgxUJZ3uRG4g= +github.com/ipld/go-ipld-prime v0.20.0/go.mod h1:PzqZ/ZR981eKbgdr3y2DJYeD/8bgMawdGVlJDE8kK+M= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA= github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk= github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk= +github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o= +github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= @@ -318,6 +347,8 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -358,6 +389,14 @@ github.com/libp2p/go-libp2p v0.30.0 h1:9EZwFtJPFBcs/yJTnP90TpN1hgrT/EsFfM+OZuwV8 github.com/libp2p/go-libp2p v0.30.0/go.mod h1:nr2g5V7lfftwgiJ78/HrID+pwvayLyqKCEirT2Y3Byg= github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s= github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w= +github.com/libp2p/go-libp2p-kad-dht v0.25.1 h1:ofFNrf6MMEy4vi3R1VbJ7LOcTn3Csh0cDcaWHTxtWNA= +github.com/libp2p/go-libp2p-kad-dht v0.25.1/go.mod h1:6za56ncRHYXX4Nc2vn8z7CZK0P4QiMcrn77acKLM2Oo= +github.com/libp2p/go-libp2p-kbucket v0.6.3 h1:p507271wWzpy2f1XxPzCQG9NiN6R6lHL9GiSErbQQo0= +github.com/libp2p/go-libp2p-kbucket v0.6.3/go.mod h1:RCseT7AH6eJWxxk2ol03xtP9pEHetYSPXOaJnOiD8i0= +github.com/libp2p/go-libp2p-record v0.2.0 h1:oiNUOCWno2BFuxt3my4i1frNrt7PerzB3queqa1NkQ0= +github.com/libp2p/go-libp2p-record v0.2.0/go.mod h1:I+3zMkvvg5m2OcSdoL0KPljyJyvNDFGKX7QdlpYUcwk= +github.com/libp2p/go-libp2p-routing-helpers v0.7.2 h1:xJMFyhQ3Iuqnk9Q2dYE1eUTzsah7NLw3Qs2zjUV78T0= +github.com/libp2p/go-libp2p-routing-helpers v0.7.2/go.mod h1:cN4mJAD/7zfPKXBcs9ze31JGYAZgzdABEm+q/hkswb8= github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg= github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0= @@ -469,6 +508,8 @@ github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3ev github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e h1:s2RNOM/IGdY0Y6qfTeUKhDawdHDpK9RGBdx80qN4Ttw= github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e/go.mod h1:nBdnFKj15wFbf94Rwfq4m30eAcyY9V/IyKAGQFtqkW0= @@ -494,6 +535,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pokt-network/smt v0.6.1 h1:u5yTGNNND6edXv3vMQrAcjku1Ig4osehdu+EMYSXHUU= github.com/pokt-network/smt v0.6.1/go.mod h1:CWgC9UzDxXJNkL7TEADnJXutZVMYzK/+dmBb37RWkeQ= +github.com/polydawn/refmt v0.89.0 h1:ADJTApkvkeBZsN0tBTx8QjpD9JkmxbKp0cxfr9qszm4= +github.com/polydawn/refmt v0.89.0/go.mod h1:/zvteZs/GwLtCgZ4BL6CBsk9IKIlexP43ObX9AxTqTw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -534,6 +577,7 @@ github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtB github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -572,6 +616,10 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= +github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= +github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= @@ -593,12 +641,14 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e h1:IWllFTiDjjLIf2oeKxpIUmtiDV5sn71VgeQgg6vcE7k= github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkTYKSv5m6MCKkOQlHwaShTMl3HjqSGW3XtVhXM= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= @@ -606,6 +656,10 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ= +github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= +github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k= +github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -616,6 +670,15 @@ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dY go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= @@ -626,9 +689,12 @@ go.uber.org/fx v1.20.0/go.mod h1:qCUj0btiR3/JnanEr1TYEePfSw6o/4qYJscgvzQ5Ub0= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= @@ -639,6 +705,7 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -660,6 +727,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -686,6 +754,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= @@ -788,8 +857,12 @@ golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -805,6 +878,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= +gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= @@ -833,6 +908,7 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= @@ -856,6 +932,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -878,6 +955,7 @@ honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 9d0babd0f..096b9ea87 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -34,18 +34,33 @@ require ( github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // 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 + github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/libp2p/go-libp2p v0.30.0 // indirect + github.com/minio/sha256-simd v1.0.1 // indirect + github.com/multiformats/go-base32 v0.1.0 // indirect + github.com/multiformats/go-base36 v0.2.0 // indirect + github.com/multiformats/go-multiaddr v0.11.0 // indirect + github.com/multiformats/go-multibase v0.2.0 // indirect + github.com/multiformats/go-multicodec v0.9.0 // indirect + github.com/multiformats/go-multihash v0.2.3 // indirect + github.com/multiformats/go-varint v0.0.7 // indirect github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pokt-network/smt v0.6.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect + github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/wollac/iota-crypto-demo v0.0.0-20221117162917-b10619eccb98 // indirect github.com/zyedidia/generic v1.2.1 // indirect go.uber.org/atomic v1.11.0 // indirect + golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect golang.org/x/sys v0.12.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + lukechampine.com/blake3 v1.2.1 // indirect ) diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 546795355..9b20fdc88 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -52,12 +52,36 @@ github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:ex github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= +github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= +github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= +github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= +github.com/libp2p/go-libp2p v0.30.0 h1:9EZwFtJPFBcs/yJTnP90TpN1hgrT/EsFfM+OZuwV87U= +github.com/libp2p/go-libp2p v0.30.0/go.mod h1:nr2g5V7lfftwgiJ78/HrID+pwvayLyqKCEirT2Y3Byg= +github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= +github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE= +github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= +github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= +github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= +github.com/multiformats/go-multiaddr v0.11.0 h1:XqGyJ8ufbCE0HmTDwx2kPdsrQ36AGPZNZX6s6xfJH10= +github.com/multiformats/go-multiaddr v0.11.0/go.mod h1:gWUm0QLR4thQ6+ZF6SXUw8YjtwQSPapICM+NmCkxHSM= +github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g= +github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk= +github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg= +github.com/multiformats/go-multicodec v0.9.0/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k= +github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U= +github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM= +github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8= +github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU= github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e h1:s2RNOM/IGdY0Y6qfTeUKhDawdHDpK9RGBdx80qN4Ttw= github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e/go.mod h1:nBdnFKj15wFbf94Rwfq4m30eAcyY9V/IyKAGQFtqkW0= github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c h1:Gcce/r5tSQeprxswXXOwQ/RBU1bjQWVd9dB7QKoPXBE= @@ -75,6 +99,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= +github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -92,6 +118,9 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -104,3 +133,5 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= +lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= From 84b54fd7d7fc6bc3e0b867d241080094a4abbd48 Mon Sep 17 00:00:00 2001 From: jonastheis <4181434+jonastheis@users.noreply.github.com> Date: Thu, 7 Sep 2023 15:15:02 +0800 Subject: [PATCH 16/18] Reset protocol parameters file only after successful protocol run --- components/protocol/component.go | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/components/protocol/component.go b/components/protocol/component.go index 65e50d2f3..fa2c44934 100644 --- a/components/protocol/component.go +++ b/components/protocol/component.go @@ -59,6 +59,10 @@ type dependencies struct { Protocol *protocol.Protocol } +type jsonProtocolParameters struct { + ProtocolParameters []iotago.ProtocolParameters `serix:"0,mapKey=protocolParameters"` +} + func readProtocolParameters() []iotago.ProtocolParameters { fileBytes, err := os.ReadFile(ParamsProtocol.ProtocolParametersPath) if err != nil { @@ -66,28 +70,26 @@ func readProtocolParameters() []iotago.ProtocolParameters { return nil } - type jsonProtocolParameters struct { - ProtocolParameters []iotago.ProtocolParameters `serix:"0,mapKey=protocolParameters"` - } - parsedParams := &jsonProtocolParameters{} if err := iotago.CommonSerixAPI().JSONDecode(context.Background(), fileBytes, parsedParams); err != nil { Component.LogWarnf("Error parsing protocol parameters file (%s): %s", ParamsProtocol.ProtocolParametersPath, err) return nil } + return parsedParams.ProtocolParameters +} + +func resetProtocolParameters() { bytesToWrite, err := iotago.CommonSerixAPI().JSONEncode(context.Background(), jsonProtocolParameters{}) if err != nil { Component.LogInfof("Error writing protocol parameters file (%s): %s", ParamsProtocol.ProtocolParametersPath, err) - return parsedParams.ProtocolParameters + return } if err := os.WriteFile(ParamsProtocol.ProtocolParametersPath, bytesToWrite, 0600); err != nil { Component.LogInfof("Error writing protocol parameters file (%s): %s", ParamsProtocol.ProtocolParametersPath, err) - return parsedParams.ProtocolParameters + return } - - return parsedParams.ProtocolParameters } func initConfigParams(c *dig.Container) error { @@ -320,6 +322,10 @@ func run() error { Component.LogErrorfAndExit("Error running the Protocol: %s", err.Error()) } } + + //nolint:contextcheck // context might be canceled + resetProtocolParameters() + Component.LogInfo("Gracefully shutting down the Protocol...") }, daemon.PriorityProtocol) } From 3c97704b442751ac480fba32071451ab1e9451eb Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Mon, 11 Sep 2023 19:21:09 +0800 Subject: [PATCH 17/18] Update iota.go version --- go.mod | 2 +- go.sum | 4 ++-- tools/evil-spammer/go.mod | 2 +- tools/evil-spammer/go.sum | 4 ++-- tools/gendoc/go.mod | 2 +- tools/gendoc/go.sum | 4 ++-- tools/genesis-snapshot/go.mod | 2 +- tools/genesis-snapshot/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index afcb553f1..b6aa3e726 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b - github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 + github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 github.com/libp2p/go-libp2p v0.30.0 diff --git a/go.sum b/go.sum index a06ce8ca0..d3feb343f 100644 --- a/go.sum +++ b/go.sum @@ -307,8 +307,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 h1:eBVGnr/WkqF3+tlCE23uDxPvmkD/r7StkIoUerwLEqw= +github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= github.com/ipfs/boxo v0.10.0/go.mod h1:Fg+BnfxZ0RPzR0nOodzdIq3A7KgoWAOWsEIImrIQdBM= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 354edeb7a..a9981fdc1 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 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-20230906064556-75f5be378284 + github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index 0f58ae65e..c8e989096 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -197,8 +197,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 h1:eBVGnr/WkqF3+tlCE23uDxPvmkD/r7StkIoUerwLEqw= +github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index 5d90d3eb9..7b14436cd 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -72,7 +72,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 // 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/tools/gendoc/go.sum b/tools/gendoc/go.sum index 5f4967123..83fde82f5 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -311,8 +311,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 h1:eBVGnr/WkqF3+tlCE23uDxPvmkD/r7StkIoUerwLEqw= +github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= github.com/ipfs/boxo v0.10.0/go.mod h1:Fg+BnfxZ0RPzR0nOodzdIq3A7KgoWAOWsEIImrIQdBM= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 096b9ea87..8a539d969 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 + github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.13.0 diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 9b20fdc88..aa28b0b50 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -50,8 +50,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284 h1:SmPyo08i2/ymMZkmIQX/7EexuWWFl7CKDZjJr47zn8Q= -github.com/iotaledger/iota.go/v4 v4.0.0-20230906064556-75f5be378284/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 h1:eBVGnr/WkqF3+tlCE23uDxPvmkD/r7StkIoUerwLEqw= +github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= From 88e4b1cad0fe77f1388e9bea4177c28a28f4fe17 Mon Sep 17 00:00:00 2001 From: muXxer Date: Tue, 12 Sep 2023 16:14:42 +0200 Subject: [PATCH 18/18] Fix serialization of empty slices --- config_defaults.json | 1 + .../docs/references/configuration.md | 12 +-- go.mod | 8 +- go.sum | 16 ++-- pkg/protocol/engine/utxoledger/output_test.go | 88 +++++++++++-------- .../engine/utxoledger/slot_diff_test.go | 4 +- .../snapshotcreator/snapshotcreator.go | 8 +- pkg/testsuite/transactions_framework.go | 37 +++++--- pkg/utils/rand.go | 21 +++-- tools/evil-spammer/go.mod | 6 +- tools/evil-spammer/go.sum | 12 +-- tools/gendoc/go.mod | 8 +- tools/gendoc/go.sum | 16 ++-- tools/genesis-snapshot/go.mod | 6 +- tools/genesis-snapshot/go.sum | 16 ++-- 15 files changed, 150 insertions(+), 109 deletions(-) diff --git a/config_defaults.json b/config_defaults.json index 7ebf7eb0d..bfdfcf3c8 100644 --- a/config_defaults.json +++ b/config_defaults.json @@ -108,6 +108,7 @@ "filter": { "maxAllowedClockDrift": "5s" }, + "protocolParametersPath": "testnet/protocol_parameters.json", "baseToken": { "name": "Shimmer", "tickerSymbol": "SMR", diff --git a/documentation/docs/references/configuration.md b/documentation/docs/references/configuration.md index 07a4b44fa..df3d0e2a2 100644 --- a/documentation/docs/references/configuration.md +++ b/documentation/docs/references/configuration.md @@ -324,11 +324,12 @@ Example: ## 9. Protocol -| Name | Description | Type | Default value | -| -------------------------------- | --------------------------- | ------ | ------------- | -| [snapshot](#protocol_snapshot) | Configuration for snapshot | object | | -| [filter](#protocol_filter) | Configuration for filter | object | | -| [baseToken](#protocol_basetoken) | Configuration for baseToken | object | | +| Name | Description | Type | Default value | +| -------------------------------- | ---------------------------------------- | ------ | ---------------------------------- | +| [snapshot](#protocol_snapshot) | Configuration for snapshot | object | | +| [filter](#protocol_filter) | Configuration for filter | object | | +| protocolParametersPath | The path of the protocol parameters file | string | "testnet/protocol_parameters.json" | +| [baseToken](#protocol_basetoken) | Configuration for baseToken | object | | ### Snapshot @@ -366,6 +367,7 @@ Example: "filter": { "maxAllowedClockDrift": "5s" }, + "protocolParametersPath": "testnet/protocol_parameters.json", "baseToken": { "name": "Shimmer", "tickerSymbol": "SMR", diff --git a/go.mod b/go.mod index b6aa3e726..07912fa41 100644 --- a/go.mod +++ b/go.mod @@ -20,11 +20,11 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b - github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 + github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265 github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 github.com/libp2p/go-libp2p v0.30.0 @@ -58,7 +58,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/eclipse/paho.mqtt.golang v1.4.3 // indirect github.com/elastic/gosigar v0.14.2 // indirect - github.com/ethereum/go-ethereum v1.12.2 // indirect + github.com/ethereum/go-ethereum v1.13.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/felixge/fgprof v0.9.3 // indirect github.com/fjl/memsize v0.0.2 // indirect @@ -83,7 +83,7 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/holiman/uint256 v1.2.3 // indirect - github.com/huin/goupnp v1.2.0 // indirect + 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/ipfs/boxo v0.10.0 // indirect diff --git a/go.sum b/go.sum index d3feb343f..f30191d02 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/go-ethereum v1.12.2 h1:eGHJ4ij7oyVqUQn48LBz3B7pvQ8sV0wGJiIE6gDq/6Y= -github.com/ethereum/go-ethereum v1.12.2/go.mod h1:1cRAEV+rp/xX0zraSCBnu9Py3HQ+geRMj3HdR+k0wfI= +github.com/ethereum/go-ethereum v1.13.0 h1:dZALM0PlDTtNITTECPiqSrFo0iEYVDfby+mSVc0LxIs= +github.com/ethereum/go-ethereum v1.13.0/go.mod h1:0TDsBNJ7j8jR01vKpk4j2zfVKyAbQuKzy6wLwb5ZMuU= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= @@ -270,8 +270,8 @@ github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2 github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= @@ -299,16 +299,16 @@ github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 h1:vVs4Z github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 h1:jpX2K+d9+FaCngP3dTjSIabm+OIxThc/AQPKvp2d23c= github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 h1:kEakiZRk/LUb2CxQvSOsdTgUXK1Ee4BNec9ps40+iXQ= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c h1:dijcFDsCtbUIGxeC5XiWIl1azYHb3x/zGJZ3P+9mABY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQxUYo9aZ4XYuh8EbXWtZBdh7WvL7oh2unWNUFMo= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 h1:eBVGnr/WkqF3+tlCE23uDxPvmkD/r7StkIoUerwLEqw= -github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265 h1:0j8ljlBmo/f5Gxva83mLWqZLB/xSO9PgJFMPfJ7tyRY= +github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265/go.mod h1:DWCa+mXRTGWBV0EHVuvToUxAEcICe2Pab9hBlxBamKo= github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= github.com/ipfs/boxo v0.10.0/go.mod h1:Fg+BnfxZ0RPzR0nOodzdIq3A7KgoWAOWsEIImrIQdBM= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= diff --git a/pkg/protocol/engine/utxoledger/output_test.go b/pkg/protocol/engine/utxoledger/output_test.go index 29faf4de3..19aa816c5 100644 --- a/pkg/protocol/engine/utxoledger/output_test.go +++ b/pkg/protocol/engine/utxoledger/output_test.go @@ -124,7 +124,13 @@ func TestExtendedOutputOnEd25519WithoutSpendConstraintsSerialization(t *testing. slotCreated := utils.RandSlotIndex() iotaOutput := &iotago.BasicOutput{ - Amount: amount, + Amount: amount, + NativeTokens: iotago.NativeTokens{}, + Conditions: iotago.BasicOutputUnlockConditions{ + &iotago.AddressUnlockCondition{ + Address: address, + }, + }, Features: iotago.BasicOutputFeatures{ &iotago.SenderFeature{ Address: senderAddress, @@ -133,11 +139,6 @@ func TestExtendedOutputOnEd25519WithoutSpendConstraintsSerialization(t *testing. Tag: tag, }, }, - Conditions: iotago.BasicOutputUnlockConditions{ - &iotago.AddressUnlockCondition{ - Address: address, - }, - }, } output := CreateOutputAndAssertSerialization(t, blockID, index, slotCreated, outputID, iotaOutput) @@ -158,12 +159,8 @@ func TestExtendedOutputOnEd25519WithSpendConstraintsSerialization(t *testing.T) timeLockUnlockSlot := utils.RandSlotIndex() iotaOutput := &iotago.BasicOutput{ - Amount: amount, - Features: iotago.BasicOutputFeatures{ - &iotago.SenderFeature{ - Address: senderAddress, - }, - }, + Amount: amount, + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{ Address: address, @@ -172,6 +169,11 @@ func TestExtendedOutputOnEd25519WithSpendConstraintsSerialization(t *testing.T) SlotIndex: timeLockUnlockSlot, }, }, + Features: iotago.BasicOutputFeatures{ + &iotago.SenderFeature{ + Address: senderAddress, + }, + }, } output := CreateOutputAndAssertSerialization(t, blockID, index, slotCreated, outputID, iotaOutput) @@ -191,18 +193,20 @@ func TestNFTOutputSerialization(t *testing.T) { slotCreated := utils.RandSlotIndex() iotaOutput := &iotago.NFTOutput{ - Amount: amount, - NFTID: nftID, - ImmutableFeatures: iotago.NFTOutputImmFeatures{ - &iotago.MetadataFeature{ - Data: utils.RandBytes(12), - }, - }, + Amount: amount, + NativeTokens: iotago.NativeTokens{}, + NFTID: nftID, Conditions: iotago.NFTOutputUnlockConditions{ &iotago.AddressUnlockCondition{ Address: address, }, }, + Features: iotago.NFTOutputFeatures{}, + ImmutableFeatures: iotago.NFTOutputImmFeatures{ + &iotago.MetadataFeature{ + Data: utils.RandBytes(12), + }, + }, } output := CreateOutputAndAssertSerialization(t, blockID, index, slotCreated, outputID, iotaOutput) @@ -224,16 +228,9 @@ func TestNFTOutputWithSpendConstraintsSerialization(t *testing.T) { expirationUnlockSlot := utils.RandSlotIndex() iotaOutput := &iotago.NFTOutput{ - Amount: amount, - NFTID: nftID, - ImmutableFeatures: iotago.NFTOutputImmFeatures{ - &iotago.MetadataFeature{ - Data: utils.RandBytes(12), - }, - &iotago.IssuerFeature{ - Address: issuerAddress, - }, - }, + Amount: amount, + NativeTokens: iotago.NativeTokens{}, + NFTID: nftID, Conditions: iotago.NFTOutputUnlockConditions{ &iotago.AddressUnlockCondition{ Address: address.ToAddress(), @@ -243,6 +240,15 @@ func TestNFTOutputWithSpendConstraintsSerialization(t *testing.T) { ReturnAddress: issuerAddress, }, }, + Features: iotago.NFTOutputFeatures{}, + ImmutableFeatures: iotago.NFTOutputImmFeatures{ + &iotago.MetadataFeature{ + Data: utils.RandBytes(12), + }, + &iotago.IssuerFeature{ + Address: issuerAddress, + }, + }, } output := CreateOutputAndAssertSerialization(t, blockID, index, slotCreated, outputID, iotaOutput) @@ -265,8 +271,17 @@ func TestAccountOutputSerialization(t *testing.T) { slotCreated := utils.RandSlotIndex() iotaOutput := &iotago.AccountOutput{ - Amount: amount, - AccountID: aliasID, + Amount: amount, + NativeTokens: iotago.NativeTokens{}, + AccountID: aliasID, + Conditions: iotago.AccountOutputUnlockConditions{ + &iotago.StateControllerAddressUnlockCondition{ + Address: stateController.ToAddress(), + }, + &iotago.GovernorAddressUnlockCondition{ + Address: governor, + }, + }, Features: iotago.AccountOutputFeatures{ &iotago.SenderFeature{ Address: sender.ToAddress(), @@ -277,14 +292,6 @@ func TestAccountOutputSerialization(t *testing.T) { Address: issuer.ToAddress(), }, }, - Conditions: iotago.AccountOutputUnlockConditions{ - &iotago.StateControllerAddressUnlockCondition{ - Address: stateController.ToAddress(), - }, - &iotago.GovernorAddressUnlockCondition{ - Address: governor, - }, - }, } output := CreateOutputAndAssertSerialization(t, blockID, index, slotCreated, outputID, iotaOutput) @@ -305,6 +312,7 @@ func TestFoundryOutputSerialization(t *testing.T) { iotaOutput := &iotago.FoundryOutput{ Amount: amount, + NativeTokens: iotago.NativeTokens{}, SerialNumber: utils.RandUint32(math.MaxUint32), TokenScheme: &iotago.SimpleTokenScheme{ MintedTokens: supply, @@ -316,6 +324,8 @@ func TestFoundryOutputSerialization(t *testing.T) { Address: aliasID.ToAddress().(*iotago.AccountAddress), }, }, + Features: iotago.FoundryOutputFeatures{}, + ImmutableFeatures: iotago.FoundryOutputImmFeatures{}, } output := CreateOutputAndAssertSerialization(t, blockID, index, slotCreated, outputID, iotaOutput) diff --git a/pkg/protocol/engine/utxoledger/slot_diff_test.go b/pkg/protocol/engine/utxoledger/slot_diff_test.go index ee96f8fed..85b721943 100644 --- a/pkg/protocol/engine/utxoledger/slot_diff_test.go +++ b/pkg/protocol/engine/utxoledger/slot_diff_test.go @@ -28,12 +28,14 @@ func TestSimpleSlotDiffSerialization(t *testing.T) { address := utils.RandAddress(iotago.AddressEd25519) amount := iotago.BaseToken(832493) iotaOutput := &iotago.BasicOutput{ - Amount: amount, + Amount: amount, + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{ Address: address, }, }, + Features: iotago.BasicOutputFeatures{}, } output := utxoledger.CreateOutput(api.SingleVersionProvider(iotago_tpkg.TestAPI), outputID, blockID, indexBooked, slotCreated, iotaOutput) diff --git a/pkg/protocol/snapshotcreator/snapshotcreator.go b/pkg/protocol/snapshotcreator/snapshotcreator.go index c2e4d4a71..e12ce74cd 100644 --- a/pkg/protocol/snapshotcreator/snapshotcreator.go +++ b/pkg/protocol/snapshotcreator/snapshotcreator.go @@ -176,9 +176,10 @@ func createOutput(address iotago.Address, tokenAmount iotago.BaseToken) (output func createAccount(accountID iotago.AccountID, address iotago.Address, tokenAmount iotago.BaseToken, mana iotago.Mana, blockIssuerKey iotago.BlockIssuerKey, expirySlot iotago.SlotIndex, stakedAmount iotago.BaseToken, stakeEndEpoch iotago.EpochIndex, stakeFixedCost iotago.Mana) (output iotago.Output) { accountOutput := &iotago.AccountOutput{ - AccountID: accountID, - Amount: tokenAmount, - Mana: mana, + Amount: tokenAmount, + Mana: mana, + NativeTokens: iotago.NativeTokens{}, + AccountID: accountID, Conditions: iotago.AccountOutputUnlockConditions{ &iotago.StateControllerAddressUnlockCondition{Address: address}, &iotago.GovernorAddressUnlockCondition{Address: address}, @@ -189,6 +190,7 @@ func createAccount(accountID iotago.AccountID, address iotago.Address, tokenAmou ExpirySlot: expirySlot, }, }, + ImmutableFeatures: iotago.AccountOutputImmFeatures{}, } // The Staking feature is only added if both StakedAmount and StakeEndEpoch have non-zero values, diff --git a/pkg/testsuite/transactions_framework.go b/pkg/testsuite/transactions_framework.go index a854970fd..a306231e7 100644 --- a/pkg/testsuite/transactions_framework.go +++ b/pkg/testsuite/transactions_framework.go @@ -127,11 +127,13 @@ func (t *TransactionFramework) CreateBasicOutputsEqually(outputCount int, inputA remainderMana -= manaAmount outputStates = append(outputStates, &iotago.BasicOutput{ - Amount: tokenAmount, + Amount: tokenAmount, + Mana: manaAmount, + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{Address: t.DefaultAddress()}, }, - Mana: manaAmount, + Features: iotago.BasicOutputFeatures{}, }) } @@ -161,11 +163,13 @@ func (t *TransactionFramework) CreateBasicOutputs(amountDistribution []iotago.Ba outputStates := make(iotago.Outputs[iotago.Output], 0, len(amountDistribution)) for idx, outputAmount := range amountDistribution { outputStates = append(outputStates, &iotago.BasicOutput{ - Amount: outputAmount, + Amount: outputAmount, + Mana: manaDistribution[idx], + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{Address: t.DefaultAddress()}, }, - Mana: manaDistribution[idx], + Features: iotago.BasicOutputFeatures{}, }) } @@ -176,12 +180,15 @@ func (t *TransactionFramework) CreateAccountFromInput(inputAlias string, opts .. input := t.Output(inputAlias) accountOutput := options.Apply(&iotago.AccountOutput{ - Amount: input.BaseTokenAmount(), - Mana: input.StoredMana(), + Amount: input.BaseTokenAmount(), + Mana: input.StoredMana(), + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.AccountOutputUnlockConditions{ &iotago.StateControllerAddressUnlockCondition{Address: t.DefaultAddress()}, &iotago.GovernorAddressUnlockCondition{Address: t.DefaultAddress()}, }, + Features: iotago.AccountOutputFeatures{}, + ImmutableFeatures: iotago.AccountOutputImmFeatures{}, }, opts) outputStates := iotago.Outputs[iotago.Output]{accountOutput} @@ -189,11 +196,13 @@ func (t *TransactionFramework) CreateAccountFromInput(inputAlias string, opts .. // if amount was set by options, a remainder output needs to be created if accountOutput.Amount != input.BaseTokenAmount() { outputStates = append(outputStates, &iotago.BasicOutput{ - Amount: input.BaseTokenAmount() - accountOutput.Amount, + Amount: input.BaseTokenAmount() - accountOutput.Amount, + Mana: input.StoredMana() - accountOutput.Mana, + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{Address: t.DefaultAddress()}, }, - Mana: input.StoredMana() - accountOutput.Mana, + Features: iotago.BasicOutputFeatures{}, }) } @@ -229,11 +238,13 @@ func (t *TransactionFramework) CreateDelegationFromInput(inputAlias string, opts // if options set an Amount, a remainder output needs to be created if delegationOutput.Amount != input.BaseTokenAmount() { outputStates = append(outputStates, &iotago.BasicOutput{ - Amount: input.BaseTokenAmount() - delegationOutput.Amount, + Amount: input.BaseTokenAmount() - delegationOutput.Amount, + Mana: input.StoredMana(), + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{Address: t.DefaultAddress()}, }, - Mana: input.StoredMana(), + Features: iotago.BasicOutputFeatures{}, }) } @@ -264,11 +275,13 @@ func (t *TransactionFramework) DestroyAccount(alias string) (consumedInputs *utx output := t.Output(alias) outputStates := iotago.Outputs[iotago.Output]{&iotago.BasicOutput{ - Amount: output.BaseTokenAmount(), + Amount: output.BaseTokenAmount(), + Mana: output.StoredMana(), + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{Address: t.DefaultAddress()}, }, - Mana: output.StoredMana(), + Features: iotago.BasicOutputFeatures{}, }} return output, outputStates, []*mock.HDWallet{t.wallet} diff --git a/pkg/utils/rand.go b/pkg/utils/rand.go index a9a55e6d3..356b66193 100644 --- a/pkg/utils/rand.go +++ b/pkg/utils/rand.go @@ -171,18 +171,21 @@ func RandOutputOnAddressWithAmount(outputType iotago.OutputType, address iotago. case iotago.OutputBasic: //nolint:forcetypeassert // we already checked the type iotaOutput = &iotago.BasicOutput{ - Amount: amount, + Amount: amount, + NativeTokens: iotago.NativeTokens{}, Conditions: iotago.BasicOutputUnlockConditions{ &iotago.AddressUnlockCondition{ Address: address, }, }, + Features: iotago.BasicOutputFeatures{}, } case iotago.OutputAccount: //nolint:forcetypeassert // we already checked the type iotaOutput = &iotago.AccountOutput{ - Amount: amount, - AccountID: RandAccountID(), + Amount: amount, + NativeTokens: iotago.NativeTokens{}, + AccountID: RandAccountID(), Conditions: iotago.AccountOutputUnlockConditions{ &iotago.StateControllerAddressUnlockCondition{ Address: address, @@ -191,6 +194,8 @@ func RandOutputOnAddressWithAmount(outputType iotago.OutputType, address iotago. Address: address, }, }, + Features: iotago.AccountOutputFeatures{}, + ImmutableFeatures: iotago.AccountOutputImmFeatures{}, } case iotago.OutputFoundry: if address.Type() != iotago.AddressAccount { @@ -201,6 +206,7 @@ func RandOutputOnAddressWithAmount(outputType iotago.OutputType, address iotago. //nolint:forcetypeassert // we already checked the type iotaOutput = &iotago.FoundryOutput{ Amount: amount, + NativeTokens: iotago.NativeTokens{}, SerialNumber: 0, TokenScheme: &iotago.SimpleTokenScheme{ MintedTokens: supply, @@ -212,17 +218,22 @@ func RandOutputOnAddressWithAmount(outputType iotago.OutputType, address iotago. Address: address.(*iotago.AccountAddress), }, }, + Features: iotago.FoundryOutputFeatures{}, + ImmutableFeatures: iotago.FoundryOutputImmFeatures{}, } case iotago.OutputNFT: //nolint:forcetypeassert // we already checked the type iotaOutput = &iotago.NFTOutput{ - Amount: amount, - NFTID: RandNFTID(), + Amount: amount, + NativeTokens: iotago.NativeTokens{}, + NFTID: RandNFTID(), Conditions: iotago.NFTOutputUnlockConditions{ &iotago.AddressUnlockCondition{ Address: address, }, }, + Features: iotago.NFTOutputFeatures{}, + ImmutableFeatures: iotago.NFTOutputImmFeatures{}, } default: panic("unhandled output type") diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index a9981fdc1..5d457c436 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 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-20230911110046-2c50729c4ea0 + github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265 github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) @@ -28,7 +28,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/eclipse/paho.mqtt.golang v1.4.3 // indirect - github.com/ethereum/go-ethereum v1.12.2 // indirect + github.com/ethereum/go-ethereum v1.13.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/google/go-cmp v0.5.9 // indirect @@ -41,7 +41,7 @@ require ( github.com/iotaledger/hive.go/constraints v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c // indirect github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index c8e989096..cad6309ec 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -62,8 +62,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/go-ethereum v1.12.2 h1:eGHJ4ij7oyVqUQn48LBz3B7pvQ8sV0wGJiIE6gDq/6Y= -github.com/ethereum/go-ethereum v1.12.2/go.mod h1:1cRAEV+rp/xX0zraSCBnu9Py3HQ+geRMj3HdR+k0wfI= +github.com/ethereum/go-ethereum v1.13.0 h1:dZALM0PlDTtNITTECPiqSrFo0iEYVDfby+mSVc0LxIs= +github.com/ethereum/go-ethereum v1.13.0/go.mod h1:0TDsBNJ7j8jR01vKpk4j2zfVKyAbQuKzy6wLwb5ZMuU= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= @@ -193,12 +193,12 @@ github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 h1:vVs4Z github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 h1:jpX2K+d9+FaCngP3dTjSIabm+OIxThc/AQPKvp2d23c= github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 h1:kEakiZRk/LUb2CxQvSOsdTgUXK1Ee4BNec9ps40+iXQ= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c h1:dijcFDsCtbUIGxeC5XiWIl1azYHb3x/zGJZ3P+9mABY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 h1:eBVGnr/WkqF3+tlCE23uDxPvmkD/r7StkIoUerwLEqw= -github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265 h1:0j8ljlBmo/f5Gxva83mLWqZLB/xSO9PgJFMPfJ7tyRY= +github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265/go.mod h1:DWCa+mXRTGWBV0EHVuvToUxAEcICe2Pab9hBlxBamKo= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index 7b14436cd..4ae986ec8 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -25,7 +25,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/eclipse/paho.mqtt.golang v1.4.3 // indirect github.com/elastic/gosigar v0.14.2 // indirect - github.com/ethereum/go-ethereum v1.12.2 // indirect + github.com/ethereum/go-ethereum v1.13.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/fbiville/markdown-table-formatter v0.3.0 // indirect github.com/felixge/fgprof v0.9.3 // indirect @@ -55,7 +55,7 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/holiman/uint256 v1.2.3 // indirect - github.com/huin/goupnp v1.2.0 // indirect + 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-20230906114834-b50190b9f9c2 // indirect @@ -68,11 +68,11 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c // indirect github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265 // 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/tools/gendoc/go.sum b/tools/gendoc/go.sum index 83fde82f5..4ecbaaa4b 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -96,8 +96,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/go-ethereum v1.12.2 h1:eGHJ4ij7oyVqUQn48LBz3B7pvQ8sV0wGJiIE6gDq/6Y= -github.com/ethereum/go-ethereum v1.12.2/go.mod h1:1cRAEV+rp/xX0zraSCBnu9Py3HQ+geRMj3HdR+k0wfI= +github.com/ethereum/go-ethereum v1.13.0 h1:dZALM0PlDTtNITTECPiqSrFo0iEYVDfby+mSVc0LxIs= +github.com/ethereum/go-ethereum v1.13.0/go.mod h1:0TDsBNJ7j8jR01vKpk4j2zfVKyAbQuKzy6wLwb5ZMuU= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= @@ -272,8 +272,8 @@ github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2 github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= @@ -303,16 +303,16 @@ github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2 h1:vVs4Z github.com/iotaledger/hive.go/logger v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 h1:jpX2K+d9+FaCngP3dTjSIabm+OIxThc/AQPKvp2d23c= github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 h1:kEakiZRk/LUb2CxQvSOsdTgUXK1Ee4BNec9ps40+iXQ= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c h1:dijcFDsCtbUIGxeC5XiWIl1azYHb3x/zGJZ3P+9mABY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQxUYo9aZ4XYuh8EbXWtZBdh7WvL7oh2unWNUFMo= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 h1:eBVGnr/WkqF3+tlCE23uDxPvmkD/r7StkIoUerwLEqw= -github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265 h1:0j8ljlBmo/f5Gxva83mLWqZLB/xSO9PgJFMPfJ7tyRY= +github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265/go.mod h1:DWCa+mXRTGWBV0EHVuvToUxAEcICe2Pab9hBlxBamKo= github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= github.com/ipfs/boxo v0.10.0/go.mod h1:Fg+BnfxZ0RPzR0nOodzdIq3A7KgoWAOWsEIImrIQdBM= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 8a539d969..9095c1edb 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 + github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265 github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.13.0 @@ -21,7 +21,7 @@ require ( github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect - github.com/ethereum/go-ethereum v1.12.2 // indirect + github.com/ethereum/go-ethereum v1.13.0 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/uuid v1.3.1 // indirect github.com/holiman/uint256 v1.2.3 // indirect @@ -32,7 +32,7 @@ require ( github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/ds v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/iotaledger/hive.go/kvstore v0.0.0-20230906114834-b50190b9f9c2 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c // indirect github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index aa28b0b50..5c3c52d0e 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -12,8 +12,8 @@ github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5il github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= -github.com/ethereum/go-ethereum v1.12.2 h1:eGHJ4ij7oyVqUQn48LBz3B7pvQ8sV0wGJiIE6gDq/6Y= -github.com/ethereum/go-ethereum v1.12.2/go.mod h1:1cRAEV+rp/xX0zraSCBnu9Py3HQ+geRMj3HdR+k0wfI= +github.com/ethereum/go-ethereum v1.13.0 h1:dZALM0PlDTtNITTECPiqSrFo0iEYVDfby+mSVc0LxIs= +github.com/ethereum/go-ethereum v1.13.0/go.mod h1:0TDsBNJ7j8jR01vKpk4j2zfVKyAbQuKzy6wLwb5ZMuU= github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -46,18 +46,18 @@ github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2 h1:wLZPoEOVv github.com/iotaledger/hive.go/lo v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2 h1:jpX2K+d9+FaCngP3dTjSIabm+OIxThc/AQPKvp2d23c= github.com/iotaledger/hive.go/runtime v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2 h1:kEakiZRk/LUb2CxQvSOsdTgUXK1Ee4BNec9ps40+iXQ= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230906114834-b50190b9f9c2/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c h1:dijcFDsCtbUIGxeC5XiWIl1azYHb3x/zGJZ3P+9mABY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912111751-d84fba02bb7c/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 h1:exATYMLT/d8fgMuVNO6kMDsFn9DUJEcyCuoBv9sP13g= github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0 h1:eBVGnr/WkqF3+tlCE23uDxPvmkD/r7StkIoUerwLEqw= -github.com/iotaledger/iota.go/v4 v4.0.0-20230911110046-2c50729c4ea0/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265 h1:0j8ljlBmo/f5Gxva83mLWqZLB/xSO9PgJFMPfJ7tyRY= +github.com/iotaledger/iota.go/v4 v4.0.0-20230912141328-810f7e83d265/go.mod h1:DWCa+mXRTGWBV0EHVuvToUxAEcICe2Pab9hBlxBamKo= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=