From 35d4f42237e0f5a77574ef131dfd0f8fccbfe1f3 Mon Sep 17 00:00:00 2001 From: Andrii Date: Thu, 1 Aug 2024 16:18:54 +0300 Subject: [PATCH 01/16] Extended ProtocolStateBlocks to return indexed height, updated height which was used for checkinf payer balance --- access/errors.go | 7 ++++ access/mock/blocks.go | 28 ++++++++++++++ access/validator.go | 37 ++++++++++++++++--- .../node_builder/access_node_builder.go | 13 ++++--- engine/access/rpc/backend/backend.go | 20 ++++++++-- engine/access/rpc/engine.go | 3 +- engine/collection/ingest/engine.go | 2 +- 7 files changed, 93 insertions(+), 17 deletions(-) diff --git a/access/errors.go b/access/errors.go index a663179f018..5e175a512b0 100644 --- a/access/errors.go +++ b/access/errors.go @@ -12,6 +12,13 @@ import ( // ErrUnknownReferenceBlock indicates that a transaction references an unknown block. var ErrUnknownReferenceBlock = errors.New("unknown reference block") +// IndexReporterNotInitialized is returned when indexReporter is nil because +// execution data syncing and indexing is disabled +var IndexReporterNotInitialized = errors.New("index reported not initialized") + +// SealedIndexedHeightThresholdLimit is returned when gap between sealed and indexed height is larger than allowed +var SealedIndexedHeightThresholdLimit = errors.New("gap between sealed and indexed height is larger than allowed") + // IncompleteTransactionError indicates that a transaction is missing one or more required fields. type IncompleteTransactionError struct { MissingFields []string diff --git a/access/mock/blocks.go b/access/mock/blocks.go index 153c2160321..088a50aa155 100644 --- a/access/mock/blocks.go +++ b/access/mock/blocks.go @@ -72,6 +72,34 @@ func (_m *Blocks) HeaderByID(id flow.Identifier) (*flow.Header, error) { return r0, r1 } +// IndexedHeight provides a mock function with given fields: +func (_m *Blocks) IndexedHeight() (uint64, error) { + ret := _m.Called() + + if len(ret) == 0 { + panic("no return value specified for IndexedHeight") + } + + var r0 uint64 + var r1 error + if rf, ok := ret.Get(0).(func() (uint64, error)); ok { + return rf() + } + if rf, ok := ret.Get(0).(func() uint64); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(uint64) + } + + if rf, ok := ret.Get(1).(func() error); ok { + r1 = rf() + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // SealedHeader provides a mock function with given fields: func (_m *Blocks) SealedHeader() (*flow.Header, error) { ret := _m.Called() diff --git a/access/validator.go b/access/validator.go index 6463632fadd..c3a5d8a9443 100644 --- a/access/validator.go +++ b/access/validator.go @@ -17,22 +17,31 @@ import ( "github.com/onflow/flow-go/fvm/systemcontracts" "github.com/onflow/flow-go/model/flow" "github.com/onflow/flow-go/module/execution" + "github.com/onflow/flow-go/module/state_synchronization" "github.com/onflow/flow-go/state" "github.com/onflow/flow-go/state/protocol" ) +// DefaultSealedIndexedHeightThresholdNumber is the default number of blocks between sealed and indexed height +const DefaultSealedIndexedHeightThresholdNumber = 30 + type Blocks interface { HeaderByID(id flow.Identifier) (*flow.Header, error) FinalizedHeader() (*flow.Header, error) SealedHeader() (*flow.Header, error) + IndexedHeight() (uint64, error) } type ProtocolStateBlocks struct { - state protocol.State + state protocol.State + indexReporter state_synchronization.IndexReporter } -func NewProtocolStateBlocks(state protocol.State) *ProtocolStateBlocks { - return &ProtocolStateBlocks{state: state} +func NewProtocolStateBlocks(state protocol.State, indexReporter state_synchronization.IndexReporter) *ProtocolStateBlocks { + return &ProtocolStateBlocks{ + state: state, + indexReporter: indexReporter, + } } func (b *ProtocolStateBlocks) HeaderByID(id flow.Identifier) (*flow.Header, error) { @@ -53,7 +62,16 @@ func (b *ProtocolStateBlocks) FinalizedHeader() (*flow.Header, error) { } func (b *ProtocolStateBlocks) SealedHeader() (*flow.Header, error) { + return b.state.Sealed().Head() + +} + +func (b *ProtocolStateBlocks) IndexedHeight() (uint64, error) { + if b.indexReporter != nil { + return b.indexReporter.HighestIndexedHeight() + } + return 0, IndexReporterNotInitialized } // RateLimiter is an interface for checking if an address is rate limited. @@ -396,6 +414,15 @@ func (v *TransactionValidator) checkSufficientBalanceToPayForTransaction(ctx con return fmt.Errorf("could not fetch block header: %w", err) } + indexedHeight, err := v.blocks.IndexedHeight() + if err != nil { + return fmt.Errorf("could not get indexed height: %w", err) + } + + if header.Height-indexedHeight <= DefaultSealedIndexedHeightThresholdNumber { + return fmt.Errorf("could not get indexed height: %w", SealedIndexedHeightThresholdLimit) + } + payerAddress := cadence.NewAddress(tx.Payer) inclusionEffort := cadence.UFix64(tx.InclusionEffort()) gasLimit := cadence.UFix64(tx.GasLimit) @@ -405,7 +432,7 @@ func (v *TransactionValidator) checkSufficientBalanceToPayForTransaction(ctx con return fmt.Errorf("failed to encode cadence args for script executor: %w", err) } - result, err := v.scriptExecutor.ExecuteAtBlockHeight(ctx, v.verifyPayerBalanceScript, args, header.Height) + result, err := v.scriptExecutor.ExecuteAtBlockHeight(ctx, v.verifyPayerBalanceScript, args, indexedHeight) if err != nil { return fmt.Errorf("script finished with error: %w", err) } @@ -421,7 +448,7 @@ func (v *TransactionValidator) checkSufficientBalanceToPayForTransaction(ctx con } // return no error if payer has sufficient balance - if bool(canExecuteTransaction) { + if canExecuteTransaction { return nil } diff --git a/cmd/access/node_builder/access_node_builder.go b/cmd/access/node_builder/access_node_builder.go index dc760ab08e7..36b14d6543b 100644 --- a/cmd/access/node_builder/access_node_builder.go +++ b/cmd/access/node_builder/access_node_builder.go @@ -1815,6 +1815,12 @@ func (builder *FlowAccessNodeBuilder) Build() (cmd.Node, error) { return nil, fmt.Errorf("transaction result query mode 'compare' is not supported") } + // If execution data syncing and indexing is disabled, pass nil indexReporter + var indexReporter state_synchronization.IndexReporter + if builder.executionDataSyncEnabled && builder.executionDataIndexingEnabled { + indexReporter = builder.Reporter + } + nodeBackend, err := backend.New(backend.Params{ State: node.State, CollectionRPC: builder.CollectionRPC, @@ -1853,17 +1859,12 @@ func (builder *FlowAccessNodeBuilder) Build() (cmd.Node, error) { TxResultQueryMode: txResultQueryMode, TxResultsIndex: builder.TxResultsIndex, LastFullBlockHeight: lastFullBlockHeight, + IndexReporter: indexReporter, }) if err != nil { return nil, fmt.Errorf("could not initialize backend: %w", err) } - // If execution data syncing and indexing is disabled, pass nil indexReporter - var indexReporter state_synchronization.IndexReporter - if builder.executionDataSyncEnabled && builder.executionDataIndexingEnabled { - indexReporter = builder.Reporter - } - engineBuilder, err := rpc.NewBuilder( node.Logger, node.State, diff --git a/engine/access/rpc/backend/backend.go b/engine/access/rpc/backend/backend.go index 3af46045697..4b6b882bf30 100644 --- a/engine/access/rpc/backend/backend.go +++ b/engine/access/rpc/backend/backend.go @@ -22,6 +22,7 @@ import ( "github.com/onflow/flow-go/module" "github.com/onflow/flow-go/module/counters" "github.com/onflow/flow-go/module/execution" + "github.com/onflow/flow-go/module/state_synchronization" "github.com/onflow/flow-go/state/protocol" "github.com/onflow/flow-go/storage" ) @@ -119,6 +120,7 @@ type Params struct { TxResultQueryMode IndexQueryMode TxResultsIndex *index.TransactionResultsIndex LastFullBlockHeight *counters.PersistentStrictMonotonicCounter + IndexReporter state_synchronization.IndexReporter } var _ TransactionErrorMessage = (*Backend)(nil) @@ -246,7 +248,13 @@ func New(params Params) (*Backend, error) { nodeInfo: nodeInfo, } - txValidator, err := configureTransactionValidator(params.State, params.ChainID, params.ScriptExecutor, params.CheckPayerBalance) + txValidator, err := configureTransactionValidator( + params.State, + params.ChainID, + params.ScriptExecutor, + params.IndexReporter, + params.CheckPayerBalance, + ) if err != nil { return nil, fmt.Errorf("could not create transaction validator: %w", err) } @@ -310,9 +318,15 @@ func identifierList(ids []string) (flow.IdentifierList, error) { return idList, nil } -func configureTransactionValidator(state protocol.State, chainID flow.ChainID, executor execution.ScriptExecutor, checkPayerBalance bool) (*access.TransactionValidator, error) { +func configureTransactionValidator( + state protocol.State, + chainID flow.ChainID, + executor execution.ScriptExecutor, + indexReporter state_synchronization.IndexReporter, + checkPayerBalance bool, +) (*access.TransactionValidator, error) { return access.NewTransactionValidator( - access.NewProtocolStateBlocks(state), + access.NewProtocolStateBlocks(state, indexReporter), chainID.Chain(), access.TransactionValidationOptions{ Expiry: flow.DefaultTransactionExpiry, diff --git a/engine/access/rpc/engine.go b/engine/access/rpc/engine.go index a42c8495345..145e3d62143 100644 --- a/engine/access/rpc/engine.go +++ b/engine/access/rpc/engine.go @@ -8,8 +8,6 @@ import ( "net/http" "sync" - "github.com/onflow/flow-go/module/state_synchronization" - "github.com/rs/zerolog" "google.golang.org/grpc/credentials" @@ -25,6 +23,7 @@ import ( "github.com/onflow/flow-go/module/events" "github.com/onflow/flow-go/module/grpcserver" "github.com/onflow/flow-go/module/irrecoverable" + "github.com/onflow/flow-go/module/state_synchronization" "github.com/onflow/flow-go/state/protocol" ) diff --git a/engine/collection/ingest/engine.go b/engine/collection/ingest/engine.go index a8adcedaded..ee069c64c32 100644 --- a/engine/collection/ingest/engine.go +++ b/engine/collection/ingest/engine.go @@ -61,7 +61,7 @@ func New( logger := log.With().Str("engine", "ingest").Logger() transactionValidator := access.NewTransactionValidatorWithLimiter( - access.NewProtocolStateBlocks(state), + access.NewProtocolStateBlocks(state, nil), chain, access.TransactionValidationOptions{ Expiry: flow.DefaultTransactionExpiry, From d7952647b464e3b06e84abb67efcc17285b0460c Mon Sep 17 00:00:00 2001 From: Andrii Date: Thu, 1 Aug 2024 16:52:22 +0300 Subject: [PATCH 02/16] Fixed check for threshold between heights --- access/validator.go | 4 ++-- access/validator_test.go | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/access/validator.go b/access/validator.go index c3a5d8a9443..d638a7d067e 100644 --- a/access/validator.go +++ b/access/validator.go @@ -419,8 +419,8 @@ func (v *TransactionValidator) checkSufficientBalanceToPayForTransaction(ctx con return fmt.Errorf("could not get indexed height: %w", err) } - if header.Height-indexedHeight <= DefaultSealedIndexedHeightThresholdNumber { - return fmt.Errorf("could not get indexed height: %w", SealedIndexedHeightThresholdLimit) + if header.Height-indexedHeight >= DefaultSealedIndexedHeightThresholdNumber { + return fmt.Errorf("the gap between sealed and indexed height is larger than threshold: %w", SealedIndexedHeightThresholdLimit) } payerAddress := cadence.NewAddress(tx.Payer) diff --git a/access/validator_test.go b/access/validator_test.go index 1554a91cfcb..21d32e8425c 100644 --- a/access/validator_test.go +++ b/access/validator_test.go @@ -52,6 +52,10 @@ func (s *TransactionValidatorSuite) SetupTest() { On("SealedHeader"). Return(s.header, nil) + s.blocks. + On("IndexedHeight"). + Return(s.blocks, nil) + s.chain = flow.Testnet.Chain() s.validatorOptions = access.TransactionValidationOptions{ CheckPayerBalance: true, @@ -162,3 +166,7 @@ func (s *TransactionValidatorSuite) TestTransactionValidator_InsufficientBalance assert.ErrorIs(s.T(), actualErr, expectedError) } + +func (s *TransactionValidatorSuite) TestTransactionValidator_SealedIndexedHeightThresholdLimit() { + +} From bba3a12dad4b113155740112dc84c24f143e7f37 Mon Sep 17 00:00:00 2001 From: Andrii Date: Wed, 7 Aug 2024 14:21:48 +0300 Subject: [PATCH 03/16] Changed check of gap, added test for error case --- access/errors.go | 18 +++++++++++++++--- access/validator.go | 9 +++++++-- access/validator_test.go | 38 ++++++++++++++++++++++++++++++++++---- 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/access/errors.go b/access/errors.go index 5e175a512b0..166940c91cb 100644 --- a/access/errors.go +++ b/access/errors.go @@ -16,9 +16,6 @@ var ErrUnknownReferenceBlock = errors.New("unknown reference block") // execution data syncing and indexing is disabled var IndexReporterNotInitialized = errors.New("index reported not initialized") -// SealedIndexedHeightThresholdLimit is returned when gap between sealed and indexed height is larger than allowed -var SealedIndexedHeightThresholdLimit = errors.New("gap between sealed and indexed height is larger than allowed") - // IncompleteTransactionError indicates that a transaction is missing one or more required fields. type IncompleteTransactionError struct { MissingFields []string @@ -122,3 +119,18 @@ func IsInsufficientBalanceError(err error) bool { var balanceError InsufficientBalanceError return errors.As(err, &balanceError) } + +type IndexedHeightTooBehindError struct { + SealedHeight uint64 + IndexedHeight uint64 +} + +func (e IndexedHeightTooBehindError) Error() string { + return fmt.Sprintf("the difference between the latest sealed height (%d) and indexed height (%d) exceeds the maximum gap allowed", + e.SealedHeight, e.IndexedHeight) +} + +func IsIndexedHeightTooBehindError(err error) bool { + var indexedError IndexedHeightTooBehindError + return errors.As(err, &indexedError) +} diff --git a/access/validator.go b/access/validator.go index d638a7d067e..0c4c7d25774 100644 --- a/access/validator.go +++ b/access/validator.go @@ -205,6 +205,10 @@ func (v *TransactionValidator) Validate(ctx context.Context, tx *flow.Transactio err = v.checkSufficientBalanceToPayForTransaction(ctx, tx) if err != nil { + if IsIndexedHeightTooBehindError(err) { + return err + } + // we only return InsufficientBalanceError as it's a client-side issue // that requires action from a user. Other errors (e.g. parsing errors) // are 'internal' and related to script execution process. they shouldn't @@ -419,8 +423,9 @@ func (v *TransactionValidator) checkSufficientBalanceToPayForTransaction(ctx con return fmt.Errorf("could not get indexed height: %w", err) } - if header.Height-indexedHeight >= DefaultSealedIndexedHeightThresholdNumber { - return fmt.Errorf("the gap between sealed and indexed height is larger than threshold: %w", SealedIndexedHeightThresholdLimit) + sealedHeight := header.Height + if sealedHeight-DefaultSealedIndexedHeightThresholdNumber > indexedHeight { + return IndexedHeightTooBehindError{SealedHeight: sealedHeight, IndexedHeight: indexedHeight} } payerAddress := cadence.NewAddress(tx.Payer) diff --git a/access/validator_test.go b/access/validator_test.go index 21d32e8425c..9e9dd911f42 100644 --- a/access/validator_test.go +++ b/access/validator_test.go @@ -52,10 +52,6 @@ func (s *TransactionValidatorSuite) SetupTest() { On("SealedHeader"). Return(s.header, nil) - s.blocks. - On("IndexedHeight"). - Return(s.blocks, nil) - s.chain = flow.Testnet.Chain() s.validatorOptions = access.TransactionValidationOptions{ CheckPayerBalance: true, @@ -88,6 +84,10 @@ func (s *TransactionValidatorSuite) TestTransactionValidator_ScriptExecutorInter scriptExecutor := execmock.NewScriptExecutor(s.T()) assert.NotNil(s.T(), scriptExecutor) + s.blocks. + On("IndexedHeight"). + Return(s.header.Height, nil) + scriptExecutor. On("ExecuteAtBlockHeight", mock.Anything, mock.Anything, mock.Anything, mock.Anything). Return(nil, errors.New("script executor internal error")). @@ -115,6 +115,10 @@ func (s *TransactionValidatorSuite) TestTransactionValidator_SufficientBalance() actualResponse, err := jsoncdc.Encode(actualResponseValue) assert.NoError(s.T(), err) + s.blocks. + On("IndexedHeight"). + Return(s.header.Height, nil) + scriptExecutor. On("ExecuteAtBlockHeight", mock.Anything, mock.Anything, mock.Anything, mock.Anything). Return(actualResponse, nil). @@ -142,6 +146,10 @@ func (s *TransactionValidatorSuite) TestTransactionValidator_InsufficientBalance actualResponse, err := jsoncdc.Encode(actualResponseValue) assert.NoError(s.T(), err) + s.blocks. + On("IndexedHeight"). + Return(s.header.Height, nil) + scriptExecutor. On("ExecuteAtBlockHeight", mock.Anything, mock.Anything, mock.Anything, mock.Anything). Return(actualResponse, nil). @@ -168,5 +176,27 @@ func (s *TransactionValidatorSuite) TestTransactionValidator_InsufficientBalance } func (s *TransactionValidatorSuite) TestTransactionValidator_SealedIndexedHeightThresholdLimit() { + scriptExecutor := execmock.NewScriptExecutor(s.T()) + + // setting indexed height to be behind of sealed by bigger number than allowed(30) + indexedHeight := s.header.Height - 40 + s.blocks. + On("IndexedHeight"). + Return(indexedHeight, nil) + + validator, err := access.NewTransactionValidator(s.blocks, s.chain, s.validatorOptions, scriptExecutor) + assert.NoError(s.T(), err) + assert.NotNil(s.T(), validator) + + txBody := unittest.TransactionBodyFixture() + + expectedError := access.IndexedHeightTooBehindError{ + SealedHeight: s.header.Height, + IndexedHeight: indexedHeight, + } + + actualErr := validator.Validate(context.Background(), &txBody) + + assert.ErrorIs(s.T(), actualErr, expectedError) } From 8c1b515d1022b20a91b199239d1505f6b3c36ee2 Mon Sep 17 00:00:00 2001 From: Andrii Date: Wed, 7 Aug 2024 15:30:02 +0300 Subject: [PATCH 04/16] Added replace statement for flow-emulator --- integration/go.mod | 4 +++- integration/go.sum | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/integration/go.mod b/integration/go.mod index 454980613ac..72114adbaf6 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -24,7 +24,7 @@ require ( github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f - github.com/onflow/flow-go v0.36.8-0.20240729193633-433a32eeb0cd + github.com/onflow/flow-go v0.36.8-0.20240729205403-18c8533fa521 github.com/onflow/flow-go-sdk v1.0.0-preview.44 github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000 github.com/onflow/flow/protobuf/go/flow v0.4.5 @@ -358,3 +358,5 @@ require ( replace github.com/onflow/flow-go => ../ replace github.com/onflow/flow-go/insecure => ../insecure + +replace github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f => github.com/AndriiDiachuk/flow-emulator v0.0.0-20240807122054-7dd4e4e81bbd diff --git a/integration/go.sum b/integration/go.sum index b37d46e2bc0..6deccc908a0 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -949,6 +949,8 @@ gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zum git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/AndriiDiachuk/flow-emulator v0.0.0-20240807122054-7dd4e4e81bbd h1:o2bksMugVQQDRqTQExsrW26rFN7UkRtt6hRctHKh91c= +github.com/AndriiDiachuk/flow-emulator v0.0.0-20240807122054-7dd4e4e81bbd/go.mod h1:epsHHzshyakyOuNeqhn+GORmnTkepddIzRmtq180o70= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= @@ -2150,8 +2152,6 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30= -github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f h1:2Ejpmm2Vrl/XLaE6lniE1vNfi6WYhzqHiCk6oomGoFE= -github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f/go.mod h1:0rqp896zEcjNqqDiQNBUlpS/7nzS4+E+yG/4s0P13bQ= github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0= github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs= From 28c030c57f354d112c5e3d92b8049755309a6c14 Mon Sep 17 00:00:00 2001 From: Andrii Date: Wed, 7 Aug 2024 15:32:45 +0300 Subject: [PATCH 05/16] Merged --- integration/go.mod | 6 ------ 1 file changed, 6 deletions(-) diff --git a/integration/go.mod b/integration/go.mod index cf3a930f62f..6c0a332a5c9 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -25,13 +25,8 @@ require ( github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f -<<<<<<< HEAD github.com/onflow/flow-go v0.36.8-0.20240729205403-18c8533fa521 - github.com/onflow/flow-go-sdk v1.0.0-preview.44 -======= - github.com/onflow/flow-go v0.36.8-0.20240729193633-433a32eeb0cd github.com/onflow/flow-go-sdk v1.0.0-preview.45 ->>>>>>> c5b9e466d6702ce0348d23019cf023b36f064ad8 github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000 github.com/onflow/flow/protobuf/go/flow v0.4.5 github.com/onflow/go-ethereum v1.14.7 @@ -370,4 +365,3 @@ replace github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1 // TODO: remove it when https://github.com/ipfs/go-ds-pebble/pull/36 merged replace github.com/ipfs/go-ds-pebble v0.3.1 => github.com/onflow/go-ds-pebble v0.0.0-20240731130313-f186539f382c - From 47e957e3a7a727159da33f47e798920bd3b4459d Mon Sep 17 00:00:00 2001 From: Andrii Date: Thu, 15 Aug 2024 12:44:11 +0300 Subject: [PATCH 06/16] Fixed remarks --- access/errors.go | 10 +++------- access/validator.go | 13 +++++-------- access/validator_test.go | 11 +++-------- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/access/errors.go b/access/errors.go index 166940c91cb..310c86b43b5 100644 --- a/access/errors.go +++ b/access/errors.go @@ -120,17 +120,13 @@ func IsInsufficientBalanceError(err error) bool { return errors.As(err, &balanceError) } -type IndexedHeightTooBehindError struct { +// IndexedHeightFarBehindError indicates that a node is far behind on indexing. +type IndexedHeightFarBehindError struct { SealedHeight uint64 IndexedHeight uint64 } -func (e IndexedHeightTooBehindError) Error() string { +func (e IndexedHeightFarBehindError) Error() string { return fmt.Sprintf("the difference between the latest sealed height (%d) and indexed height (%d) exceeds the maximum gap allowed", e.SealedHeight, e.IndexedHeight) } - -func IsIndexedHeightTooBehindError(err error) bool { - var indexedError IndexedHeightTooBehindError - return errors.As(err, &indexedError) -} diff --git a/access/validator.go b/access/validator.go index 0c4c7d25774..b7a7ba03c92 100644 --- a/access/validator.go +++ b/access/validator.go @@ -22,8 +22,9 @@ import ( "github.com/onflow/flow-go/state/protocol" ) -// DefaultSealedIndexedHeightThresholdNumber is the default number of blocks between sealed and indexed height -const DefaultSealedIndexedHeightThresholdNumber = 30 +// DefaultSealedIndexedHeightThreshold is the default number of blocks between sealed and indexed height +// this sets a limit on how far into the past the payer validator will allow for checking the payer's balance. +const DefaultSealedIndexedHeightThreshold = 30 type Blocks interface { HeaderByID(id flow.Identifier) (*flow.Header, error) @@ -205,10 +206,6 @@ func (v *TransactionValidator) Validate(ctx context.Context, tx *flow.Transactio err = v.checkSufficientBalanceToPayForTransaction(ctx, tx) if err != nil { - if IsIndexedHeightTooBehindError(err) { - return err - } - // we only return InsufficientBalanceError as it's a client-side issue // that requires action from a user. Other errors (e.g. parsing errors) // are 'internal' and related to script execution process. they shouldn't @@ -424,8 +421,8 @@ func (v *TransactionValidator) checkSufficientBalanceToPayForTransaction(ctx con } sealedHeight := header.Height - if sealedHeight-DefaultSealedIndexedHeightThresholdNumber > indexedHeight { - return IndexedHeightTooBehindError{SealedHeight: sealedHeight, IndexedHeight: indexedHeight} + if indexedHeight < sealedHeight-DefaultSealedIndexedHeightThreshold { + return IndexedHeightFarBehindError{SealedHeight: sealedHeight, IndexedHeight: indexedHeight} } payerAddress := cadence.NewAddress(tx.Payer) diff --git a/access/validator_test.go b/access/validator_test.go index 9e9dd911f42..08c55237ddc 100644 --- a/access/validator_test.go +++ b/access/validator_test.go @@ -178,7 +178,7 @@ func (s *TransactionValidatorSuite) TestTransactionValidator_InsufficientBalance func (s *TransactionValidatorSuite) TestTransactionValidator_SealedIndexedHeightThresholdLimit() { scriptExecutor := execmock.NewScriptExecutor(s.T()) - // setting indexed height to be behind of sealed by bigger number than allowed(30) + // setting indexed height to be behind of sealed by bigger number than allowed(DefaultSealedIndexedHeightThreshold) indexedHeight := s.header.Height - 40 s.blocks. @@ -191,12 +191,7 @@ func (s *TransactionValidatorSuite) TestTransactionValidator_SealedIndexedHeight txBody := unittest.TransactionBodyFixture() - expectedError := access.IndexedHeightTooBehindError{ - SealedHeight: s.header.Height, - IndexedHeight: indexedHeight, - } - - actualErr := validator.Validate(context.Background(), &txBody) + err = validator.Validate(context.Background(), &txBody) + assert.NoError(s.T(), err) - assert.ErrorIs(s.T(), actualErr, expectedError) } From 3ebbc5eb1fc7450e3fe84fb6fa66229acd16f239 Mon Sep 17 00:00:00 2001 From: Andrii Date: Thu, 15 Aug 2024 13:46:36 +0300 Subject: [PATCH 07/16] Updated replace --- integration/go.mod | 4 ++-- integration/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/go.mod b/integration/go.mod index 50a26095de7..f0a56ebf114 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -25,7 +25,7 @@ require ( github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f - github.com/onflow/flow-go v0.36.8-0.20240729205403-18c8533fa521 + github.com/onflow/flow-go v0.37.1 github.com/onflow/flow-go-sdk v1.0.0-preview.50 github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000 github.com/onflow/flow/protobuf/go/flow v0.4.5 @@ -361,7 +361,7 @@ replace github.com/onflow/flow-go => ../ replace github.com/onflow/flow-go/insecure => ../insecure // TODO: remove it when https://github.com/onflow/flow-emulator/pull/724 merged -replace github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f => github.com/AndriiDiachuk/flow-emulator v0.0.0-20240807122054-7dd4e4e81bbd +replace github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f => github.com/AndriiDiachuk/flow-emulator v0.0.0-20240815104502-fab42f5691e1 // TODO: remove it when https://github.com/ipfs/go-ds-pebble/pull/36 merged replace github.com/ipfs/go-ds-pebble v0.3.1 => github.com/onflow/go-ds-pebble v0.0.0-20240731130313-f186539f382c diff --git a/integration/go.sum b/integration/go.sum index f11d105f8ec..a62fb1186cd 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -949,8 +949,8 @@ gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zum git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/AndriiDiachuk/flow-emulator v0.0.0-20240807122054-7dd4e4e81bbd h1:o2bksMugVQQDRqTQExsrW26rFN7UkRtt6hRctHKh91c= -github.com/AndriiDiachuk/flow-emulator v0.0.0-20240807122054-7dd4e4e81bbd/go.mod h1:epsHHzshyakyOuNeqhn+GORmnTkepddIzRmtq180o70= +github.com/AndriiDiachuk/flow-emulator v0.0.0-20240815104502-fab42f5691e1 h1:G/CkcyLNr1bL+CAWTktojKOXWtSRW8tJ04QIrvN1+68= +github.com/AndriiDiachuk/flow-emulator v0.0.0-20240815104502-fab42f5691e1/go.mod h1:xaDAJhLjqQMPl6g0J691mp6crgdvKGFqo0KDeJRYY9E= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= From 36b2c55d1a1361be7270af2447f797a6f57ec698 Mon Sep 17 00:00:00 2001 From: Andrii Date: Mon, 19 Aug 2024 12:18:55 +0300 Subject: [PATCH 08/16] Added godoc and expected errors --- access/validator.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/access/validator.go b/access/validator.go index b7a7ba03c92..c5f02ca9fe5 100644 --- a/access/validator.go +++ b/access/validator.go @@ -68,6 +68,9 @@ func (b *ProtocolStateBlocks) SealedHeader() (*flow.Header, error) { } +// IndexedHeight returns the highest indexed height by calling corresponding function of indexReporter. +// Expected errors during normal operation: +// - access.IndexReporterNotInitialized - indexed reporter was not initialized. func (b *ProtocolStateBlocks) IndexedHeight() (uint64, error) { if b.indexReporter != nil { return b.indexReporter.HighestIndexedHeight() @@ -420,6 +423,9 @@ func (v *TransactionValidator) checkSufficientBalanceToPayForTransaction(ctx con return fmt.Errorf("could not get indexed height: %w", err) } + // instead of using latest sealed block we are using latest indexed block, so we can do a check + // to ensure that the difference between the latest sealed and indexed is within some tolerance + // to handle cases where a node is behind on indexing. sealedHeight := header.Height if indexedHeight < sealedHeight-DefaultSealedIndexedHeightThreshold { return IndexedHeightFarBehindError{SealedHeight: sealedHeight, IndexedHeight: indexedHeight} From 0d05d2fac95261962012b2a05699ef4c817bbdf9 Mon Sep 17 00:00:00 2001 From: Andrii Date: Mon, 19 Aug 2024 12:45:28 +0300 Subject: [PATCH 09/16] Added indexReporter to observer builder --- cmd/observer/node_builder/observer_builder.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/observer/node_builder/observer_builder.go b/cmd/observer/node_builder/observer_builder.go index 80c702f2967..7d5ce11c565 100644 --- a/cmd/observer/node_builder/observer_builder.go +++ b/cmd/observer/node_builder/observer_builder.go @@ -1904,6 +1904,12 @@ func (builder *ObserverServiceBuilder) enqueueRPCServer() { return nil, fmt.Errorf("failed to initialize block tracker: %w", err) } + // If execution data syncing and indexing is disabled, pass nil indexReporter + var indexReporter state_synchronization.IndexReporter + if builder.executionDataSyncEnabled && builder.executionDataIndexingEnabled { + indexReporter = builder.Reporter + } + backendParams := backend.Params{ State: node.State, Blocks: node.Storage.Blocks, @@ -1930,6 +1936,7 @@ func (builder *ObserverServiceBuilder) enqueueRPCServer() { builder.stateStreamConf.ResponseLimit, builder.stateStreamConf.ClientSendBufferSize, ), + IndexReporter: indexReporter, } if builder.localServiceAPIEnabled { @@ -1957,12 +1964,6 @@ func (builder *ObserverServiceBuilder) enqueueRPCServer() { return nil, err } - // If execution data syncing and indexing is disabled, pass nil indexReporter - var indexReporter state_synchronization.IndexReporter - if builder.executionDataSyncEnabled && builder.executionDataIndexingEnabled { - indexReporter = builder.Reporter - } - engineBuilder, err := rpc.NewBuilder( node.Logger, node.State, From 4e466068da7925295822033e4f84b2071f9b4bf2 Mon Sep 17 00:00:00 2001 From: Andrii Diachuk Date: Mon, 26 Aug 2024 23:27:18 +0300 Subject: [PATCH 10/16] Update validator.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> --- access/validator.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/access/validator.go b/access/validator.go index c5f02ca9fe5..ca44729ef3a 100644 --- a/access/validator.go +++ b/access/validator.go @@ -423,9 +423,9 @@ func (v *TransactionValidator) checkSufficientBalanceToPayForTransaction(ctx con return fmt.Errorf("could not get indexed height: %w", err) } - // instead of using latest sealed block we are using latest indexed block, so we can do a check - // to ensure that the difference between the latest sealed and indexed is within some tolerance - // to handle cases where a node is behind on indexing. + // we use latest indexed block to get the most up-to-date state data available for executing scripts. + // check here to make sure indexing is within an acceptable tolerance of sealing to avoid issues + // if indexing falls behind sealedHeight := header.Height if indexedHeight < sealedHeight-DefaultSealedIndexedHeightThreshold { return IndexedHeightFarBehindError{SealedHeight: sealedHeight, IndexedHeight: indexedHeight} From 0ed15f25e06e92cec74a3cad9f253376135b9b05 Mon Sep 17 00:00:00 2001 From: Andrii Date: Tue, 27 Aug 2024 13:11:44 +0300 Subject: [PATCH 11/16] Updated replace --- integration/go.mod | 2 +- integration/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/go.mod b/integration/go.mod index ad9c59a37f5..b9f0c568099 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -361,7 +361,7 @@ replace github.com/onflow/flow-go => ../ replace github.com/onflow/flow-go/insecure => ../insecure // TODO: remove it when https://github.com/onflow/flow-emulator/pull/724 merged -replace github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f => github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827085507-f0d43bd0199d +replace github.com/onflow/flow-emulator v1.0.0-preview.36.0.20240729195722-d4eb1c30eb9f => github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827100955-2a6194eee077 // TODO: remove it when https://github.com/ipfs/go-ds-pebble/pull/36 merged replace github.com/ipfs/go-ds-pebble v0.3.1 => github.com/onflow/go-ds-pebble v0.0.0-20240731130313-f186539f382c diff --git a/integration/go.sum b/integration/go.sum index a107ed80571..32a39899030 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -949,8 +949,8 @@ gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zum git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827085507-f0d43bd0199d h1:BDetx7NaTgl/XBw4+oY4x6M8sBMV+zNxOGSNL/8Y4Lo= -github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827085507-f0d43bd0199d/go.mod h1:TCQ0iQ/4UPC9+EGu4VqN9x64W4qG4xyurfhVraFfLXI= +github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827100955-2a6194eee077 h1:Rr9Nr30tqbRXXCxyJwg5OSuq1R8/OgGP8xbx6vMaVWo= +github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827100955-2a6194eee077/go.mod h1:iN844+WiLV41AHPRQiDi0E9p920ZLCpQp72HMDaQmGE= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= From f841c29a05faa551d4e8d3bf3fee0388fc0f2545 Mon Sep 17 00:00:00 2001 From: Andrii Date: Thu, 29 Aug 2024 11:14:31 +0300 Subject: [PATCH 12/16] Added gosec statement --- cmd/bootstrap/utils/md5.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bootstrap/utils/md5.go b/cmd/bootstrap/utils/md5.go index 3abe9c42948..e885ed891e2 100644 --- a/cmd/bootstrap/utils/md5.go +++ b/cmd/bootstrap/utils/md5.go @@ -3,7 +3,7 @@ package utils // The google storage API only provides md5 and crc32 hence overriding the linter flag for md5 // #nosec import ( - "crypto/md5" + "crypto/md5" //nolint:gosec "io" "os" ) From 160b0e0f1c94e5fa4cee202bf07b652e939bb467 Mon Sep 17 00:00:00 2001 From: Andrii Date: Tue, 3 Sep 2024 17:13:49 +0300 Subject: [PATCH 13/16] Updated flow-emulator replace statement --- integration/go.mod | 4 ++-- integration/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/go.mod b/integration/go.mod index 1cd0e2d2608..35207001f51 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -25,7 +25,7 @@ require ( github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 github.com/onflow/flow-emulator v1.0.0-preview.41.0.20240829134601-0be55d6970b5 - github.com/onflow/flow-go v0.37.7-0.20240826193109-e211841b59f5 + github.com/onflow/flow-go v0.37.7-0.20240830182756-9ac9e1889c34 github.com/onflow/flow-go-sdk v1.0.0-preview.55 github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000 github.com/onflow/flow/protobuf/go/flow v0.4.6 @@ -361,4 +361,4 @@ replace github.com/onflow/flow-go => ../ replace github.com/onflow/flow-go/insecure => ../insecure // TODO: remove it when https://github.com/onflow/flow-emulator/pull/724 merged -replace github.com/onflow/flow-emulator v1.0.0-preview.41.0.20240829134601-0be55d6970b5 => github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827100955-2a6194eee077 +replace github.com/onflow/flow-emulator v1.0.0-preview.41.0.20240829134601-0be55d6970b5 => github.com/AndriiDiachuk/flow-emulator v0.0.0-20240903140813-122b79780f82 diff --git a/integration/go.sum b/integration/go.sum index 0901d720d49..846b2597b2b 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -949,8 +949,8 @@ gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zum git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827100955-2a6194eee077 h1:Rr9Nr30tqbRXXCxyJwg5OSuq1R8/OgGP8xbx6vMaVWo= -github.com/AndriiDiachuk/flow-emulator v0.0.0-20240827100955-2a6194eee077/go.mod h1:iN844+WiLV41AHPRQiDi0E9p920ZLCpQp72HMDaQmGE= +github.com/AndriiDiachuk/flow-emulator v0.0.0-20240903140813-122b79780f82 h1:M6NyNvF9PgjzndnDw11tD8UYy20g9EEOe7DAcj+nkUc= +github.com/AndriiDiachuk/flow-emulator v0.0.0-20240903140813-122b79780f82/go.mod h1:JkktQ1/PSJkcvfr4/aajDMCyd5+4qQKaSyWHIP7WwPo= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= From 31ef3d3491d07d2b9055c514020d2b8787848127 Mon Sep 17 00:00:00 2001 From: Andrii Date: Mon, 30 Sep 2024 12:49:23 +0300 Subject: [PATCH 14/16] Updated flow-emulator dependencies --- go.mod | 5 +++++ go.sum | 10 ++++++++++ integration/go.mod | 4 ++-- integration/go.sum | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index ce21004255f..ba216f5d4c5 100644 --- a/go.mod +++ b/go.mod @@ -166,6 +166,7 @@ require ( github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/elastic/gosigar v0.14.2 // indirect github.com/ethereum/c-kzg-4844 v1.0.0 // indirect github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect @@ -187,6 +188,7 @@ require ( github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gofrs/flock v0.8.1 // indirect @@ -233,6 +235,7 @@ require ( github.com/libp2p/go-netroute v0.2.1 // indirect github.com/libp2p/go-reuseport v0.4.0 // indirect github.com/libp2p/go-yamux/v4 v4.0.1 // indirect + github.com/logrusorgru/aurora v2.0.3+incompatible // indirect github.com/logrusorgru/aurora/v4 v4.0.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -256,6 +259,7 @@ require ( github.com/multiformats/go-multistream v0.5.0 // indirect github.com/multiformats/go-varint v0.0.7 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb // indirect github.com/onflow/flow-ft/lib/go/contracts v1.0.0 // indirect github.com/onflow/flow-ft/lib/go/templates v1.0.0 // indirect github.com/onflow/flow-nft/lib/go/contracts v1.2.1 // indirect @@ -272,6 +276,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect + github.com/psiemens/graceland v1.0.0 // indirect github.com/psiemens/sconfig v0.1.0 // indirect github.com/quic-go/qpack v0.4.0 // indirect github.com/quic-go/qtls-go1-20 v0.4.1 // indirect diff --git a/go.sum b/go.sum index 2f51ed1016e..f0bd287aed0 100644 --- a/go.sum +++ b/go.sum @@ -1288,6 +1288,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= @@ -1475,6 +1477,8 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k= github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= +github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -1988,6 +1992,8 @@ github.com/libp2p/go-yamux/v4 v4.0.1 h1:FfDR4S1wj6Bw2Pqbc8Uz7pCxeRBPbwsBbEdfwiCy github.com/libp2p/go-yamux/v4 v4.0.1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= +github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/logrusorgru/aurora/v4 v4.0.0 h1:sRjfPpun/63iADiSvGGjgA1cAYegEWMPCJdUpJYn9JA= github.com/logrusorgru/aurora/v4 v4.0.0/go.mod h1:lP0iIa2nrnT/qoFXcOZSrZQpJ1o6n2CUf/hyHi2Q4ZQ= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= @@ -2182,6 +2188,8 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30= +github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb h1:68F7xwe6MbAZJcxBv7fZq5O8wcjVO6OsbETRUh4m4i4= +github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb/go.mod h1:3f37bqEQ1wim042lBBfMqzspwisduefoCFgAn1VTibE= github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0= github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs= @@ -2330,6 +2338,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7/go.mod h1:IToEjHuttnUzwZI5KBSM/LOOW3qLbbrHOEfp3SbECGY= +github.com/psiemens/graceland v1.0.0 h1:L580AVV4Q2XLcPpmvxJRH9UpEAYr/eu2jBKmMglhvM8= +github.com/psiemens/graceland v1.0.0/go.mod h1:1Tof+vt1LbmcZFE0lzgdwMN0QBymAChG3FRgDx8XisU= github.com/psiemens/sconfig v0.1.0 h1:xfWqW+TRpih7mXZIqKYTmpRhlZLQ1kbxV8EjllPv76s= github.com/psiemens/sconfig v0.1.0/go.mod h1:+MLKqdledP/8G3rOBpknbLh0IclCf4WneJUtS26JB2U= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= diff --git a/integration/go.mod b/integration/go.mod index 79987a72596..0572ac31178 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -24,8 +24,8 @@ require ( github.com/onflow/crypto v0.25.2 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 - github.com/onflow/flow-emulator v1.0.0-preview.41.0.20240829134601-0be55d6970b5 - github.com/onflow/flow-go v0.37.7-0.20240830182756-9ac9e1889c34 + github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb + github.com/onflow/flow-go v0.38.0-preview.0 github.com/onflow/flow-go-sdk v1.0.0 github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000 github.com/onflow/flow/protobuf/go/flow v0.4.7 diff --git a/integration/go.sum b/integration/go.sum index b3dfe238630..fb5a774e919 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -2156,6 +2156,7 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+ github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30= github.com/onflow/flow-emulator v1.0.0-preview.41.0.20240829134601-0be55d6970b5/go.mod h1:gFafyGD4Qxs+XT2BRSIjQJ86ILSmgm1VYUoCr1nVxVI= +github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb/go.mod h1:3f37bqEQ1wim042lBBfMqzspwisduefoCFgAn1VTibE= github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0= github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs= From f1a4687fb4fe45af9334fef0f0f0ccb8604748fa Mon Sep 17 00:00:00 2001 From: Andrii Date: Mon, 30 Sep 2024 12:54:13 +0300 Subject: [PATCH 15/16] Linted --- go.mod | 5 ----- go.sum | 10 ---------- integration/go.sum | 4 +--- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/go.mod b/go.mod index ba216f5d4c5..ce21004255f 100644 --- a/go.mod +++ b/go.mod @@ -166,7 +166,6 @@ require ( github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/elastic/gosigar v0.14.2 // indirect github.com/ethereum/c-kzg-4844 v1.0.0 // indirect github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect @@ -188,7 +187,6 @@ require ( github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gofrs/flock v0.8.1 // indirect @@ -235,7 +233,6 @@ require ( github.com/libp2p/go-netroute v0.2.1 // indirect github.com/libp2p/go-reuseport v0.4.0 // indirect github.com/libp2p/go-yamux/v4 v4.0.1 // indirect - github.com/logrusorgru/aurora v2.0.3+incompatible // indirect github.com/logrusorgru/aurora/v4 v4.0.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -259,7 +256,6 @@ require ( github.com/multiformats/go-multistream v0.5.0 // indirect github.com/multiformats/go-varint v0.0.7 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb // indirect github.com/onflow/flow-ft/lib/go/contracts v1.0.0 // indirect github.com/onflow/flow-ft/lib/go/templates v1.0.0 // indirect github.com/onflow/flow-nft/lib/go/contracts v1.2.1 // indirect @@ -276,7 +272,6 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/psiemens/graceland v1.0.0 // indirect github.com/psiemens/sconfig v0.1.0 // indirect github.com/quic-go/qpack v0.4.0 // indirect github.com/quic-go/qtls-go1-20 v0.4.1 // indirect diff --git a/go.sum b/go.sum index f0bd287aed0..2f51ed1016e 100644 --- a/go.sum +++ b/go.sum @@ -1288,8 +1288,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= @@ -1477,8 +1475,6 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k= github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -1992,8 +1988,6 @@ github.com/libp2p/go-yamux/v4 v4.0.1 h1:FfDR4S1wj6Bw2Pqbc8Uz7pCxeRBPbwsBbEdfwiCy github.com/libp2p/go-yamux/v4 v4.0.1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= -github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/logrusorgru/aurora/v4 v4.0.0 h1:sRjfPpun/63iADiSvGGjgA1cAYegEWMPCJdUpJYn9JA= github.com/logrusorgru/aurora/v4 v4.0.0/go.mod h1:lP0iIa2nrnT/qoFXcOZSrZQpJ1o6n2CUf/hyHi2Q4ZQ= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= @@ -2188,8 +2182,6 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30= -github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb h1:68F7xwe6MbAZJcxBv7fZq5O8wcjVO6OsbETRUh4m4i4= -github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb/go.mod h1:3f37bqEQ1wim042lBBfMqzspwisduefoCFgAn1VTibE= github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0= github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs= @@ -2338,8 +2330,6 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7/go.mod h1:IToEjHuttnUzwZI5KBSM/LOOW3qLbbrHOEfp3SbECGY= -github.com/psiemens/graceland v1.0.0 h1:L580AVV4Q2XLcPpmvxJRH9UpEAYr/eu2jBKmMglhvM8= -github.com/psiemens/graceland v1.0.0/go.mod h1:1Tof+vt1LbmcZFE0lzgdwMN0QBymAChG3FRgDx8XisU= github.com/psiemens/sconfig v0.1.0 h1:xfWqW+TRpih7mXZIqKYTmpRhlZLQ1kbxV8EjllPv76s= github.com/psiemens/sconfig v0.1.0/go.mod h1:+MLKqdledP/8G3rOBpknbLh0IclCf4WneJUtS26JB2U= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= diff --git a/integration/go.sum b/integration/go.sum index fb5a774e919..e7eaa449629 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -949,8 +949,6 @@ gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zum git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/AndriiDiachuk/flow-emulator v0.0.0-20240903140813-122b79780f82 h1:M6NyNvF9PgjzndnDw11tD8UYy20g9EEOe7DAcj+nkUc= -github.com/AndriiDiachuk/flow-emulator v0.0.0-20240903140813-122b79780f82/go.mod h1:JkktQ1/PSJkcvfr4/aajDMCyd5+4qQKaSyWHIP7WwPo= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= @@ -2155,7 +2153,7 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30= -github.com/onflow/flow-emulator v1.0.0-preview.41.0.20240829134601-0be55d6970b5/go.mod h1:gFafyGD4Qxs+XT2BRSIjQJ86ILSmgm1VYUoCr1nVxVI= +github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb h1:68F7xwe6MbAZJcxBv7fZq5O8wcjVO6OsbETRUh4m4i4= github.com/onflow/flow-emulator v1.0.1-0.20240930094518-fd78184a4ccb/go.mod h1:3f37bqEQ1wim042lBBfMqzspwisduefoCFgAn1VTibE= github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0= github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= From 0a7f162beccb4af3bb76833229427f0036e78a28 Mon Sep 17 00:00:00 2001 From: Andrii Date: Wed, 2 Oct 2024 13:12:26 +0300 Subject: [PATCH 16/16] Updated flow-emulator commit --- integration/go.mod | 4 ++-- integration/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/go.mod b/integration/go.mod index c6c9dc724bb..9bae86babca 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -24,8 +24,8 @@ require ( github.com/onflow/crypto v0.25.2 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 - github.com/onflow/flow-emulator v1.0.1-0.20240930092334-2f46b2112195 - github.com/onflow/flow-go v0.38.0-preview.0 + github.com/onflow/flow-emulator v1.0.1-0.20241002100151-fa253c380189 + github.com/onflow/flow-go v0.38.0-preview.0.0.20241001140429-ec4ad1cf1c8a github.com/onflow/flow-go-sdk v1.0.0 github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000 github.com/onflow/flow/protobuf/go/flow v0.4.7 diff --git a/integration/go.sum b/integration/go.sum index db2f27d710f..4128721ef99 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -2153,8 +2153,8 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30= -github.com/onflow/flow-emulator v1.0.1-0.20240930092334-2f46b2112195 h1:buM9uEW5WhFiI9hMDA90lJhokItN1Cmac3ddb0GWSbY= -github.com/onflow/flow-emulator v1.0.1-0.20240930092334-2f46b2112195/go.mod h1:b9gi9kvRfUVHmyz7cTXBsnT12oHOJisvrxpqwtFRMpM= +github.com/onflow/flow-emulator v1.0.1-0.20241002100151-fa253c380189 h1:UCVla50Y50Q2b+o6l22um8nHrD35XYRveLFHQg9EOv0= +github.com/onflow/flow-emulator v1.0.1-0.20241002100151-fa253c380189/go.mod h1:DEfNNXJuEOWqG/NS3RJ8jI+5BOhbENZ2hzKOz14ZPJ0= github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0= github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs=