From d88458cb97f84a0719e195736c630e5aca17b479 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Fri, 1 Sep 2023 17:02:30 +0800 Subject: [PATCH 01/15] Align block event APIs to spec --- components/inx/server_blocks.go | 46 +++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/components/inx/server_blocks.go b/components/inx/server_blocks.go index 8c2c32bfb..95167ddf5 100644 --- a/components/inx/server_blocks.go +++ b/components/inx/server_blocks.go @@ -30,18 +30,7 @@ func (s *Server) ReadBlock(_ context.Context, blockID *inx.BlockId) (*inx.RawBlo } func (s *Server) ReadBlockMetadata(_ context.Context, blockID *inx.BlockId) (*inx.BlockMetadata, error) { - blockMetadata, err := deps.Protocol.MainEngineInstance().Retainer.BlockMetadata(blockID.Unwrap()) - if err != nil { - return nil, err - } - - return &inx.BlockMetadata{ - BlockId: blockID, - BlockState: inx.WrapBlockState(blockMetadata.BlockState), - BlockFailureReason: inx.WrapBlockFailureReason(blockMetadata.BlockFailureReason), - TxState: inx.WrapTransactionState(blockMetadata.TxState), - TxFailureReason: inx.WrapTransactionFailureReason(blockMetadata.TxFailureReason), - }, nil + return getINXBlockMetadata(blockID.Unwrap()) } func (s *Server) ListenToBlocks(_ *inx.NoParams, srv inx.INX_ListenToBlocksServer) error { @@ -75,8 +64,13 @@ func (s *Server) ListenToAcceptedBlocks(_ *inx.NoParams, srv inx.INX_ListenToAcc wp := workerpool.New("ListenToAcceptedBlocks", workerCount).Start() unhook := deps.Protocol.Events.Engine.BlockGadget.BlockAccepted.Hook(func(block *blocks.Block) { - payload := inx.NewBlockWithBytes(block.ID(), block.ModelBlock().Data()) - if err := srv.Send(payload); err != nil { + inxBlkMetadata, err := getINXBlockMetadata(block.ID()) + if err != nil { + Component.LogErrorf("get blockmetadata error: %v", err) + cancel() + } + + if err := srv.Send(inxBlkMetadata); err != nil { Component.LogErrorf("send error: %v", err) cancel() } @@ -100,8 +94,13 @@ func (s *Server) ListenToConfirmedBlocks(_ *inx.NoParams, srv inx.INX_ListenToCo wp := workerpool.New("ListenToConfirmedBlocks", workerCount).Start() unhook := deps.Protocol.Events.Engine.BlockGadget.BlockConfirmed.Hook(func(block *blocks.Block) { - payload := inx.NewBlockWithBytes(block.ID(), block.ModelBlock().Data()) - if err := srv.Send(payload); err != nil { + inxBlkMetadata, err := getINXBlockMetadata(block.ID()) + if err != nil { + Component.LogErrorf("get blockmetadata error: %v", err) + cancel() + } + + if err := srv.Send(inxBlkMetadata); err != nil { Component.LogErrorf("send error: %v", err) cancel() } @@ -175,3 +174,18 @@ func (s *Server) attachBlock(ctx context.Context, block *iotago.ProtocolBlock) ( return inx.NewBlockId(blockID), nil } + +func getINXBlockMetadata(blockID iotago.BlockID) (*inx.BlockMetadata, error) { + blockMetadata, err := deps.Protocol.MainEngineInstance().Retainer.BlockMetadata(blockID) + if err != nil { + return nil, ierrors.Errorf("failed to get BlockMetadata: %v", err) + } + + return &inx.BlockMetadata{ + BlockId: inx.NewBlockId(blockID), + BlockState: inx.WrapBlockState(blockMetadata.BlockState), + BlockFailureReason: inx.WrapBlockFailureReason(blockMetadata.BlockFailureReason), + TxState: inx.WrapTransactionState(blockMetadata.TxState), + TxFailureReason: inx.WrapTransactionFailureReason(blockMetadata.TxFailureReason), + }, nil +} From 6ba42a9d4d0ac537fcefe0928dab114ba2230444 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Fri, 1 Sep 2023 17:03:08 +0800 Subject: [PATCH 02/15] Add OutputMetadata event API --- components/inx/server_utxo.go | 74 +++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/components/inx/server_utxo.go b/components/inx/server_utxo.go index f38a846da..e309c83ba 100644 --- a/components/inx/server_utxo.go +++ b/components/inx/server_utxo.go @@ -7,6 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "github.com/iotaledger/hive.go/ierrors" "github.com/iotaledger/hive.go/runtime/workerpool" inx "github.com/iotaledger/inx/go" "github.com/iotaledger/iota-core/pkg/protocol/engine/utxoledger" @@ -164,6 +165,23 @@ func (s *Server) ReadUnspentOutputs(_ *inx.NoParams, srv inx.INX_ReadUnspentOutp return err } +func (s *Server) ReadOutputMetadata(_ context.Context, id *inx.OutputId) (*inx.OutputMetadata, error) { + engine := deps.Protocol.MainEngineInstance() + + outputID := id.Unwrap() + + output, spent, err := engine.Ledger.OutputOrSpent(outputID) + if err != nil { + return nil, err + } + + if spent != nil { + return newSpentMetadataResponse(spent) + } + + return newOutputMetadataResponse(output) +} + func (s *Server) ListenToLedgerUpdates(req *inx.SlotRangeRequest, srv inx.INX_ListenToLedgerUpdatesServer) error { createLedgerUpdatePayloadAndSend := func(slot iotago.SlotIndex, outputs utxoledger.Outputs, spents utxoledger.Spents) error { // Send Begin @@ -315,3 +333,59 @@ func (s *Server) ListenToLedgerUpdates(req *inx.SlotRangeRequest, srv inx.INX_Li return innerErr } + +func newOutputMetadataResponse(output *utxoledger.Output) (*inx.OutputMetadata, error) { + latestCommitment := deps.Protocol.MainEngineInstance().SyncManager.LatestCommitment() + + metadata := &inx.OutputMetadata{ + BlockId: inx.NewBlockId(output.BlockID()), + TransactionId: inx.NewTransactionId(output.OutputID().TransactionID()), + OutputIndex: uint32(output.OutputID().Index()), + IsSpent: false, + LatestCommitmentId: inx.NewCommitmentId(latestCommitment.ID()), + } + + includedSlotIndex := output.SlotBooked() + if includedSlotIndex <= latestCommitment.Index() { + includedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(includedSlotIndex) + if err != nil { + return nil, ierrors.Wrapf(err, "failed to load commitment with index: %d", includedSlotIndex) + } + metadata.CommitmentIdIncluded = inx.NewCommitmentId(includedCommitment.ID()) + } + + return metadata, nil +} + +func newSpentMetadataResponse(spent *utxoledger.Spent) (*inx.OutputMetadata, error) { + latestCommitment := deps.Protocol.MainEngineInstance().SyncManager.LatestCommitment() + + metadata := &inx.OutputMetadata{ + BlockId: inx.NewBlockId(spent.BlockID()), + TransactionId: inx.NewTransactionId(spent.OutputID().TransactionID()), + OutputIndex: uint32(spent.OutputID().Index()), + IsSpent: true, + TransactionIdSpent: inx.NewTransactionId(spent.TransactionIDSpent()), + LatestCommitmentId: inx.NewCommitmentId(latestCommitment.ID()), + } + + includedSlotIndex := spent.Output().SlotBooked() + if includedSlotIndex <= latestCommitment.Index() { + includedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(includedSlotIndex) + if err != nil { + return nil, ierrors.Wrapf(err, "failed to load commitment with index: %d", includedSlotIndex) + } + metadata.CommitmentIdIncluded = inx.NewCommitmentId(includedCommitment.ID()) + } + + spentSlotIndex := spent.SlotIndexSpent() + if spentSlotIndex <= latestCommitment.Index() { + spentCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(spentSlotIndex) + if err != nil { + return nil, ierrors.Wrapf(err, "failed to load commitment with index: %d", spentSlotIndex) + } + metadata.CommitmentIdSpent = inx.NewCommitmentId(spentCommitment.ID()) + } + + return metadata, nil +} From 4c92ed67fcff9245309835a256e80bf8a7dec3d2 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Mon, 4 Sep 2023 11:58:12 +0800 Subject: [PATCH 03/15] Add commitment listeners --- components/inx/server_commitments.go | 68 ++++++++++++++++++++++++++++ components/inx/server_node.go | 17 ++++--- 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/components/inx/server_commitments.go b/components/inx/server_commitments.go index 9dbfb08c0..cecea1250 100644 --- a/components/inx/server_commitments.go +++ b/components/inx/server_commitments.go @@ -8,8 +8,11 @@ import ( "github.com/iotaledger/hive.go/ierrors" "github.com/iotaledger/hive.go/kvstore" + "github.com/iotaledger/hive.go/runtime/event" + "github.com/iotaledger/hive.go/runtime/workerpool" inx "github.com/iotaledger/inx/go" "github.com/iotaledger/iota-core/pkg/model" + "github.com/iotaledger/iota-core/pkg/protocol/engine/notarization" iotago "github.com/iotaledger/iota.go/v4" ) @@ -21,6 +24,7 @@ func inxCommitment(commitment *model.Commitment) *inx.Commitment { }, } } + func (s *Server) ReadCommitment(_ context.Context, req *inx.CommitmentRequest) (*inx.Commitment, error) { commitmentIndex := iotago.SlotIndex(req.GetCommitmentIndex()) @@ -46,3 +50,67 @@ func (s *Server) ReadCommitment(_ context.Context, req *inx.CommitmentRequest) ( return inxCommitment(commitment), nil } + +func (s *Server) ListenToLatestCommitments(_ *inx.NoParams, srv inx.INX_ListenToLatestCommitmentsServer) error { + ctx, cancel := context.WithCancel(Component.Daemon().ContextStopped()) + + wp := workerpool.New("ListenToCommitments", workerCount).Start() + + unhook := deps.Protocol.Events.Engine.Notarization.SlotCommitted.Hook(func(commitmentDetails *notarization.SlotCommittedDetails) { + inxCommitment := &inx.CommitmentInfo{ + CommitmentId: inx.NewCommitmentId(commitmentDetails.Commitment.ID()), + CommitmentIndex: uint64(commitmentDetails.Commitment.Index()), + } + + if err := srv.Send(inxCommitment); err != nil { + Component.LogErrorf("send error: %v", err) + cancel() + } + }, event.WithWorkerPool(wp)).Unhook + + <-ctx.Done() + unhook() + + // We need to wait until all tasks are done, otherwise we might call + // "SendMsg" and "CloseSend" in parallel on the grpc stream, which is + // not safe according to the grpc docs. + wp.Shutdown() + wp.ShutdownComplete.Wait() + + return ctx.Err() +} + +func (s *Server) ListenToFinalizedCommitments(_ *inx.NoParams, srv inx.INX_ListenToFinalizedCommitmentsServer) error { + ctx, cancel := context.WithCancel(Component.Daemon().ContextStopped()) + + wp := workerpool.New("ListenToFinalizedCommitments", workerCount).Start() + + unhook := deps.Protocol.Events.Engine.SlotGadget.SlotFinalized.Hook(func(index iotago.SlotIndex) { + commitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(index) + if err != nil { + Component.LogErrorf("load commitment error: %v", err) + cancel() + } + + inxCommitment := &inx.CommitmentInfo{ + CommitmentId: inx.NewCommitmentId(commitment.ID()), + CommitmentIndex: uint64(index), + } + + if err := srv.Send(inxCommitment); err != nil { + Component.LogErrorf("send error: %v", err) + cancel() + } + }, event.WithWorkerPool(wp)).Unhook + + <-ctx.Done() + unhook() + + // We need to wait until all tasks are done, otherwise we might call + // "SendMsg" and "CloseSend" in parallel on the grpc stream, which is + // not safe according to the grpc docs. + wp.Shutdown() + wp.ShutdownComplete.Wait() + + return ctx.Err() +} diff --git a/components/inx/server_node.go b/components/inx/server_node.go index 8c689de8c..12ca7b6e6 100644 --- a/components/inx/server_node.go +++ b/components/inx/server_node.go @@ -11,13 +11,18 @@ import ( ) func inxNodeStatus(status *syncmanager.SyncStatus) *inx.NodeStatus { + finalizedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(status.LatestFinalizedSlot) + if err != nil { + return nil + } + return &inx.NodeStatus{ - IsHealthy: status.NodeSynced, - LastAcceptedBlockSlot: uint64(status.LastAcceptedBlockSlot), - LastConfirmedBlockSlot: uint64(status.LastConfirmedBlockSlot), - LatestCommitment: inxCommitment(status.LatestCommitment), - LatestFinalizedSlot: uint64(status.LatestFinalizedSlot), - PruningSlot: uint64(status.LastPrunedEpoch), // TODO: change name to PruningEpoch + IsHealthy: status.NodeSynced, + LastAcceptedBlockSlot: uint64(status.LastAcceptedBlockSlot), + LastConfirmedBlockSlot: uint64(status.LastConfirmedBlockSlot), + LatestCommitment: inxCommitment(status.LatestCommitment), + LatestFinalizedCommitment: inxCommitment(finalizedCommitment), + PruningSlot: uint64(status.LastPrunedEpoch), // TODO: change name to PruningEpoch } } From 42b9add195cdbccfe203ccec2e7dd0360fb4f9f9 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Mon, 4 Sep 2023 15:49:17 +0800 Subject: [PATCH 04/15] Minor refactor --- components/inx/server_utxo.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/inx/server_utxo.go b/components/inx/server_utxo.go index e309c83ba..45a9db64b 100644 --- a/components/inx/server_utxo.go +++ b/components/inx/server_utxo.go @@ -166,11 +166,9 @@ func (s *Server) ReadUnspentOutputs(_ *inx.NoParams, srv inx.INX_ReadUnspentOutp } func (s *Server) ReadOutputMetadata(_ context.Context, id *inx.OutputId) (*inx.OutputMetadata, error) { - engine := deps.Protocol.MainEngineInstance() - outputID := id.Unwrap() - output, spent, err := engine.Ledger.OutputOrSpent(outputID) + output, spent, err := deps.Protocol.MainEngineInstance().Ledger.OutputOrSpent(outputID) if err != nil { return nil, err } From 501e3a4088737de76b3b255a9cb1bc7ae7b83bae Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Thu, 7 Sep 2023 17:45:34 +0800 Subject: [PATCH 05/15] Add mqtt to public paths --- components/restapi/params.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/restapi/params.go b/components/restapi/params.go index 2e27db305..8abc6db4b 100644 --- a/components/restapi/params.go +++ b/components/restapi/params.go @@ -54,7 +54,8 @@ var ParamsRestAPI = &ParametersRestAPI{ "/api/core/v3/rewards*", "/api/core/v3/committee", "/api/debug/v2/*", - "/api/indexer/v2/*", + "/api/indexer/v2*", + "/api/mqtt/v2", }, ProtectedRoutes: []string{ "/api/*", From 2badce4468dda931b37fa2ac90d563f51a044fd4 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Thu, 7 Sep 2023 20:46:40 +0800 Subject: [PATCH 06/15] Replace CommitmentInfo with Commitment --- components/inx/server_commitments.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/components/inx/server_commitments.go b/components/inx/server_commitments.go index cecea1250..2e3ff0077 100644 --- a/components/inx/server_commitments.go +++ b/components/inx/server_commitments.go @@ -57,10 +57,7 @@ func (s *Server) ListenToLatestCommitments(_ *inx.NoParams, srv inx.INX_ListenTo wp := workerpool.New("ListenToCommitments", workerCount).Start() unhook := deps.Protocol.Events.Engine.Notarization.SlotCommitted.Hook(func(commitmentDetails *notarization.SlotCommittedDetails) { - inxCommitment := &inx.CommitmentInfo{ - CommitmentId: inx.NewCommitmentId(commitmentDetails.Commitment.ID()), - CommitmentIndex: uint64(commitmentDetails.Commitment.Index()), - } + inxCommitment := inx.NewCommitmentWithBytes(commitmentDetails.Commitment.ID(), commitmentDetails.Commitment.Data()) if err := srv.Send(inxCommitment); err != nil { Component.LogErrorf("send error: %v", err) @@ -92,10 +89,7 @@ func (s *Server) ListenToFinalizedCommitments(_ *inx.NoParams, srv inx.INX_Liste cancel() } - inxCommitment := &inx.CommitmentInfo{ - CommitmentId: inx.NewCommitmentId(commitment.ID()), - CommitmentIndex: uint64(index), - } + inxCommitment := inx.NewCommitmentWithBytes(commitment.ID(), commitment.Data()) if err := srv.Send(inxCommitment); err != nil { Component.LogErrorf("send error: %v", err) From 3c2a6e83b655de9ac0e567222ce9ef7fd2aead1c Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Thu, 7 Sep 2023 22:14:48 +0800 Subject: [PATCH 07/15] Update inx, inx-app version --- go.mod | 4 ++-- go.sum | 8 ++++---- tools/gendoc/go.mod | 4 ++-- tools/gendoc/go.sum | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index c74ae3b78..bc439a39d 100644 --- a/go.mod +++ b/go.mod @@ -22,8 +22,8 @@ require ( 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/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7 + github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098 github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.0 diff --git a/go.sum b/go.sum index f1613c696..5eaa2f98f 100644 --- a/go.sum +++ b/go.sum @@ -303,10 +303,10 @@ 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/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/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7 h1:DmIYSv4Ynjrif8aDs5HV0vI7A3ih2/ThUlEokK2UwyI= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7/go.mod h1:C1CCtRn+VbKwIcPYzqg4gZn64in15Ka82ZTYeCCgjqI= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098 h1:NkRZoOf440DA+w6ARA/p6VjgJ4NVUu0Fsz3v/XFdK4A= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098/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/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index fc0b285a5..994b1762b 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -70,8 +70,8 @@ require ( 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/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7 // indirect + github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098 // indirect github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 // indirect github.com/ipfs/boxo v0.10.0 // indirect github.com/ipfs/go-cid v0.4.1 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 845291da5..97a0c21ae 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -307,10 +307,10 @@ 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/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/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7 h1:DmIYSv4Ynjrif8aDs5HV0vI7A3ih2/ThUlEokK2UwyI= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7/go.mod h1:C1CCtRn+VbKwIcPYzqg4gZn64in15Ka82ZTYeCCgjqI= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098 h1:NkRZoOf440DA+w6ARA/p6VjgJ4NVUu0Fsz3v/XFdK4A= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098/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/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= From 96f2ac656e9caa2a43396bda7cea25067947dab9 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Fri, 8 Sep 2023 16:15:00 +0800 Subject: [PATCH 08/15] Reword parameter naming and comments --- components/inx/server_blocks.go | 12 ++++++------ components/inx/server_commitments.go | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/inx/server_blocks.go b/components/inx/server_blocks.go index 95167ddf5..79df07e55 100644 --- a/components/inx/server_blocks.go +++ b/components/inx/server_blocks.go @@ -64,13 +64,13 @@ func (s *Server) ListenToAcceptedBlocks(_ *inx.NoParams, srv inx.INX_ListenToAcc wp := workerpool.New("ListenToAcceptedBlocks", workerCount).Start() unhook := deps.Protocol.Events.Engine.BlockGadget.BlockAccepted.Hook(func(block *blocks.Block) { - inxBlkMetadata, err := getINXBlockMetadata(block.ID()) + payload, err := getINXBlockMetadata(block.ID()) if err != nil { - Component.LogErrorf("get blockmetadata error: %v", err) + Component.LogErrorf("get block metadata error: %v", err) cancel() } - if err := srv.Send(inxBlkMetadata); err != nil { + if err := srv.Send(payload); err != nil { Component.LogErrorf("send error: %v", err) cancel() } @@ -94,13 +94,13 @@ func (s *Server) ListenToConfirmedBlocks(_ *inx.NoParams, srv inx.INX_ListenToCo wp := workerpool.New("ListenToConfirmedBlocks", workerCount).Start() unhook := deps.Protocol.Events.Engine.BlockGadget.BlockConfirmed.Hook(func(block *blocks.Block) { - inxBlkMetadata, err := getINXBlockMetadata(block.ID()) + payload, err := getINXBlockMetadata(block.ID()) if err != nil { - Component.LogErrorf("get blockmetadata error: %v", err) + Component.LogErrorf("get block metadata error: %v", err) cancel() } - if err := srv.Send(inxBlkMetadata); err != nil { + if err := srv.Send(payload); err != nil { Component.LogErrorf("send error: %v", err) cancel() } diff --git a/components/inx/server_commitments.go b/components/inx/server_commitments.go index 2e3ff0077..a068d7d08 100644 --- a/components/inx/server_commitments.go +++ b/components/inx/server_commitments.go @@ -54,12 +54,12 @@ func (s *Server) ReadCommitment(_ context.Context, req *inx.CommitmentRequest) ( func (s *Server) ListenToLatestCommitments(_ *inx.NoParams, srv inx.INX_ListenToLatestCommitmentsServer) error { ctx, cancel := context.WithCancel(Component.Daemon().ContextStopped()) - wp := workerpool.New("ListenToCommitments", workerCount).Start() + wp := workerpool.New("ListenToLatestCommitments", workerCount).Start() unhook := deps.Protocol.Events.Engine.Notarization.SlotCommitted.Hook(func(commitmentDetails *notarization.SlotCommittedDetails) { - inxCommitment := inx.NewCommitmentWithBytes(commitmentDetails.Commitment.ID(), commitmentDetails.Commitment.Data()) + payload := inx.NewCommitmentWithBytes(commitmentDetails.Commitment.ID(), commitmentDetails.Commitment.Data()) - if err := srv.Send(inxCommitment); err != nil { + if err := srv.Send(payload); err != nil { Component.LogErrorf("send error: %v", err) cancel() } @@ -83,13 +83,13 @@ func (s *Server) ListenToFinalizedCommitments(_ *inx.NoParams, srv inx.INX_Liste wp := workerpool.New("ListenToFinalizedCommitments", workerCount).Start() unhook := deps.Protocol.Events.Engine.SlotGadget.SlotFinalized.Hook(func(index iotago.SlotIndex) { - commitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(index) + payload, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(index) if err != nil { Component.LogErrorf("load commitment error: %v", err) cancel() } - inxCommitment := inx.NewCommitmentWithBytes(commitment.ID(), commitment.Data()) + inxCommitment := inx.NewCommitmentWithBytes(payload.ID(), payload.Data()) if err := srv.Send(inxCommitment); err != nil { Component.LogErrorf("send error: %v", err) From 293a96b7a48681a43ca96841877f04d960c6fcac Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Fri, 8 Sep 2023 16:36:22 +0800 Subject: [PATCH 09/15] Fix indexer route in params --- components/restapi/params.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/restapi/params.go b/components/restapi/params.go index 8abc6db4b..ae04d1340 100644 --- a/components/restapi/params.go +++ b/components/restapi/params.go @@ -54,7 +54,7 @@ var ParamsRestAPI = &ParametersRestAPI{ "/api/core/v3/rewards*", "/api/core/v3/committee", "/api/debug/v2/*", - "/api/indexer/v2*", + "/api/indexer/v2/*", "/api/mqtt/v2", }, ProtectedRoutes: []string{ From ac7f681594e9ad8701312c839bd96843288a4968 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Fri, 8 Sep 2023 22:48:14 +0800 Subject: [PATCH 10/15] Remove commitment listeners and modify LatestFinalizedCommitmentId in nodeStatus --- components/inx/server_commitments.go | 61 ---------------------------- components/inx/server_node.go | 23 +++++++---- go.mod | 4 +- go.sum | 8 ++-- tools/gendoc/go.mod | 4 +- tools/gendoc/go.sum | 8 ++-- 6 files changed, 26 insertions(+), 82 deletions(-) diff --git a/components/inx/server_commitments.go b/components/inx/server_commitments.go index a068d7d08..6458bd232 100644 --- a/components/inx/server_commitments.go +++ b/components/inx/server_commitments.go @@ -8,11 +8,8 @@ import ( "github.com/iotaledger/hive.go/ierrors" "github.com/iotaledger/hive.go/kvstore" - "github.com/iotaledger/hive.go/runtime/event" - "github.com/iotaledger/hive.go/runtime/workerpool" inx "github.com/iotaledger/inx/go" "github.com/iotaledger/iota-core/pkg/model" - "github.com/iotaledger/iota-core/pkg/protocol/engine/notarization" iotago "github.com/iotaledger/iota.go/v4" ) @@ -50,61 +47,3 @@ func (s *Server) ReadCommitment(_ context.Context, req *inx.CommitmentRequest) ( return inxCommitment(commitment), nil } - -func (s *Server) ListenToLatestCommitments(_ *inx.NoParams, srv inx.INX_ListenToLatestCommitmentsServer) error { - ctx, cancel := context.WithCancel(Component.Daemon().ContextStopped()) - - wp := workerpool.New("ListenToLatestCommitments", workerCount).Start() - - unhook := deps.Protocol.Events.Engine.Notarization.SlotCommitted.Hook(func(commitmentDetails *notarization.SlotCommittedDetails) { - payload := inx.NewCommitmentWithBytes(commitmentDetails.Commitment.ID(), commitmentDetails.Commitment.Data()) - - if err := srv.Send(payload); err != nil { - Component.LogErrorf("send error: %v", err) - cancel() - } - }, event.WithWorkerPool(wp)).Unhook - - <-ctx.Done() - unhook() - - // We need to wait until all tasks are done, otherwise we might call - // "SendMsg" and "CloseSend" in parallel on the grpc stream, which is - // not safe according to the grpc docs. - wp.Shutdown() - wp.ShutdownComplete.Wait() - - return ctx.Err() -} - -func (s *Server) ListenToFinalizedCommitments(_ *inx.NoParams, srv inx.INX_ListenToFinalizedCommitmentsServer) error { - ctx, cancel := context.WithCancel(Component.Daemon().ContextStopped()) - - wp := workerpool.New("ListenToFinalizedCommitments", workerCount).Start() - - unhook := deps.Protocol.Events.Engine.SlotGadget.SlotFinalized.Hook(func(index iotago.SlotIndex) { - payload, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(index) - if err != nil { - Component.LogErrorf("load commitment error: %v", err) - cancel() - } - - inxCommitment := inx.NewCommitmentWithBytes(payload.ID(), payload.Data()) - - if err := srv.Send(inxCommitment); err != nil { - Component.LogErrorf("send error: %v", err) - cancel() - } - }, event.WithWorkerPool(wp)).Unhook - - <-ctx.Done() - unhook() - - // We need to wait until all tasks are done, otherwise we might call - // "SendMsg" and "CloseSend" in parallel on the grpc stream, which is - // not safe according to the grpc docs. - wp.Shutdown() - wp.ShutdownComplete.Wait() - - return ctx.Err() -} diff --git a/components/inx/server_node.go b/components/inx/server_node.go index 12ca7b6e6..7ecce5b5a 100644 --- a/components/inx/server_node.go +++ b/components/inx/server_node.go @@ -8,21 +8,26 @@ import ( "github.com/iotaledger/hive.go/runtime/workerpool" inx "github.com/iotaledger/inx/go" "github.com/iotaledger/iota-core/pkg/protocol/engine/syncmanager" + iotago "github.com/iotaledger/iota.go/v4" ) func inxNodeStatus(status *syncmanager.SyncStatus) *inx.NodeStatus { - finalizedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(status.LatestFinalizedSlot) - if err != nil { - return nil + finalizedCommitmentID := iotago.EmptyCommitmentID + if status.LatestFinalizedSlot > deps.Protocol.CurrentAPI().TimeProvider().EpochEnd(status.LastPrunedEpoch) { + finalizedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(status.LatestFinalizedSlot) + if err != nil { + return nil + } + finalizedCommitmentID = finalizedCommitment.ID() } return &inx.NodeStatus{ - IsHealthy: status.NodeSynced, - LastAcceptedBlockSlot: uint64(status.LastAcceptedBlockSlot), - LastConfirmedBlockSlot: uint64(status.LastConfirmedBlockSlot), - LatestCommitment: inxCommitment(status.LatestCommitment), - LatestFinalizedCommitment: inxCommitment(finalizedCommitment), - PruningSlot: uint64(status.LastPrunedEpoch), // TODO: change name to PruningEpoch + IsHealthy: status.NodeSynced, + LastAcceptedBlockSlot: uint64(status.LastAcceptedBlockSlot), + LastConfirmedBlockSlot: uint64(status.LastConfirmedBlockSlot), + LatestCommitment: inxCommitment(status.LatestCommitment), + LatestFinalizedCommitmentId: inx.NewCommitmentId(finalizedCommitmentID), + PruningEpoch: uint64(status.LastPrunedEpoch), } } diff --git a/go.mod b/go.mod index 421a64820..dff31b758 100644 --- a/go.mod +++ b/go.mod @@ -22,8 +22,8 @@ require ( 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.20230907095800-957c4c4cadd7 - github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098 + github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95 + github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d 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 diff --git a/go.sum b/go.sum index d6ae88d16..6874fb245 100644 --- a/go.sum +++ b/go.sum @@ -303,10 +303,10 @@ 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/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7 h1:DmIYSv4Ynjrif8aDs5HV0vI7A3ih2/ThUlEokK2UwyI= -github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7/go.mod h1:C1CCtRn+VbKwIcPYzqg4gZn64in15Ka82ZTYeCCgjqI= -github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098 h1:NkRZoOf440DA+w6ARA/p6VjgJ4NVUu0Fsz3v/XFdK4A= -github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95 h1:l+e3MJjKPp8PfCnMP1cbssUwvvwjeenr20q4TupoSYw= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95/go.mod h1:vZYattpu7STOa6cBUQviSyBkV0EsGDmNwAfhLi8DZ+s= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d h1:ymchSf0Dx5tXnvl+uorFHwfHf66MC2o82aCK0KEFDoQ= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d/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= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index b5c9fda2f..8041a8b60 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -70,8 +70,8 @@ require ( 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.20230907095800-957c4c4cadd7 // indirect - github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098 // indirect + github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95 // indirect + github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d // 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 diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index e56ea3cf2..1af564e5e 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -307,10 +307,10 @@ 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/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7 h1:DmIYSv4Ynjrif8aDs5HV0vI7A3ih2/ThUlEokK2UwyI= -github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230907095800-957c4c4cadd7/go.mod h1:C1CCtRn+VbKwIcPYzqg4gZn64in15Ka82ZTYeCCgjqI= -github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098 h1:NkRZoOf440DA+w6ARA/p6VjgJ4NVUu0Fsz3v/XFdK4A= -github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230907124346-d263f99c9098/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95 h1:l+e3MJjKPp8PfCnMP1cbssUwvvwjeenr20q4TupoSYw= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95/go.mod h1:vZYattpu7STOa6cBUQviSyBkV0EsGDmNwAfhLi8DZ+s= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d h1:ymchSf0Dx5tXnvl+uorFHwfHf66MC2o82aCK0KEFDoQ= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d/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= From 4e5a54e2b1204043d29d3f9840d4c93fc7056f30 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Mon, 11 Sep 2023 11:30:26 +0800 Subject: [PATCH 11/15] Send finalized commitment if the lastPrunedEpoch has not pruned yet --- components/inx/server_node.go | 4 +++- pkg/protocol/engine/syncmanager/syncmanager.go | 3 ++- .../syncmanager/trivialsyncmanager/syncmanager.go | 13 +++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/components/inx/server_node.go b/components/inx/server_node.go index 7ecce5b5a..687492207 100644 --- a/components/inx/server_node.go +++ b/components/inx/server_node.go @@ -13,7 +13,9 @@ import ( func inxNodeStatus(status *syncmanager.SyncStatus) *inx.NodeStatus { finalizedCommitmentID := iotago.EmptyCommitmentID - if status.LatestFinalizedSlot > deps.Protocol.CurrentAPI().TimeProvider().EpochEnd(status.LastPrunedEpoch) { + // HasPruned is false when a node just started from a snapshot and keeps data of the LastPrunedEpoch, thus still need + // to send finalized commitment. + if !status.HasPruned || status.LatestFinalizedSlot > deps.Protocol.CurrentAPI().TimeProvider().EpochEnd(status.LastPrunedEpoch) { finalizedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(status.LatestFinalizedSlot) if err != nil { return nil diff --git a/pkg/protocol/engine/syncmanager/syncmanager.go b/pkg/protocol/engine/syncmanager/syncmanager.go index 1d51616be..d251dec88 100644 --- a/pkg/protocol/engine/syncmanager/syncmanager.go +++ b/pkg/protocol/engine/syncmanager/syncmanager.go @@ -29,7 +29,7 @@ type SyncManager interface { LatestFinalizedSlot() iotago.SlotIndex // LastPrunedEpoch returns the last pruned epoch index. - LastPrunedEpoch() iotago.EpochIndex + LastPrunedEpoch() (iotago.EpochIndex, bool) // Shutdown shuts down the SyncManager. Shutdown() @@ -44,4 +44,5 @@ type SyncStatus struct { LatestCommitment *model.Commitment LatestFinalizedSlot iotago.SlotIndex LastPrunedEpoch iotago.EpochIndex + HasPruned bool } diff --git a/pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go b/pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go index df7e7cacc..d3828ae23 100644 --- a/pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go +++ b/pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go @@ -36,6 +36,7 @@ type SyncManager struct { latestFinalizedSlotLock syncutils.RWMutex lastPrunedEpoch iotago.EpochIndex + hasPruned bool lastPrunedEpochLock syncutils.RWMutex isSynced bool @@ -88,7 +89,7 @@ func NewProvider(opts ...options.Option[SyncManager]) module.Provider[*engine.En }, asyncOpt) e.Events.StoragePruned.Hook(func(index iotago.EpochIndex) { - if s.updatePrunedEpoch(index) { + if s.updatePrunedEpoch(index, true) { s.triggerUpdate() } }, asyncOpt) @@ -112,6 +113,8 @@ func New(e *engine.Engine, latestCommitment *model.Commitment, finalizedSlot iot optsBootstrappedThreshold: 10 * time.Second, }, opts, func(s *SyncManager) { + s.updatePrunedEpoch(s.engine.Storage.LastPrunedEpoch()) + // set the default bootstrapped function if s.optsIsBootstrappedFunc == nil { s.optsIsBootstrappedFunc = func(e *engine.Engine) bool { @@ -140,6 +143,7 @@ func (s *SyncManager) SyncStatus() *syncmanager.SyncStatus { LatestCommitment: s.latestCommitment, LatestFinalizedSlot: s.latestFinalizedSlot, LastPrunedEpoch: s.lastPrunedEpoch, + HasPruned: s.hasPruned, } } @@ -216,12 +220,13 @@ func (s *SyncManager) updateFinalizedSlot(index iotago.SlotIndex) (changed bool) return false } -func (s *SyncManager) updatePrunedEpoch(index iotago.EpochIndex) (changed bool) { +func (s *SyncManager) updatePrunedEpoch(index iotago.EpochIndex, hasPruned bool) (changed bool) { s.lastPrunedEpochLock.Lock() defer s.lastPrunedEpochLock.Unlock() if s.lastPrunedEpoch != index { s.lastPrunedEpoch = index + s.hasPruned = hasPruned return true } @@ -270,11 +275,11 @@ func (s *SyncManager) LatestFinalizedSlot() iotago.SlotIndex { return s.latestFinalizedSlot } -func (s *SyncManager) LastPrunedEpoch() iotago.EpochIndex { +func (s *SyncManager) LastPrunedEpoch() (iotago.EpochIndex, bool) { s.lastPrunedEpochLock.RLock() defer s.lastPrunedEpochLock.RUnlock() - return s.lastPrunedEpoch + return s.lastPrunedEpoch, s.hasPruned } func (s *SyncManager) triggerUpdate() { From b3ccfaae3bc893aba6c5943e7108d5e8d93d59ad Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Mon, 11 Sep 2023 11:33:23 +0800 Subject: [PATCH 12/15] Please doggo --- .../engine/syncmanager/trivialsyncmanager/syncmanager.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go b/pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go index d3828ae23..ddfb6091e 100644 --- a/pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go +++ b/pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go @@ -227,6 +227,7 @@ func (s *SyncManager) updatePrunedEpoch(index iotago.EpochIndex, hasPruned bool) if s.lastPrunedEpoch != index { s.lastPrunedEpoch = index s.hasPruned = hasPruned + return true } From a2550f73154ba5a1eeb1941318cf82082bc6c106 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Tue, 19 Sep 2023 15:19:50 +0800 Subject: [PATCH 13/15] Include OutputMetadata in output response --- components/inx/server_utxo.go | 98 +++++++++-------------------------- 1 file changed, 25 insertions(+), 73 deletions(-) diff --git a/components/inx/server_utxo.go b/components/inx/server_utxo.go index 45a9db64b..a043b31b1 100644 --- a/components/inx/server_utxo.go +++ b/components/inx/server_utxo.go @@ -15,7 +15,9 @@ import ( ) func NewLedgerOutput(o *utxoledger.Output) (*inx.LedgerOutput, error) { - return &inx.LedgerOutput{ + latestCommitment := deps.Protocol.MainEngineInstance().SyncManager.LatestCommitment() + + l := &inx.LedgerOutput{ OutputId: inx.NewOutputId(o.OutputID()), BlockId: inx.NewBlockId(o.BlockID()), SlotBooked: uint64(o.SlotBooked()), @@ -23,7 +25,18 @@ func NewLedgerOutput(o *utxoledger.Output) (*inx.LedgerOutput, error) { Output: &inx.RawOutput{ Data: o.Bytes(), }, - }, nil + } + + includedSlotIndex := o.SlotBooked() + if includedSlotIndex <= latestCommitment.Index() { + includedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(includedSlotIndex) + if err != nil { + return nil, ierrors.Wrapf(err, "failed to load commitment with index: %d", includedSlotIndex) + } + l.CommitmentIdIncluded = inx.NewCommitmentId(includedCommitment.ID()) + } + + return l, nil } func NewLedgerSpent(s *utxoledger.Spent) (*inx.LedgerSpent, error) { @@ -38,6 +51,16 @@ func NewLedgerSpent(s *utxoledger.Spent) (*inx.LedgerSpent, error) { SlotSpent: uint64(s.SlotIndexSpent()), } + latestCommitment := deps.Protocol.MainEngineInstance().SyncManager.LatestCommitment() + spentSlotIndex := s.SlotIndexSpent() + if spentSlotIndex <= latestCommitment.Index() { + spentCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(spentSlotIndex) + if err != nil { + return nil, ierrors.Wrapf(err, "failed to load commitment with index: %d", spentSlotIndex) + } + l.CommitmentIdSpent = inx.NewCommitmentId(spentCommitment.ID()) + } + return l, nil } @@ -165,21 +188,6 @@ func (s *Server) ReadUnspentOutputs(_ *inx.NoParams, srv inx.INX_ReadUnspentOutp return err } -func (s *Server) ReadOutputMetadata(_ context.Context, id *inx.OutputId) (*inx.OutputMetadata, error) { - outputID := id.Unwrap() - - output, spent, err := deps.Protocol.MainEngineInstance().Ledger.OutputOrSpent(outputID) - if err != nil { - return nil, err - } - - if spent != nil { - return newSpentMetadataResponse(spent) - } - - return newOutputMetadataResponse(output) -} - func (s *Server) ListenToLedgerUpdates(req *inx.SlotRangeRequest, srv inx.INX_ListenToLedgerUpdatesServer) error { createLedgerUpdatePayloadAndSend := func(slot iotago.SlotIndex, outputs utxoledger.Outputs, spents utxoledger.Spents) error { // Send Begin @@ -331,59 +339,3 @@ func (s *Server) ListenToLedgerUpdates(req *inx.SlotRangeRequest, srv inx.INX_Li return innerErr } - -func newOutputMetadataResponse(output *utxoledger.Output) (*inx.OutputMetadata, error) { - latestCommitment := deps.Protocol.MainEngineInstance().SyncManager.LatestCommitment() - - metadata := &inx.OutputMetadata{ - BlockId: inx.NewBlockId(output.BlockID()), - TransactionId: inx.NewTransactionId(output.OutputID().TransactionID()), - OutputIndex: uint32(output.OutputID().Index()), - IsSpent: false, - LatestCommitmentId: inx.NewCommitmentId(latestCommitment.ID()), - } - - includedSlotIndex := output.SlotBooked() - if includedSlotIndex <= latestCommitment.Index() { - includedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(includedSlotIndex) - if err != nil { - return nil, ierrors.Wrapf(err, "failed to load commitment with index: %d", includedSlotIndex) - } - metadata.CommitmentIdIncluded = inx.NewCommitmentId(includedCommitment.ID()) - } - - return metadata, nil -} - -func newSpentMetadataResponse(spent *utxoledger.Spent) (*inx.OutputMetadata, error) { - latestCommitment := deps.Protocol.MainEngineInstance().SyncManager.LatestCommitment() - - metadata := &inx.OutputMetadata{ - BlockId: inx.NewBlockId(spent.BlockID()), - TransactionId: inx.NewTransactionId(spent.OutputID().TransactionID()), - OutputIndex: uint32(spent.OutputID().Index()), - IsSpent: true, - TransactionIdSpent: inx.NewTransactionId(spent.TransactionIDSpent()), - LatestCommitmentId: inx.NewCommitmentId(latestCommitment.ID()), - } - - includedSlotIndex := spent.Output().SlotBooked() - if includedSlotIndex <= latestCommitment.Index() { - includedCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(includedSlotIndex) - if err != nil { - return nil, ierrors.Wrapf(err, "failed to load commitment with index: %d", includedSlotIndex) - } - metadata.CommitmentIdIncluded = inx.NewCommitmentId(includedCommitment.ID()) - } - - spentSlotIndex := spent.SlotIndexSpent() - if spentSlotIndex <= latestCommitment.Index() { - spentCommitment, err := deps.Protocol.MainEngineInstance().Storage.Commitments().Load(spentSlotIndex) - if err != nil { - return nil, ierrors.Wrapf(err, "failed to load commitment with index: %d", spentSlotIndex) - } - metadata.CommitmentIdSpent = inx.NewCommitmentId(spentCommitment.ID()) - } - - return metadata, nil -} From b15506dcf01224aa19794aaf00fe41089fd985da Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Tue, 19 Sep 2023 15:33:44 +0800 Subject: [PATCH 14/15] Update go.mod --- go.mod | 30 +++++++++++++++--------------- go.sum | 19 +++++++++++++++++-- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index e05346422..08f9831d7 100644 --- a/go.mod +++ b/go.mod @@ -10,20 +10,20 @@ require ( 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-20230906114834-b50190b9f9c2 - github.com/iotaledger/hive.go/app 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/app v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/constraints v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140 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.20230912111751-d84fba02bb7c - github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 - github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95 - github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d + github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/logger v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230919065227-618931c246c5 + github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230918132810-48814818bff9 github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d github.com/labstack/echo/v4 v4.11.1 github.com/labstack/gommon v0.4.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.13.0 // indirect + github.com/ethereum/go-ethereum v1.13.1 // 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 @@ -165,7 +165,7 @@ require ( 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 + go.uber.org/zap v1.26.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 diff --git a/go.sum b/go.sum index bc7dbc59c..b19e22797 100644 --- a/go.sum +++ b/go.sum @@ -98,6 +98,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= 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/ethereum/go-ethereum v1.13.1/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= 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= @@ -281,32 +282,45 @@ 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/app v0.0.0-20230912172434-dc477e1f5140/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/constraints v0.0.0-20230912172434-dc477e1f5140/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/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140/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/crypto v0.0.0-20230912172434-dc477e1f5140/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/ds v0.0.0-20230912172434-dc477e1f5140/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/ierrors v0.0.0-20230912172434-dc477e1f5140/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/lo v0.0.0-20230912172434-dc477e1f5140/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/logger v0.0.0-20230912172434-dc477e1f5140/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/runtime v0.0.0-20230912172434-dc477e1f5140/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= 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/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140/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/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95 h1:l+e3MJjKPp8PfCnMP1cbssUwvvwjeenr20q4TupoSYw= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95/go.mod h1:vZYattpu7STOa6cBUQviSyBkV0EsGDmNwAfhLi8DZ+s= -github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d h1:ymchSf0Dx5tXnvl+uorFHwfHf66MC2o82aCK0KEFDoQ= -github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230919065227-618931c246c5 h1:7GuYO/SI/mZnXwv7QBYwn2NWjr4OF/Re+aSzmwx+CT0= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230919065227-618931c246c5/go.mod h1:luLlwdZT26MqUWBbiEOYxBwYLVrfz+65D+Tme84+Slw= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230918132810-48814818bff9 h1:BJb6+fF7zTyrbKQY3JG1Hiw6klONR4anwCFOcNdWu9o= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230918132810-48814818bff9/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d h1:p9IchKq6kft758XDlnN/tAEXJMXGlmQPmbdxolba1gs= github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d/go.mod h1:DWCa+mXRTGWBV0EHVuvToUxAEcICe2Pab9hBlxBamKo= github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= @@ -697,6 +711,7 @@ 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= go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= From 1a24d00470c13caca18cfd479bef7d31b573ac5e Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Tue, 19 Sep 2023 15:38:56 +0800 Subject: [PATCH 15/15] Fix go.mod update --- go.sum | 41 ++++++++---------------- tools/evil-spammer/go.mod | 26 +++++++-------- tools/evil-spammer/go.sum | 54 +++++++++++++++---------------- tools/gendoc/go.mod | 30 +++++++++--------- tools/gendoc/go.sum | 60 +++++++++++++++++------------------ tools/genesis-snapshot/go.mod | 20 ++++++------ tools/genesis-snapshot/go.sum | 40 +++++++++++------------ 7 files changed, 127 insertions(+), 144 deletions(-) diff --git a/go.sum b/go.sum index b19e22797..3fcea08f3 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,7 @@ 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.13.0 h1:dZALM0PlDTtNITTECPiqSrFo0iEYVDfby+mSVc0LxIs= -github.com/ethereum/go-ethereum v1.13.0/go.mod h1:0TDsBNJ7j8jR01vKpk4j2zfVKyAbQuKzy6wLwb5ZMuU= +github.com/ethereum/go-ethereum v1.13.1 h1:UF2FaUKPIy5jeZk3X06ait3y2Q4wI+vJ1l7+UARp+60= github.com/ethereum/go-ethereum v1.13.1/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= 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= @@ -280,43 +279,30 @@ github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PT github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= 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/app v0.0.0-20230912172434-dc477e1f5140 h1:B1XC0lIs+Yz79HgytXN/y9qVDsbhp6N424GRE9W0YqE= github.com/iotaledger/hive.go/app v0.0.0-20230912172434-dc477e1f5140/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/constraints v0.0.0-20230912172434-dc477e1f5140 h1:/GDTCmFXcjDabg8HwfYL78BsN0cfGyd2onhRPWqDY20= github.com/iotaledger/hive.go/constraints v0.0.0-20230912172434-dc477e1f5140/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/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140 h1:5vyVnYnC6j1kvRrWrcgq2oLaBYomFvFHUq7R/7mC4Ns= github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140/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/crypto v0.0.0-20230912172434-dc477e1f5140 h1:Rnor/2Bcy8luSAFO+HBRxoLzPtxJzpLZjRle4OSyjBA= github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140/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/ds v0.0.0-20230912172434-dc477e1f5140 h1:HIYMX4qEA8IqM02eOI2ZYVyn01zhCCvJ6YpMzf+P/RM= github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140/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/ierrors v0.0.0-20230912172434-dc477e1f5140 h1:N4Qpd7vCNhuFQ+Wg8k9gInVpHjqLlNrEfEVgYuC/aDs= github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140/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/lo v0.0.0-20230912172434-dc477e1f5140 h1:OhsjldIlatxskIfpEXDyodi1RpV9w9aXUEit9uVLBs8= github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140/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/logger v0.0.0-20230912172434-dc477e1f5140 h1:qiCT8nQ1R67YUsp5Xmp0aK1/ggXehdu5VQ//9OYmCNQ= github.com/iotaledger/hive.go/logger v0.0.0-20230912172434-dc477e1f5140/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/runtime v0.0.0-20230912172434-dc477e1f5140 h1:XxDIaa6kzWxoQ1Hd22AQJpqhV6ySXO5ysGeI7QjVDCg= github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= -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/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140 h1:VFBVUIvYn78TjG8Rjxvovud9KZjfVaS4qmfqAaTzJdI= github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140/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/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140 h1:ZGeNsbWhWzJMmomjX8UqZJ4493nZ7B4kN/wWUdnyltM= github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95 h1:l+e3MJjKPp8PfCnMP1cbssUwvvwjeenr20q4TupoSYw= -github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95/go.mod h1:vZYattpu7STOa6cBUQviSyBkV0EsGDmNwAfhLi8DZ+s= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230919065227-618931c246c5 h1:7GuYO/SI/mZnXwv7QBYwn2NWjr4OF/Re+aSzmwx+CT0= github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230919065227-618931c246c5/go.mod h1:luLlwdZT26MqUWBbiEOYxBwYLVrfz+65D+Tme84+Slw= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230918132810-48814818bff9 h1:BJb6+fF7zTyrbKQY3JG1Hiw6klONR4anwCFOcNdWu9o= @@ -709,8 +695,7 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E 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= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 43f8810ea..c461a6748 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-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/hive.go/app v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/logger v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140 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-20230913143616-917572c7752d @@ -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.13.0 // indirect + github.com/ethereum/go-ethereum v1.13.1 // 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 @@ -38,11 +38,11 @@ require ( 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/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/constraints v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140 // 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.20230912111751-d84fba02bb7c // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140 // 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 @@ -77,7 +77,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/multierr v1.11.0 // indirect - go.uber.org/zap v1.25.0 // indirect + go.uber.org/zap v1.26.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 diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index 08959c5c6..cdedea17a 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -27,8 +27,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72H github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= -github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -62,8 +60,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.13.0 h1:dZALM0PlDTtNITTECPiqSrFo0iEYVDfby+mSVc0LxIs= -github.com/ethereum/go-ethereum v1.13.0/go.mod h1:0TDsBNJ7j8jR01vKpk4j2zfVKyAbQuKzy6wLwb5ZMuU= +github.com/ethereum/go-ethereum v1.13.1 h1:UF2FaUKPIy5jeZk3X06ait3y2Q4wI+vJ1l7+UARp+60= +github.com/ethereum/go-ethereum v1.13.1/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= 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= @@ -173,30 +171,30 @@ github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PT github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= 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/app v0.0.0-20230912172434-dc477e1f5140 h1:B1XC0lIs+Yz79HgytXN/y9qVDsbhp6N424GRE9W0YqE= +github.com/iotaledger/hive.go/app v0.0.0-20230912172434-dc477e1f5140/go.mod h1:eiZgbcwTDZ7d9hEait2EAwAhixWhceW4MXmuVk2EcEw= +github.com/iotaledger/hive.go/constraints v0.0.0-20230912172434-dc477e1f5140 h1:/GDTCmFXcjDabg8HwfYL78BsN0cfGyd2onhRPWqDY20= +github.com/iotaledger/hive.go/constraints v0.0.0-20230912172434-dc477e1f5140/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140 h1:5vyVnYnC6j1kvRrWrcgq2oLaBYomFvFHUq7R/7mC4Ns= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140 h1:Rnor/2Bcy8luSAFO+HBRxoLzPtxJzpLZjRle4OSyjBA= +github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140 h1:HIYMX4qEA8IqM02eOI2ZYVyn01zhCCvJ6YpMzf+P/RM= +github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140/go.mod h1:ZrqsjIJS2QCgGp7Ki+l4hWJQgzfBObUCemb5Upwlx18= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140 h1:N4Qpd7vCNhuFQ+Wg8k9gInVpHjqLlNrEfEVgYuC/aDs= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140/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.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/hive.go/lo v0.0.0-20230912172434-dc477e1f5140 h1:OhsjldIlatxskIfpEXDyodi1RpV9w9aXUEit9uVLBs8= +github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/logger v0.0.0-20230912172434-dc477e1f5140 h1:qiCT8nQ1R67YUsp5Xmp0aK1/ggXehdu5VQ//9OYmCNQ= +github.com/iotaledger/hive.go/logger v0.0.0-20230912172434-dc477e1f5140/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= +github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140 h1:XxDIaa6kzWxoQ1Hd22AQJpqhV6ySXO5ysGeI7QjVDCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140 h1:VFBVUIvYn78TjG8Rjxvovud9KZjfVaS4qmfqAaTzJdI= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140 h1:ZGeNsbWhWzJMmomjX8UqZJ4493nZ7B4kN/wWUdnyltM= +github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d h1:p9IchKq6kft758XDlnN/tAEXJMXGlmQPmbdxolba1gs= github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d/go.mod h1:DWCa+mXRTGWBV0EHVuvToUxAEcICe2Pab9hBlxBamKo= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= @@ -387,8 +385,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i 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/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/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-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod index 159aed692..d2d51041c 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-20230906114834-b50190b9f9c2 + github.com/iotaledger/hive.go/app v0.0.0-20230912172434-dc477e1f5140 github.com/iotaledger/hive.go/apputils v0.0.0-20230829152614-7afc7a4d89b3 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 ) @@ -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.13.0 // indirect + github.com/ethereum/go-ethereum v1.13.1 // 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 @@ -59,19 +59,19 @@ require ( 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/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/constraints v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140 // 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.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.20230908143946-e15613b4af95 // indirect - github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d // indirect + github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/logger v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230919065227-618931c246c5 // indirect + github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230918132810-48814818bff9 // indirect github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d // indirect github.com/ipfs/boxo v0.10.0 // indirect github.com/ipfs/go-cid v0.4.1 // indirect @@ -163,7 +163,7 @@ require ( go.uber.org/dig v1.17.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 + go.uber.org/zap v1.26.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 diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 5cbf91f83..73ea5c0f5 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.13.0 h1:dZALM0PlDTtNITTECPiqSrFo0iEYVDfby+mSVc0LxIs= -github.com/ethereum/go-ethereum v1.13.0/go.mod h1:0TDsBNJ7j8jR01vKpk4j2zfVKyAbQuKzy6wLwb5ZMuU= +github.com/ethereum/go-ethereum v1.13.1 h1:UF2FaUKPIy5jeZk3X06ait3y2Q4wI+vJ1l7+UARp+60= +github.com/ethereum/go-ethereum v1.13.1/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= 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= @@ -281,36 +281,36 @@ github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PT github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= 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/app v0.0.0-20230912172434-dc477e1f5140 h1:B1XC0lIs+Yz79HgytXN/y9qVDsbhp6N424GRE9W0YqE= +github.com/iotaledger/hive.go/app v0.0.0-20230912172434-dc477e1f5140/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/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/constraints v0.0.0-20230912172434-dc477e1f5140 h1:/GDTCmFXcjDabg8HwfYL78BsN0cfGyd2onhRPWqDY20= +github.com/iotaledger/hive.go/constraints v0.0.0-20230912172434-dc477e1f5140/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140 h1:5vyVnYnC6j1kvRrWrcgq2oLaBYomFvFHUq7R/7mC4Ns= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140 h1:Rnor/2Bcy8luSAFO+HBRxoLzPtxJzpLZjRle4OSyjBA= +github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140 h1:HIYMX4qEA8IqM02eOI2ZYVyn01zhCCvJ6YpMzf+P/RM= +github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140/go.mod h1:ZrqsjIJS2QCgGp7Ki+l4hWJQgzfBObUCemb5Upwlx18= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140 h1:N4Qpd7vCNhuFQ+Wg8k9gInVpHjqLlNrEfEVgYuC/aDs= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140/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.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.20230908143946-e15613b4af95 h1:l+e3MJjKPp8PfCnMP1cbssUwvvwjeenr20q4TupoSYw= -github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230908143946-e15613b4af95/go.mod h1:vZYattpu7STOa6cBUQviSyBkV0EsGDmNwAfhLi8DZ+s= -github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d h1:ymchSf0Dx5tXnvl+uorFHwfHf66MC2o82aCK0KEFDoQ= -github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230908142450-d259cfb4153d/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= +github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140 h1:OhsjldIlatxskIfpEXDyodi1RpV9w9aXUEit9uVLBs8= +github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/logger v0.0.0-20230912172434-dc477e1f5140 h1:qiCT8nQ1R67YUsp5Xmp0aK1/ggXehdu5VQ//9OYmCNQ= +github.com/iotaledger/hive.go/logger v0.0.0-20230912172434-dc477e1f5140/go.mod h1:sxqWRdZ1OOxwkxVczuGcW034Mpt2vFh5ebJHO++ZYeI= +github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140 h1:XxDIaa6kzWxoQ1Hd22AQJpqhV6ySXO5ysGeI7QjVDCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140 h1:VFBVUIvYn78TjG8Rjxvovud9KZjfVaS4qmfqAaTzJdI= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140 h1:ZGeNsbWhWzJMmomjX8UqZJ4493nZ7B4kN/wWUdnyltM= +github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230919065227-618931c246c5 h1:7GuYO/SI/mZnXwv7QBYwn2NWjr4OF/Re+aSzmwx+CT0= +github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230919065227-618931c246c5/go.mod h1:luLlwdZT26MqUWBbiEOYxBwYLVrfz+65D+Tme84+Slw= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230918132810-48814818bff9 h1:BJb6+fF7zTyrbKQY3JG1Hiw6klONR4anwCFOcNdWu9o= +github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230918132810-48814818bff9/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs= github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d h1:p9IchKq6kft758XDlnN/tAEXJMXGlmQPmbdxolba1gs= github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d/go.mod h1:DWCa+mXRTGWBV0EHVuvToUxAEcICe2Pab9hBlxBamKo= github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= @@ -697,8 +697,8 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E 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= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index 8927fb9b5..6d7bc29f5 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -5,10 +5,10 @@ go 1.21 replace github.com/iotaledger/iota-core => ../../ require ( - github.com/iotaledger/hive.go/crypto v0.0.0-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/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140 + github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d github.com/mr-tron/base58 v1.2.0 @@ -21,19 +21,19 @@ 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.13.0 // indirect + github.com/ethereum/go-ethereum v1.13.1 // 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 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/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/constraints v0.0.0-20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140 // 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.20230912111751-d84fba02bb7c // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/kr/text v0.2.0 // indirect diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index eab46e060..c39e2fe1c 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.13.0 h1:dZALM0PlDTtNITTECPiqSrFo0iEYVDfby+mSVc0LxIs= -github.com/ethereum/go-ethereum v1.13.0/go.mod h1:0TDsBNJ7j8jR01vKpk4j2zfVKyAbQuKzy6wLwb5ZMuU= +github.com/ethereum/go-ethereum v1.13.1 h1:UF2FaUKPIy5jeZk3X06ait3y2Q4wI+vJ1l7+UARp+60= +github.com/ethereum/go-ethereum v1.13.1/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= 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= @@ -30,26 +30,26 @@ github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PT github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= 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/constraints v0.0.0-20230912172434-dc477e1f5140 h1:/GDTCmFXcjDabg8HwfYL78BsN0cfGyd2onhRPWqDY20= +github.com/iotaledger/hive.go/constraints v0.0.0-20230912172434-dc477e1f5140/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140 h1:5vyVnYnC6j1kvRrWrcgq2oLaBYomFvFHUq7R/7mC4Ns= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20230912172434-dc477e1f5140/go.mod h1:jn3TNmiNRIiQm/rS4VD+7wFHI2+UXABHvCA3PbQxBqI= +github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140 h1:Rnor/2Bcy8luSAFO+HBRxoLzPtxJzpLZjRle4OSyjBA= +github.com/iotaledger/hive.go/crypto v0.0.0-20230912172434-dc477e1f5140/go.mod h1:jP68na941d9uq7RtnA8aQ/FtIGRGz/51cU4uXrInQFU= +github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140 h1:HIYMX4qEA8IqM02eOI2ZYVyn01zhCCvJ6YpMzf+P/RM= +github.com/iotaledger/hive.go/ds v0.0.0-20230912172434-dc477e1f5140/go.mod h1:ZrqsjIJS2QCgGp7Ki+l4hWJQgzfBObUCemb5Upwlx18= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140 h1:N4Qpd7vCNhuFQ+Wg8k9gInVpHjqLlNrEfEVgYuC/aDs= +github.com/iotaledger/hive.go/ierrors v0.0.0-20230912172434-dc477e1f5140/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.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/hive.go/lo v0.0.0-20230912172434-dc477e1f5140 h1:OhsjldIlatxskIfpEXDyodi1RpV9w9aXUEit9uVLBs8= +github.com/iotaledger/hive.go/lo v0.0.0-20230912172434-dc477e1f5140/go.mod h1:/LERu5vqcessCqr40Wxmbx4x0bbymsK7GuL+TK/ckKo= +github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140 h1:XxDIaa6kzWxoQ1Hd22AQJpqhV6ySXO5ysGeI7QjVDCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20230912172434-dc477e1f5140/go.mod h1:fXVyQ1MAwxe/EmjAnG8WcQqbzGk9EW/FsJ/n16H/f/w= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140 h1:VFBVUIvYn78TjG8Rjxvovud9KZjfVaS4qmfqAaTzJdI= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230912172434-dc477e1f5140/go.mod h1:IJgaaxbgKCsNat18jlJJEAxCY2oVYR3F30B+M4vJ89I= +github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140 h1:ZGeNsbWhWzJMmomjX8UqZJ4493nZ7B4kN/wWUdnyltM= +github.com/iotaledger/hive.go/stringify v0.0.0-20230912172434-dc477e1f5140/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d h1:p9IchKq6kft758XDlnN/tAEXJMXGlmQPmbdxolba1gs= github.com/iotaledger/iota.go/v4 v4.0.0-20230913143616-917572c7752d/go.mod h1:DWCa+mXRTGWBV0EHVuvToUxAEcICe2Pab9hBlxBamKo= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=