Sync stable-cadence branch with master #5400
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add TargetEndTime to epoch models * update service event parsing * fix some typos and godocs * update mocks * lint * lint * pin new version of core-contracts - adds TargetEndTime field - pinned to branch - needs to be updated when release is created * update expected state commitment * update another state commitment constant * update another state commit constant * represent target end time as uint64 * lint / mocks
* unit tests, integration tests using buildjet-4vcpu runner * listTargetPackages() returns map of CI runners * test for custom runners * generateTestMatrix() stores CI runner * more testing with custom CI runners * CI test - 2 unit tests running buildjet runners * increase engine unit tests to 8 vCPUs * resource manager full load test (8 vCPUs) * network/test tests unquarantined, increased runners * increased to 16 vCPUs * increased engine tests to 16 vCPUs * insecure module uses buildjet 4 vcpu runner * bft framework integration test using buildjet * engine tests split up to 6 jobs with default runners * added back all integration tests * upgraded runners for some integration tests, engine/execution * dummy commit to kick off CI * split up TestScriptExecutionAndGetAccounts into 3 tests * updated runners for Epoch Cohort2, Access Integration Tests * AN integration tests split up into 3 cohorts (skip unit, other integration tests) * docker build using GitHub cache * remove saving Docker image locally * cache v3, saving local tar before caching, 8vcpu * add 11 docker images to docker-images.tar, 16 vcpu * docker save multiline fix; skip localnet-test * docker build increase to 32 vcpu * buildjet cache instead of GitHub cache * lint fix * activate more integration tests with default runners, using cached Docker * docker-build downsized to 16 vcpu * integration test without relic build * put back relic build for integration tests * put back all remaining integration tests using BuildJet runners * integration tests reverted to ubuntu-latest runners * re-activated unit-test, unit-test-modules jobs * added (failing) test for sub-sub packages * sub-sub packages support * sub-sub package test enhanced * updated other tests to support new sub-sub packages * split up engine/execution unit tests into 3 jobs * engine/execution/ingestion upgraded to 4 vcpu * engine/execution/ingestion:buildjet-8vcpu * network/test, network/p2p increased to 8 vcpu; added remaining network tests * BFT Framework, Epoch Cohort 2 - increased to 4 vcpu * upgraded runners for Access Cohort 1, Epoch Cohort 1, 2 * epoch cohort2 upgraded to 16 vcpu * BFT Framework upgrade to 8 vcpu, epoch cohort2 removed flaky test, downgrade to 4 vcpu * quarantined flaky test - TestEpochJoinAndLeaveVN * quarantined flaky test - TestSealingAndVerificationPassThrough * lint fix * network/test split up into network/test/cohort1, network/test/cohort2 * network/p2p split up into 4 subpackages network/p2p/connection network/p2p/scoring network/p2p/p2pnode network/p2p * extracted network/alsp into separate job * extracted module/dkg into separate job * engine/execution/ingestion dowgraded to stock runner * added engine parent package as separate job * added storage parent package as separate job * added state package as separate job * removed localnet-test job * engine/execution/ingestion upgraded to 2 vcpu * network/p2p/p2pnode upgraded to 2 vcpu * module, engine upgraded to 2 vcpu * network/p2p/p2pnode upgraded to 4 vcpu * network/test/cohort2 upgraded to 4 vcpu * engine upgraded to 4 vcpu * engine/execution/ingestion upgraded to 4 vcpu, network/test/cohort1 upgraded to 2 vcpu * network/test/cohort1 upgraded to 4 vcpu * engine/execution/ingestion upgraded to 8 vcpu * network/test/cohort1 upgraded to 8 vcpu * BFT (Protocol) upgraded to 4 vcpu * network/test/cohort1 upgraded to 16 vcpu * BFT (Protocol), Epoch Cohort1 upgraded to 8 vcpu * noop push to kick off CI * Module (integration) upgraded to 4 vcpu * TestUnicastRateLimit_Messages flaky test quarantined * noop push to kick off CI * buildjet/cache@v3 => actions/cache@v3 * test retries increased to 5, timeout increased to 35 mins * module job increased to 4 vcpu * unquarantined epoch flaky test after it was fixed #4975 * unlink flaky test monitor workflow from running when ci changes * clean up * lint fix * add TargetDuration to models, conversion * bump core-contracts version got this error: ``` go: module github.com/onflow/flow-core-contracts@9e8417b found (v0.0.0-20231120143830-9e8417b56122), but does not contain package github.com/onflow/flow-core-contracts/lib/go/templates ``` Maybe because templates did not change since previous version? * update state commitment constants in tests * tidy * update mocks * Update state/protocol/inmem/convert.go Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> --------- Co-authored-by: Misha <15269764+gomisha@users.noreply.github.com> Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co>
…e`, `TargetDuration` (#5023) * unit tests, integration tests using buildjet-4vcpu runner * listTargetPackages() returns map of CI runners * test for custom runners * generateTestMatrix() stores CI runner * more testing with custom CI runners * CI test - 2 unit tests running buildjet runners * increase engine unit tests to 8 vCPUs * resource manager full load test (8 vCPUs) * network/test tests unquarantined, increased runners * increased to 16 vCPUs * increased engine tests to 16 vCPUs * insecure module uses buildjet 4 vcpu runner * bft framework integration test using buildjet * engine tests split up to 6 jobs with default runners * added back all integration tests * upgraded runners for some integration tests, engine/execution * dummy commit to kick off CI * split up TestScriptExecutionAndGetAccounts into 3 tests * updated runners for Epoch Cohort2, Access Integration Tests * AN integration tests split up into 3 cohorts (skip unit, other integration tests) * docker build using GitHub cache * remove saving Docker image locally * cache v3, saving local tar before caching, 8vcpu * add 11 docker images to docker-images.tar, 16 vcpu * docker save multiline fix; skip localnet-test * docker build increase to 32 vcpu * buildjet cache instead of GitHub cache * lint fix * activate more integration tests with default runners, using cached Docker * docker-build downsized to 16 vcpu * integration test without relic build * put back relic build for integration tests * put back all remaining integration tests using BuildJet runners * integration tests reverted to ubuntu-latest runners * re-activated unit-test, unit-test-modules jobs * added (failing) test for sub-sub packages * sub-sub packages support * sub-sub package test enhanced * updated other tests to support new sub-sub packages * split up engine/execution unit tests into 3 jobs * engine/execution/ingestion upgraded to 4 vcpu * engine/execution/ingestion:buildjet-8vcpu * network/test, network/p2p increased to 8 vcpu; added remaining network tests * BFT Framework, Epoch Cohort 2 - increased to 4 vcpu * upgraded runners for Access Cohort 1, Epoch Cohort 1, 2 * epoch cohort2 upgraded to 16 vcpu * BFT Framework upgrade to 8 vcpu, epoch cohort2 removed flaky test, downgrade to 4 vcpu * quarantined flaky test - TestEpochJoinAndLeaveVN * quarantined flaky test - TestSealingAndVerificationPassThrough * lint fix * network/test split up into network/test/cohort1, network/test/cohort2 * network/p2p split up into 4 subpackages network/p2p/connection network/p2p/scoring network/p2p/p2pnode network/p2p * extracted network/alsp into separate job * extracted module/dkg into separate job * engine/execution/ingestion dowgraded to stock runner * added engine parent package as separate job * added storage parent package as separate job * added state package as separate job * removed localnet-test job * engine/execution/ingestion upgraded to 2 vcpu * network/p2p/p2pnode upgraded to 2 vcpu * module, engine upgraded to 2 vcpu * network/p2p/p2pnode upgraded to 4 vcpu * network/test/cohort2 upgraded to 4 vcpu * engine upgraded to 4 vcpu * engine/execution/ingestion upgraded to 4 vcpu, network/test/cohort1 upgraded to 2 vcpu * network/test/cohort1 upgraded to 4 vcpu * engine/execution/ingestion upgraded to 8 vcpu * network/test/cohort1 upgraded to 8 vcpu * BFT (Protocol) upgraded to 4 vcpu * network/test/cohort1 upgraded to 16 vcpu * BFT (Protocol), Epoch Cohort1 upgraded to 8 vcpu * noop push to kick off CI * Module (integration) upgraded to 4 vcpu * TestUnicastRateLimit_Messages flaky test quarantined * noop push to kick off CI * buildjet/cache@v3 => actions/cache@v3 * test retries increased to 5, timeout increased to 35 mins * module job increased to 4 vcpu * unquarantined epoch flaky test after it was fixed #4975 * unlink flaky test monitor workflow from running when ci changes * clean up * lint fix * add TargetEndTime to epoch models * update service event parsing * fix some typos and godocs * update mocks * lint * lint * pin new version of core-contracts - adds TargetEndTime field - pinned to branch - needs to be updated when release is created * update expected state commitment * update another state commitment constant * update another state commit constant * use TargetEndTime in cruisectl * represent target end time as uint64 * lint / mocks * use unix time in block time controller * add todod for epoch fallback flag * wip * wip - begin adding duration * add TargetDuration to models, conversion * bump core-contracts version got this error: ``` go: module github.com/onflow/flow-core-contracts@9e8417b found (v0.0.0-20231120143830-9e8417b56122), but does not contain package github.com/onflow/flow-core-contracts/lib/go/templates ``` Maybe because templates did not change since previous version? * update state commitment constants in tests * tidy * update mocks * track target duration in block time ctl * remove transition_time * update tests * fix last 2 tests - add helper functions for concisely converting between various time/duration types. - use ns-level precision in view measurement, primarily so that we can verify this implementation is consistent with the Python simulation. For real-world, second-level precision is likely fine. * Update consensus/hotstuff/cruisectl/block_time_controller.go Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> * Update consensus/hotstuff/cruisectl/block_time_controller_test.go * Update consensus/hotstuff/cruisectl/block_time_controller_test.go * lint * Apply suggestions from code review Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> * add docs * add docs for config setter/getters * gofmt --------- Co-authored-by: Misha <15269764+gomisha@users.noreply.github.com> Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co>
* Update cadence to v0.42.5 * use random string * update godoc * add in memory register store * update comments * add comment and update GetUpdatedRegister * refactor IsErrPruned * update tests * prefix with tests InMemoryRegister * use t.Run * Apply suggestions from code review Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * address review comments * Apply suggestions from code review Co-authored-by: Gregor G. <75445744+sideninja@users.noreply.github.com> * fix linter * fix linter * fix lint * use RegisterEntries * add chainhash to integration * add chainhash to insecure * add chainhash to integration * adds duration to the startup log * update mocks * adds TestNewSubscriptionRecordCache * adds TestGetSubscribedTopics * adds TestDuplicateTopics * adds test move update cycle * adds TestSubscriptionValidator_Integration * adds TestMoveUpdateCycleWithDifferentPeers * update emulator version * updates mocks * fixes build errors in insecure package * adds TestSubscriptionProvider_GetSubscribedTopics_SkippingUnknownPeers * minor fixes * add comment explainin idProvider mock expectations * use unittest random string * add comment about continue statement - remove obsolete continue statement * Update fixtures.go * small fixes * fixes merge conflicts * remove unnecessary variable declaration * add support for testnet chain * generalize support for all chains * lint fix * restoore gating EVM setup behind feature flag * lint fix * consolidates PeerIdFixtureB with PeerIdFixture * adds lint and tidy to insecure package * lint fix * Revert "lint fix" This reverts commit 9b1a4cc. * lint fix * revert the account not found error on withdraw * define direct call types * update docs * remove unnecessary event types * . * add more contract types for testing * fix tests * skip test, requires funding (implemented in follow up PR) * unskip test * check error * • extended compile-time checks for telemetry consumer enforcing that all happy-path interfaces are implemented • extended subscriptions of telemetry consumer to receive missing events * reduced notifications consumer interface in PaceMaker, as it only emits events from `hotstuff.ParticipantConsumer` * update tests * Refactor event emmision code * Update network/p2p/unicast/README.MD Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> * expose more test utility * lint * add register store * update LastFinalizedAndExecutedHeight * convert storage.ErrNotFound to nil * fix lint * fixes the logger * moving ready to the select-case * moving ready to select-case * revises the error by update loop to make it irrecoverable * clean up benchmarking * adds select case for startup of subscription provider * Update network/p2p/scoring/subscription_provider.go Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> * adds documentation to subscription record cache * fixes a bug with subscription record id * adds more documentation for current cycle * fix epoch event docs * [Access] Handle script canceled and timeout errors * [Access] Make script exec configurable * Make computation limit configurable on ENs * set limit setting once * undo whitespace changes * add storehouse loader * add loaders * add comments update log * add comments * update loader * add extending block snapshot * fix tests * fix lint * update interface * update tests * fix lint * update committer * update mocks * update committer tests * refactor collector * update mocks * update bootstrap * fix noop committer * fix computer_test * fix tests * refactor test * update committer tests * fix tests * Update engine/access/rpc/backend/backend_scripts_test.go Co-authored-by: Gregor G. <75445744+sideninja@users.noreply.github.com> * fix committer tests * add comment * update tests * Added implementation for execution api engine * Added tests for execution api engine * Fixed issues based on comments * Added accidentally removed code * Updated implementations following protobuf changes,updated mocks * Linted * [Access] Update websockets event streaming to return JSON-CDC encoded events * Added tests for sentinel errors * Update engine/execution/rpc/engine.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * update NewStorageSnapshot * update mocks * update tests * refactor script engine * update mocks * fix tests * fix tests * remove scripts engine tests * update errors * update tests * refactor tests * test CreateSnapshot * add executing block snapshot * reuse convert functions * add block_end_snapshot tests * remove changes * Apply suggestions from code review Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * add todo * Update engine/execution/storehouse/block_end_snapshot_test.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * Update engine/execution/storehouse/block_end_snapshot_test.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * fix lint * update comment * add back interface * update getFromStorage * handle not found case * add IsBlockExcuted * update state commmitment by block id * update mocks * fix lint * update unexecuted_loader * fix ingestion tests * fix stop control * use IsParentExecuted * fix loader tests * Fix bug in reencoding and update tests * update core-contracts version and state commitment constants This is just to get tests to pass, all these changes will be overwritten with the update to version v0.15.0 in #5027 --------- Co-authored-by: Yahya Hassanzadeh <yhassanzadeh13@ku.edu.tr> Co-authored-by: Supun Setunga <supun.setunga@gmail.com> Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> Co-authored-by: Gregor G <75445744+sideninja@users.noreply.github.com> Co-authored-by: Misha <15269764+gomisha@users.noreply.github.com> Co-authored-by: Leo Zhang (zhangchiqing) <zhangchiqing@gmail.com> Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> Co-authored-by: Bastian Müller <bastian@turbolent.com> Co-authored-by: Gregor Gololicic <gregor.gololicic@dapperlabs.com> Co-authored-by: Ramtin M. Seraj <ramtinms@users.noreply.github.com> Co-authored-by: ramtinms <ramtin.seraj@dapperlabs.com> Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh@ieee.org> Co-authored-by: Khalil Claybon <kclaybon1@gmail.com> Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> Co-authored-by: Janez Podhostnik <67895329+janezpodhostnik@users.noreply.github.com> Co-authored-by: Janez Podhostnik <janez.podhostnik@gmail.com> Co-authored-by: Jan Bernatik <jan.bernatik@dapperlabs.com> Co-authored-by: Andrii <andriy.dyachuk95@gmail.com> Co-authored-by: Yurii Oleksyshyn <yuraolex@gmail.com> Co-authored-by: Kan Zhang <kan@dapperlabs.com>
…ss (#5027) * lint fix * consolidates PeerIdFixtureB with PeerIdFixture * adds lint and tidy to insecure package * lint fix * Revert "lint fix" This reverts commit 9b1a4cc. * lint fix * revert the account not found error on withdraw * define direct call types * update docs * remove unnecessary event types * . * add more contract types for testing * fix tests * skip test, requires funding (implemented in follow up PR) * unskip test * check error * • extended compile-time checks for telemetry consumer enforcing that all happy-path interfaces are implemented • extended subscriptions of telemetry consumer to receive missing events * reduced notifications consumer interface in PaceMaker, as it only emits events from `hotstuff.ParticipantConsumer` * update tests * update another state commit constant * Refactor event emmision code * use TargetEndTime in cruisectl * Update network/p2p/unicast/README.MD Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> * expose more test utility * lint * add TargetEndTime to epoch setup fixture * add register store * update LastFinalizedAndExecutedHeight * convert storage.ErrNotFound to nil * fix lint * fixes the logger * add epoch timing config flags to finalize cmd * moving ready to the select-case * moving ready to select-case * revises the error by update loop to make it irrecoverable * clean up benchmarking * adds select case for startup of subscription provider * Update network/p2p/scoring/subscription_provider.go Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> * adds documentation to subscription record cache * fixes a bug with subscription record id * adds more documentation for current cycle * represent target end time as uint64 * lint / mocks * fix epoch event docs * use unix time in block time controller * add todod for epoch fallback flag * [Access] Handle script canceled and timeout errors * update fixtures * validation of timing config flags * set target end time * add tests for epoch timing validation * change cruise-ctl-enabled to default true * disable cruise-ctl in integration tests * tweak wording in comment * remove heuristic code * remove unneeded config field and flag * [Access] Make script exec configurable * Make computation limit configurable on ENs * wip * set limit setting once * undo whitespace changes * add storehouse loader * add loaders * add comments update log * add comments * update loader * add extending block snapshot * fix tests * fix lint * update interface * update tests * fix lint * update committer * update mocks * update committer tests * refactor collector * update mocks * update bootstrap * fix noop committer * fix computer_test * fix tests * refactor test * update committer tests * fix tests * wip - begin adding duration * add TargetDuration to models, conversion * bump core-contracts version got this error: ``` go: module github.com/onflow/flow-core-contracts@9e8417b found (v0.0.0-20231120143830-9e8417b56122), but does not contain package github.com/onflow/flow-core-contracts/lib/go/templates ``` Maybe because templates did not change since previous version? * update state commitment constants in tests * tidy * update mocks * track target duration in block time ctl * remove transition_time * update tests * Update engine/access/rpc/backend/backend_scripts_test.go Co-authored-by: Gregor G. <75445744+sideninja@users.noreply.github.com> * fix last 2 tests - add helper functions for concisely converting between various time/duration types. - use ns-level precision in view measurement, primarily so that we can verify this implementation is consistent with the Python simulation. For real-world, second-level precision is likely fine. * Update consensus/hotstuff/cruisectl/block_time_controller.go Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> * Update consensus/hotstuff/cruisectl/block_time_controller_test.go * Update consensus/hotstuff/cruisectl/block_time_controller_test.go * lint * add target duration * fix committer tests * add comment * more descriptive util names * update tests * Added implementation for execution api engine * Added tests for execution api engine * pass through root block in exe state bootstrap * remove hard-coded genesis in Bootstrap The bootstrap was previously hard-coded to use the genesis block, even if a differing block was generated. * setup equality checks new fields * update conversion and add tests * Fixed issues based on comments * Added accidentally removed code * Updated implementations following protobuf changes,updated mocks * Linted * [Access] Update websockets event streaming to return JSON-CDC encoded events * Added tests for sentinel errors * Update engine/execution/rpc/engine.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * update dependencies - add explicit import for problematic package * lint * conditionally default to hard-coded genesis * update NewStorageSnapshot * update mocks * update tests * refactor script engine * update mocks * fix tests * fix tests * remove scripts engine tests * update errors * update tests * refactor tests * test CreateSnapshot * add executing block snapshot * reuse convert functions * add block_end_snapshot tests * remove changes * Apply suggestions from code review Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * add todo * Update engine/execution/storehouse/block_end_snapshot_test.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * Update engine/execution/storehouse/block_end_snapshot_test.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * fix lint * update comment * add back interface * update getFromStorage * handle not found case * add IsBlockExcuted * update state commmitment by block id * update mocks * fix lint * update unexecuted_loader * fix ingestion tests * fix stop control * use IsParentExecuted * fix loader tests * Fix bug in reencoding and update tests * Apply suggestions from code review Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> * add docs * add docs for config setter/getters * Apply suggestions from code review Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> * update docs * address review feedback * gofmt * address review feedback * correct comment * add default timing flag to bn2 * lint * bump flow-go crypto version to v0.24.10 * update tests * state commitment constants * update flow-emu version * update core-contracts version and state commitment constants This is just to get tests to pass, all these changes will be overwritten with the update to version v0.15.0 in #5027 * make tidy * update test --------- Co-authored-by: Yahya Hassanzadeh <yhassanzadeh13@ku.edu.tr> Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh@ieee.org> Co-authored-by: Bastian Müller <bastian@turbolent.com> Co-authored-by: ramtinms <ramtin.seraj@dapperlabs.com> Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> Co-authored-by: Janez Podhostnik <67895329+janezpodhostnik@users.noreply.github.com> Co-authored-by: Janez Podhostnik <janez.podhostnik@gmail.com> Co-authored-by: Ramtin M. Seraj <ramtinms@users.noreply.github.com> Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> Co-authored-by: Leo Zhang (zhangchiqing) <zhangchiqing@gmail.com> Co-authored-by: Gregor G <75445744+sideninja@users.noreply.github.com> Co-authored-by: Jan Bernatik <jan.bernatik@dapperlabs.com> Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> Co-authored-by: Andrii <andriy.dyachuk95@gmail.com> Co-authored-by: Yurii Oleksyshyn <yuraolex@gmail.com> Co-authored-by: Kan Zhang <kan@dapperlabs.com>
* prefix with tests InMemoryRegister * use t.Run * Apply suggestions from code review Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * address review comments * Apply suggestions from code review Co-authored-by: Gregor G. <75445744+sideninja@users.noreply.github.com> * fix linter * fix linter * fix lint * use RegisterEntries * add chainhash to integration * add chainhash to insecure * add chainhash to integration * adds duration to the startup log * update mocks * adds TestNewSubscriptionRecordCache * adds TestGetSubscribedTopics * adds TestDuplicateTopics * adds test move update cycle * adds TestSubscriptionValidator_Integration * adds TestMoveUpdateCycleWithDifferentPeers * update emulator version * updates mocks * fixes build errors in insecure package * adds TestSubscriptionProvider_GetSubscribedTopics_SkippingUnknownPeers * minor fixes * add comment explainin idProvider mock expectations * use unittest random string * add comment about continue statement - remove obsolete continue statement * Update fixtures.go * Added error filtering for CB to pass some gRPC errors. * Removed unnecessary code * Removed unnecessary code * small fixes * fixes merge conflicts * remove unnecessary variable declaration * add support for testnet chain * generalize support for all chains * lint fix * restoore gating EVM setup behind feature flag * lint fix * consolidates PeerIdFixtureB with PeerIdFixture * adds lint and tidy to insecure package * lint fix * Revert "lint fix" This reverts commit 9b1a4cc. * lint fix * revert the account not found error on withdraw * define direct call types * update docs * remove unnecessary event types * . * add more contract types for testing * fix tests * skip test, requires funding (implemented in follow up PR) * unskip test * check error * • extended compile-time checks for telemetry consumer enforcing that all happy-path interfaces are implemented • extended subscriptions of telemetry consumer to receive missing events * reduced notifications consumer interface in PaceMaker, as it only emits events from `hotstuff.ParticipantConsumer` * update tests * Refactor event emmision code * Update network/p2p/unicast/README.MD Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> * expose more test utility * lint * add register store * update LastFinalizedAndExecutedHeight * convert storage.ErrNotFound to nil * fix lint * fixes the logger * moving ready to the select-case * moving ready to select-case * revises the error by update loop to make it irrecoverable * clean up benchmarking * adds select case for startup of subscription provider * Update network/p2p/scoring/subscription_provider.go Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> * adds documentation to subscription record cache * fixes a bug with subscription record id * adds more documentation for current cycle * fix epoch event docs * [Access] Handle script canceled and timeout errors * [Access] Make script exec configurable * Make computation limit configurable on ENs * set limit setting once * undo whitespace changes * add storehouse loader * add loaders * add comments update log * add comments * update loader * add extending block snapshot * fix tests * fix lint * update interface * update tests * fix lint * update committer * update mocks * update committer tests * refactor collector * update mocks * update bootstrap * fix noop committer * fix computer_test * fix tests * refactor test * update committer tests * fix tests * Update engine/access/rpc/backend/backend_scripts_test.go Co-authored-by: Gregor G. <75445744+sideninja@users.noreply.github.com> * fix committer tests * add comment * update tests * Added implementation for execution api engine * Added tests for execution api engine * Fixed issues based on comments * Added accidentally removed code * Updated implementations following protobuf changes,updated mocks * Linted * [Access] Update websockets event streaming to return JSON-CDC encoded events * Added tests for sentinel errors * Update engine/execution/rpc/engine.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * update NewStorageSnapshot * update mocks * update tests * refactor script engine * update mocks * fix tests * fix tests * remove scripts engine tests * update errors * update tests * refactor tests * test CreateSnapshot * add executing block snapshot * reuse convert functions * add block_end_snapshot tests * remove changes * Apply suggestions from code review Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * add todo * Update engine/execution/storehouse/block_end_snapshot_test.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * Update engine/execution/storehouse/block_end_snapshot_test.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * fix lint * update comment * add back interface * update getFromStorage * handle not found case * add IsBlockExcuted * update state commmitment by block id * update mocks * fix lint * update unexecuted_loader * fix ingestion tests * fix stop control * use IsParentExecuted * fix loader tests * Fix bug in reencoding and update tests * Added test to emulate errors treated as success for cb * Replaced check with switch --------- Co-authored-by: Leo Zhang (zhangchiqing) <zhangchiqing@gmail.com> Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> Co-authored-by: Gregor G. <75445744+sideninja@users.noreply.github.com> Co-authored-by: Bastian Müller <bastian@turbolent.com> Co-authored-by: Gregor Gololicic <gregor.gololicic@dapperlabs.com> Co-authored-by: Yahya Hassanzadeh <yhassanzadeh13@ku.edu.tr> Co-authored-by: Ramtin M. Seraj <ramtinms@users.noreply.github.com> Co-authored-by: ramtinms <ramtin.seraj@dapperlabs.com> Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh@ieee.org> Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> Co-authored-by: Khalil Claybon <kclaybon1@gmail.com> Co-authored-by: Andrii Slisarchuk <andriyslisarchuk@gmail.com> Co-authored-by: Andrii Slisarchuk <Guitarheroua@users.noreply.github.com> Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> Co-authored-by: Janez Podhostnik <67895329+janezpodhostnik@users.noreply.github.com> Co-authored-by: Janez Podhostnik <janez.podhostnik@gmail.com> Co-authored-by: Jan Bernatik <jan.bernatik@dapperlabs.com> Co-authored-by: Andrii <andriy.dyachuk95@gmail.com> Co-authored-by: Yurii Oleksyshyn <yuraolex@gmail.com> Co-authored-by: Kan Zhang <kan@dapperlabs.com>
* define direct call types * update docs * remove unnecessary event types * . * add more contract types for testing * fix tests * skip test, requires funding (implemented in follow up PR) * unskip test * check error * • extended compile-time checks for telemetry consumer enforcing that all happy-path interfaces are implemented • extended subscriptions of telemetry consumer to receive missing events * reduced notifications consumer interface in PaceMaker, as it only emits events from `hotstuff.ParticipantConsumer` * update tests * Refactor event emmision code * moves fixtures from insecure to p2ptest * adds gossipsub message fixture function * refactors test fixtures * creates GossipSubRpcFixture * adds documentation * adds godoc * Update network/p2p/unicast/README.MD Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> * expose more test utility * lint * add register store * update LastFinalizedAndExecutedHeight * convert storage.ErrNotFound to nil * fix lint * fixes the logger * moving ready to the select-case * moving ready to select-case * revises the error by update loop to make it irrecoverable * clean up benchmarking * adds select case for startup of subscription provider * Update network/p2p/scoring/subscription_provider.go Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> * adds documentation to subscription record cache * fixes a bug with subscription record id * adds more documentation for current cycle * untangled Register API handler * fix epoch event docs * chnages per suggestions * remove mock * [Access] Handle script canceled and timeout errors * [Access] Make script exec configurable * Make computation limit configurable on ENs * set limit setting once * undo whitespace changes * add storehouse loader * add loaders * add comments update log * add comments * update loader * add extending block snapshot * fix tests * fix lint * update interface * update tests * fix lint * update committer * update mocks * update committer tests * refactor collector * update mocks * update bootstrap * fix noop committer * fix computer_test * fix tests * refactor test * update committer tests * fix tests * Changed input parameters for new methods * Updated according to comments * Update engine/access/rpc/backend/backend_scripts_test.go Co-authored-by: Gregor G. <75445744+sideninja@users.noreply.github.com> * fix committer tests * add comment * update tests * Added implementation for execution api engine * Added tests for execution api engine * Added implementation for method for returning tx result * Fixed issues based on comments * Added accidentally removed code * Updated implementations following protobuf changes,updated mocks * Linted * [Access] Update websockets event streaming to return JSON-CDC encoded events * Added tests for sentinel errors * Update engine/execution/rpc/engine.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * Generated mocks, added missing argument to method: * fix per suggestion * cleanup * fix mocks * lint * update NewStorageSnapshot * update mocks * update tests * refactor script engine * update mocks * fix tests * fix tests * remove scripts engine tests * update errors * update tests * refactor tests * test CreateSnapshot * add executing block snapshot * reuse convert functions * add block_end_snapshot tests * remove changes * Apply suggestions from code review Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * add todo * Update engine/execution/storehouse/block_end_snapshot_test.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * Update engine/execution/storehouse/block_end_snapshot_test.go Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> * fix lint * update comment * add back interface * update getFromStorage * handle not found case * add IsBlockExcuted * update state commmitment by block id * update mocks * fix lint * update unexecuted_loader * fix ingestion tests * fix stop control * use IsParentExecuted * chnages to error handling * Added test * fix loader tests * Fix bug in reencoding and update tests * Fixd remarks * Added test to emulate errors treated as success for cb * Added test cases for checking wrong input * Merged and Linted * Returned back apiTimeout and used it in connection factory * Updated test * Linted * remove index reporter for registersAsync * Added parameter blockID to GetSystemTransaction, so it will be more clear that it's return system tx for block, generated mocks, fixed test * Updated existing functional test to check upstream failover * use atomic pointer * Updated documentaion according to comments * Upgraded godoc * Replaced check with switch * Added event with payload to test decoding, linted * Removed replace and added current version of flow proto * Replace flow-emulator for integration tests * changes per suggestions * correct compareAndSwap * make tidy * Fixed errors * Added more comments for tests * changed version of flow-emulator * Removed comments * modifies the flow-emulator version pinned to match replace statement See: - onflow/flow-emulator#514 - #5049 --------- Co-authored-by: ramtinms <ramtin.seraj@dapperlabs.com> Co-authored-by: Bastian Müller <bastian@turbolent.com> Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co> Co-authored-by: Andrii Slisarchuk <Guitarheroua@users.noreply.github.com> Co-authored-by: Janez Podhostnik <67895329+janezpodhostnik@users.noreply.github.com> Co-authored-by: Janez Podhostnik <janez.podhostnik@gmail.com> Co-authored-by: Ramtin M. Seraj <ramtinms@users.noreply.github.com> Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh@ieee.org> Co-authored-by: Yahya Hassanzadeh <yhassanzadeh13@ku.edu.tr> Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com> Co-authored-by: Leo Zhang (zhangchiqing) <zhangchiqing@gmail.com> Co-authored-by: Gregor G <75445744+sideninja@users.noreply.github.com> Co-authored-by: Jan Bernatik <jan.bernatik@dapperlabs.com> Co-authored-by: Amlandeep Bhadra <amlandeep1912@gmail.com> Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com> Co-authored-by: Andrii <andriy.dyachuk95@gmail.com> Co-authored-by: UlyanaAndrukhiv <u.andrukhiv@gmail.com> Co-authored-by: Yurii Oleksyshyn <yuraolex@gmail.com> Co-authored-by: Amlandeep Bhadra <koko1123@users.noreply.github.com> Co-authored-by: Andrii Slisarchuk <andriyslisarchuk@gmail.com> Co-authored-by: Kan Zhang <kan@dapperlabs.com>
same as before, but merged to master and tagged
Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co>
Co-authored-by: Alexander Hentschel <alex.hentschel@axiomzen.co>
fix tps bash scipt add reference block to setupEVM tx
SupunS
force-pushed
the
supun/sync-stable-cadence-master
branch
from
8f8d093 to
041dd28
Compare
SupunS
force-pushed
the
supun/sync-stable-cadence-master
branch
from
041dd28 to
873396d
Compare
|
There is one test failing, not sure why: |
SupunS
requested review from
peterargue,
zhangchiqing,
yhassanzadeh13,
ramtinms,
janezpodhostnik,
AlexHentschel,
durkmurder and
jordanschalm
as code owners
|
@SupunS I can take a look at the test. |
|
Thank you! Looking at the conflict resolution, it looks like the update of |
|
I fixed the wal dependency in 21d646a, but now there's a build error because of it 🤔 |
|
@zhangchiqing that wal dependency was bumped in 38d3730, can you please have a look? |
|
I removed the EVM load type from the load test since the load test for EVM is not migrated to cadence 1.0 yet. |
|
Fixed the wal issue by re-adding the revert of 873396d |
turbolent
approved these changes
Feb 15, 2024
|
Thank you all! |
janezpodhostnik
approved these changes
Feb 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts
commit cca11b735c81fc0f502071694f99075de0cfdbbe Merge: b11eeaa896 ae8ab050ac Author: Supun Setunga <supun.setunga@gmail.com> Date: Thu Feb 15 16:32:56 2024 +0530 Merge branch 'master' of https://github.com/onflow/flow-go into supun/sync-stable-cadence-master diff --git a/fvm/evm/evm_test.go b/fvm/evm/evm_test.go remerge CONFLICT (content): Merge conflict in fvm/evm/evm_test.go index 6a1bd5f10e..43c7b18eb5 100644 --- a/fvm/evm/evm_test.go +++ b/fvm/evm/evm_test.go @@ -102,8 +102,8 @@ func TestEVMAddressDeposit(t *testing.T) { access(all) fun main() { - let admin = getAuthAccount(%s) - .borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! + let admin = getAuthAccount<auth(BorrowValue) &Account>(%s) + .storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! let minter <- admin.createNewMinter(allowedAmount: 1.23) let vault <- minter.mintTokens(amount: 1.23) destroy minter @@ -120,22 +120,12 @@ func TestEVMAddressDeposit(t *testing.T) { script := fvm.Script(code) -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) - access(all) - fun main() { - let admin = getAuthAccount<auth(BorrowValue) &Account>(%s) - .storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! - let minter <- admin.createNewMinter(allowedAmount: 1.23) - let vault <- minter.mintTokens(amount: 1.23) - destroy minter -======= executionSnapshot, output, err := vm.Run( ctx, script, snapshot) require.NoError(t, err) require.NoError(t, output.Err) ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) // TODO: _ = executionSnapshot @@ -162,8 +152,8 @@ func TestCOAWithdraw(t *testing.T) { access(all) fun main(): UFix64 { - let admin = getAuthAccount(%s) - .borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! + let admin = getAuthAccount<auth(BorrowValue) &Account>(%s) + .storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! let minter <- admin.createNewMinter(allowedAmount: 2.34) let vault <- minter.mintTokens(amount: 2.34) destroy minter @@ -171,22 +161,13 @@ func TestCOAWithdraw(t *testing.T) { let bridgedAccount <- EVM.createBridgedAccount() bridgedAccount.deposit(from: <-vault) - let bal = EVM.Balance(0) + let bal = EVM.Balance(attoflow: 0) bal.setFLOW(flow: 1.23) let vault2 <- bridgedAccount.withdraw(balance: bal) let balance = vault2.balance destroy bridgedAccount destroy vault2 -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) - access(all) - fun main(): UFix64 { - let admin = getAuthAccount<auth(BorrowValue) &Account>(%s) - .storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! - let minter <- admin.createNewMinter(allowedAmount: 2.34) - let vault <- minter.mintTokens(amount: 2.34) - destroy minter -======= return balance } `, @@ -194,25 +175,15 @@ func TestCOAWithdraw(t *testing.T) { sc.FlowToken.Address.HexWithPrefix(), sc.FlowServiceAccount.Address.HexWithPrefix(), )) ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) script := fvm.Script(code) -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) - let bal = EVM.Balance(attoflow: 0) - bal.setFLOW(flow: 1.23) - let vault2 <- bridgedAccount.withdraw(balance: bal) - let balance = vault2.balance - destroy bridgedAccount - destroy vault2 -======= executionSnapshot, output, err := vm.Run( ctx, script, snapshot) require.NoError(t, err) require.NoError(t, output.Err) ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) // TODO: _ = executionSnapshot @@ -238,8 +209,8 @@ func TestBridgedAccountDeploy(t *testing.T) { access(all) fun main(): [UInt8; 20] { - let admin = getAuthAccount(%s) - .borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! + let admin = getAuthAccount<auth(BorrowValue) &Account>(%s) + .storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! let minter <- admin.createNewMinter(allowedAmount: 2.34) let vault <- minter.mintTokens(amount: 2.34) destroy minter @@ -488,18 +459,8 @@ func RunWithNewEnvironment( } ctx := fvm.NewContext(opts...) -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) - access(all) - fun main(): [UInt8; 20] { - let admin = getAuthAccount<auth(BorrowValue) &Account>(%s) - .storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)! - let minter <- admin.createNewMinter(allowedAmount: 2.34) - let vault <- minter.mintTokens(amount: 2.34) - destroy minter -======= vm := fvm.NewVirtualMachine() snapshotTree := snapshot.NewSnapshotTree(backend) ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) baseBootstrapOpts := []fvm.BootstrapProcedureOption{ fvm.WithInitialTokenSupply(unittest.GenesisTokenSupply), diff --git a/fvm/fvm_test.go b/fvm/fvm_test.go remerge CONFLICT (content): Merge conflict in fvm/fvm_test.go index d76035f99a..752a189ed9 100644 --- a/fvm/fvm_test.go +++ b/fvm/fvm_test.go @@ -2986,7 +2986,7 @@ func TestEVM(t *testing.T) { require.NoError(t, err) require.NoError(t, output.Err) -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) + require.Len(t, output.Events, 6) evmLocation := types.EVMLocation{} @@ -3009,14 +3009,6 @@ func TestEVM(t *testing.T) { }, eventTypeIDs, ) -======= - require.Len(t, output.Events, 6) - - evmLocation := types.EVMLocation{} - txExe, blockExe := output.Events[4], output.Events[5] - assert.Equal(t, evmLocation.TypeID(nil, string(types.EventTypeTransactionExecuted)), common.TypeID(txExe.Type)) - assert.Equal(t, evmLocation.TypeID(nil, string(types.EventTypeBlockExecuted)), common.TypeID(blockExe.Type)) ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) }), ) } diff --git a/go.mod b/go.mod remerge CONFLICT (content): Merge conflict in go.mod index b9ecb8d6f7..26193f082c 100644 --- a/go.mod +++ b/go.mod @@ -54,15 +54,9 @@ require ( github.com/onflow/cadence v1.0.0-M7 github.com/onflow/crypto v0.25.0 github.com/onflow/flow v0.3.4 -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7 github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240206003101-928bf99024d7 github.com/onflow/flow-go-sdk v1.0.0-M4 -======= - github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 - github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 - github.com/onflow/flow-go-sdk v0.44.0 ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onflow/flow/protobuf/go/flow v0.3.7 github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 @@ -112,15 +106,9 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/hashicorp/golang-lru/v2 v2.0.2 github.com/mitchellh/mapstructure v1.5.0 -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240205224107-320aa3cf09e0 github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6 github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d -======= - github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 - github.com/onflow/flow-nft/lib/go/contracts v1.1.0 - github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/slok/go-http-metrics v0.10.0 github.com/sony/gobreaker v0.5.0 google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b diff --git a/go.sum b/go.sum remerge CONFLICT (content): Merge conflict in go.sum index 274501c850..8084693a6c 100644 --- a/go.sum +++ b/go.sum @@ -1233,13 +1233,9 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80/go.mod h1:gzbVz57IDJgQ9rLQwfSk696JGWof8ftznEL9GoAv3NI= -======= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -1397,10 +1393,7 @@ github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= github.com/getsentry/sentry-go v0.18.0 h1:MtBW5H9QgdcJabtZcuJG80BMOwaBpkRDZkxRkNC1sN0= github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs= -======= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -1711,10 +1704,7 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 h1:lLT7ZLSzGLI08vc9cpd+tYmNWjdKDqyr/2L+f6U12Fk= github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/guptarohit/asciigraph v0.5.5/go.mod h1:dYl5wwK4gNsnFf9Zp+l06rFiDZ5YtXM6x7SRWZ3KGag= -======= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU= github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= @@ -1779,13 +1769,9 @@ github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPt github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= -======= -github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= @@ -2477,10 +2463,7 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -======= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -2499,7 +2482,6 @@ github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg= github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= github.com/onflow/flow v0.3.4 h1:FXUWVdYB90f/rjNcY0Owo30gL790tiYff9Pb/sycXYE= github.com/onflow/flow v0.3.4/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7 h1:OI/4F2NK/X/4x3dTUFFDGtuOsSa9pX+jjBeSEcBrY/M= github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7/go.mod h1:GK+Ik1K3L3v8xmHmRQv5yxJz81lYhdYSNm0PQ63Xrws= github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240206003101-928bf99024d7 h1:WAx8ftVz1BeXiKvQ9gLKEf1J3NBWK26Pbczd0iH4C6I= @@ -2512,36 +2494,14 @@ github.com/onflow/flow-go-sdk v1.0.0-M4/go.mod h1:HIGOKJVR47QNs81sPHmZDVcLr+syNk github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6 h1:/2vvjKkWG/3cKP3IpgiGNqXi0yskn4GmNTjmeCwMoz8= github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE= github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= -======= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc= -github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M= -github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU= -github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74= -github.com/onflow/flow-go-sdk v0.44.0 h1:gVRLcZ6LUNs/5mzHDx0mp4mEnBAWD62O51P4/nYm4rE= -github.com/onflow/flow-go-sdk v0.44.0/go.mod h1:mm1Fi2hiMrexNMwRzTrAN2zwTvlP8iQ5CF2JSAgJR8U= -github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ= -github.com/onflow/flow-nft/lib/go/contracts v1.1.0 h1:rhUDeD27jhLwOqQKI/23008CYfnqXErrJvc4EFRP2a0= -github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9jxdwoTuuhjK8WYWXTyLkIigZY= -github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk= github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d h1:QcOAeEyF3iAUHv21LQ12sdcsr0yFrJGoGLyCAzYYtvI= github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d/go.mod h1:GCPpiyRoHncdqPj++zPr9ZOYBX4hpJ0pYZRYqSE8VKk= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d h1:gAEqYPn3DS83rHIKEpsajnppVD1+zwuYPFyeDVFaQvg= github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d/go.mod h1:iMC8gkLqu4nkbkAla5HkSBb+FGyQOZiWz3DYm2wSXCk= -======= -github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8= -github.com/onflow/sdks v0.5.0/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= -github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b h1:6O/BEmA99PDT5QVjoJgrYlGsWnpxGJTAMmsC+V9gyds= -github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b/go.mod h1:iMC8gkLqu4nkbkAla5HkSBb+FGyQOZiWz3DYm2wSXCk= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -2629,11 +2589,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -======= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -2669,15 +2626,9 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= -======= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= -github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) 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/sconfig v0.1.0 h1:xfWqW+TRpih7mXZIqKYTmpRhlZLQ1kbxV8EjllPv76s= @@ -2802,11 +2753,8 @@ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= -======= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= diff --git a/insecure/go.mod b/insecure/go.mod remerge CONFLICT (content): Merge conflict in insecure/go.mod index 89c0c94206..ff070d86b9 100644 --- a/insecure/go.mod +++ b/insecure/go.mod @@ -204,7 +204,6 @@ require ( github.com/multiformats/go-multistream v0.4.1 // indirect github.com/multiformats/go-varint v0.0.7 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f // indirect github.com/onflow/cadence v1.0.0-M7 // indirect github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7 // indirect @@ -216,19 +215,6 @@ require ( github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d // indirect github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba // indirect github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d // indirect -======= - github.com/onflow/atree v0.6.0 // indirect - github.com/onflow/cadence v0.42.9 // indirect - github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 // indirect - github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 // indirect - github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 // indirect - github.com/onflow/flow-go-sdk v0.44.0 // indirect - github.com/onflow/flow-nft/lib/go/contracts v1.1.0 // indirect - github.com/onflow/flow/protobuf/go/flow v0.3.7 // indirect - github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d // indirect - github.com/onflow/sdks v0.5.0 // indirect - github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b // indirect ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onsi/ginkgo/v2 v2.9.7 // indirect github.com/opencontainers/runtime-spec v1.0.2 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect diff --git a/insecure/go.sum b/insecure/go.sum remerge CONFLICT (content): Merge conflict in insecure/go.sum index 939f0ff921..d225043978 100644 --- a/insecure/go.sum +++ b/insecure/go.sum @@ -2467,7 +2467,6 @@ github.com/onflow/cadence v1.0.0-M7 h1:hb4LK9lUbFdnDdfU8oqJGSVJtmkOzxwKomhmDcP/F github.com/onflow/cadence v1.0.0-M7/go.mod h1:a4mccDU90hmuxCLUFzs9J/ANG/rYbFa36h4Z0bBAqNU= github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg= github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7 h1:OI/4F2NK/X/4x3dTUFFDGtuOsSa9pX+jjBeSEcBrY/M= github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7/go.mod h1:GK+Ik1K3L3v8xmHmRQv5yxJz81lYhdYSNm0PQ63Xrws= github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240206003101-928bf99024d7 h1:WAx8ftVz1BeXiKvQ9gLKEf1J3NBWK26Pbczd0iH4C6I= @@ -2480,36 +2479,14 @@ github.com/onflow/flow-go-sdk v1.0.0-M4/go.mod h1:HIGOKJVR47QNs81sPHmZDVcLr+syNk github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6 h1:/2vvjKkWG/3cKP3IpgiGNqXi0yskn4GmNTjmeCwMoz8= github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE= github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= -======= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc= -github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M= -github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU= -github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74= -github.com/onflow/flow-go-sdk v0.44.0 h1:gVRLcZ6LUNs/5mzHDx0mp4mEnBAWD62O51P4/nYm4rE= -github.com/onflow/flow-go-sdk v0.44.0/go.mod h1:mm1Fi2hiMrexNMwRzTrAN2zwTvlP8iQ5CF2JSAgJR8U= -github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ= -github.com/onflow/flow-nft/lib/go/contracts v1.1.0 h1:rhUDeD27jhLwOqQKI/23008CYfnqXErrJvc4EFRP2a0= -github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9jxdwoTuuhjK8WYWXTyLkIigZY= -github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk= github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d h1:QcOAeEyF3iAUHv21LQ12sdcsr0yFrJGoGLyCAzYYtvI= github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d/go.mod h1:GCPpiyRoHncdqPj++zPr9ZOYBX4hpJ0pYZRYqSE8VKk= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d h1:gAEqYPn3DS83rHIKEpsajnppVD1+zwuYPFyeDVFaQvg= github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d/go.mod h1:iMC8gkLqu4nkbkAla5HkSBb+FGyQOZiWz3DYm2wSXCk= -======= -github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8= -github.com/onflow/sdks v0.5.0/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= -github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b h1:6O/BEmA99PDT5QVjoJgrYlGsWnpxGJTAMmsC+V9gyds= -github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b/go.mod h1:iMC8gkLqu4nkbkAla5HkSBb+FGyQOZiWz3DYm2wSXCk= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/integration/benchmark/scripts.go b/integration/benchmark/scripts.go deleted file mode 100644 remerge CONFLICT (modify/delete): integration/benchmark/scripts.go deleted in ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) and modified in b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7). Version b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) of integration/benchmark/scripts.go left in tree. index ca256f40cf..0000000000 --- a/integration/benchmark/scripts.go +++ /dev/null @@ -1,137 +0,0 @@ -package benchmark - -import ( - _ "embed" - "encoding/hex" - "fmt" - "math/rand" - "strings" - - "github.com/onflow/cadence" - - flowsdk "github.com/onflow/flow-go-sdk" -) - -//go:embed scripts/tokenTransferTransaction.cdc -var tokenTransferTransactionTemplate string - -// TokenTransferTransaction returns a transaction script for transferring `amount` flow tokens to `toAddr` address -func TokenTransferTransaction(ftAddr, flowToken, toAddr *flowsdk.Address, amount float64) (*flowsdk.Transaction, error) { - - withFTAddr := strings.Replace(tokenTransferTransactionTemplate, "0xFUNGIBLETOKENADDRESS", "0x"+ftAddr.Hex(), 1) - withFlowTokenAddr := strings.Replace(withFTAddr, "0xTOKENADDRESS", "0x"+flowToken.Hex(), 1) - - tx := flowsdk.NewTransaction(). - SetScript([]byte(withFlowTokenAddr)) - - cadAmount, err := cadence.NewUFix64(fmt.Sprintf("%f", amount)) - if err != nil { - return nil, err - } - - err = tx.AddArgument(cadAmount) - if err != nil { - return nil, err - } - err = tx.AddArgument(cadence.BytesToAddress(toAddr.Bytes())) - if err != nil { - return nil, err - } - - return tx, nil -} - -//go:embed scripts/addKeyToAccountTransaction.cdc -var addKeyToAccountTransactionTemplate string - -// AddKeyToAccountScript returns a transaction script to add keys to an account -func AddKeyToAccountScript() ([]byte, error) { - return []byte(addKeyToAccountTransactionTemplate), nil -} - -//go:embed scripts/createAccountsTransaction.cdc -var createAccountsScriptTemplate string - -// CreateAccountsScript returns a transaction script for creating an account -func CreateAccountsScript(fungibleToken, flowToken flowsdk.Address) []byte { - return []byte(fmt.Sprintf(createAccountsScriptTemplate, fungibleToken, flowToken)) -} - -//go:embed scripts/myFavContract.cdc -var myFavContract string - -//go:embed scripts/deployingMyFavContractTransaction.cdc -var deployingMyFavContractScriptTemplate string - -func DeployingMyFavContractScript() []byte { - return []byte(fmt.Sprintf(deployingMyFavContractScriptTemplate, "MyFavContract", hex.EncodeToString([]byte(myFavContract)))) - -} - -//go:embed scripts/eventHeavyTransaction.cdc -var eventHeavyScriptTemplate string - -func EventHeavyScript(favContractAddress flowsdk.Address) []byte { - return []byte(fmt.Sprintf(eventHeavyScriptTemplate, favContractAddress)) -} - -//go:embed scripts/compHeavyTransaction.cdc -var compHeavyScriptTemplate string - -func ComputationHeavyScript(favContractAddress flowsdk.Address) []byte { - return []byte(fmt.Sprintf(compHeavyScriptTemplate, favContractAddress)) -} - -//go:embed scripts/ledgerHeavyTransaction.cdc -var ledgerHeavyScriptTemplate string - -func LedgerHeavyScript(favContractAddress flowsdk.Address) []byte { - return []byte(fmt.Sprintf(ledgerHeavyScriptTemplate, favContractAddress)) -} - -//go:embed scripts/execDataHeavyTransaction.cdc -var execDataHeavyScriptTemplate string - -func ExecDataHeavyScript(favContractAddress flowsdk.Address) []byte { - return []byte(fmt.Sprintf(execDataHeavyScriptTemplate, favContractAddress)) -} - -//go:embed scripts/constExecCostTransaction.cdc -var constExecTransactionTemplate string - -func generateRandomStringWithLen(commentLen uint) string { - const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - bytes := make([]byte, commentLen) - for i := range bytes { - bytes[i] = letterBytes[rand.Intn(len(letterBytes))] - } - return string(bytes) -} - -func generateAuthAccountParamList(authAccountNum uint) string { - authAccountList := []string{} - for i := uint(0); i < authAccountNum; i++ { - authAccountList = append(authAccountList, fmt.Sprintf("acct%d: &Account", i+1)) - } - return strings.Join(authAccountList, ", ") -} - -// ConstExecCostTransaction returns a transaction script for constant execution size (0) -func ConstExecCostTransaction(numOfAuthorizer, commentSizeInByte uint) []byte { - commentStr := generateRandomStringWithLen(commentSizeInByte) - authAccountListStr := generateAuthAccountParamList(numOfAuthorizer) - - // the transaction template has two `%s`: #1 is for comment; #2 is for AuthAccount param list - return []byte(fmt.Sprintf(constExecTransactionTemplate, commentStr, authAccountListStr)) -} - -func bytesToCadenceArray(l []byte) cadence.Array { - values := make([]cadence.Value, len(l)) - for i, b := range l { - values[i] = cadence.NewUInt8(b) - } - - return cadence.NewArray(values) -} - -// TODO add tx size heavy similar to add keys diff --git a/integration/go.mod b/integration/go.mod remerge CONFLICT (content): Merge conflict in integration/go.mod index 2b0b6adeb9..bbefd022d9 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -22,19 +22,11 @@ require ( github.com/ipfs/go-ipfs-blockstore v1.3.0 github.com/onflow/cadence v1.0.0-M7 github.com/onflow/crypto v0.25.0 -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7 github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240206003101-928bf99024d7 github.com/onflow/flow-emulator v1.0.0-M2.0.20240213001509-046672c2367a github.com/onflow/flow-go v0.33.2-0.20240213000303-9fb4c62e8291 github.com/onflow/flow-go-sdk v1.0.0-M4 -======= - github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 - github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 - github.com/onflow/flow-emulator v0.58.1-0.20240130123529-733cc9417abc - github.com/onflow/flow-go v0.32.7 - github.com/onflow/flow-go-sdk v0.44.0 ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000 github.com/onflow/flow/protobuf/go/flow v0.3.7 github.com/plus3it/gorecurcopy v0.0.1 @@ -263,14 +255,8 @@ require ( github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240205224107-320aa3cf09e0 // indirect github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6 // indirect github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d // indirect -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba // indirect github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d // indirect -======= - github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead // indirect - github.com/onflow/sdks v0.5.0 // indirect - github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b // indirect ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onsi/ginkgo/v2 v2.9.7 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect diff --git a/integration/go.sum b/integration/go.sum remerge CONFLICT (content): Merge conflict in integration/go.sum index aa520fb878..f093d64506 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -2542,7 +2542,6 @@ github.com/onflow/cadence v1.0.0-M7 h1:hb4LK9lUbFdnDdfU8oqJGSVJtmkOzxwKomhmDcP/F github.com/onflow/cadence v1.0.0-M7/go.mod h1:a4mccDU90hmuxCLUFzs9J/ANG/rYbFa36h4Z0bBAqNU= github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg= github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7 h1:OI/4F2NK/X/4x3dTUFFDGtuOsSa9pX+jjBeSEcBrY/M= github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7/go.mod h1:GK+Ik1K3L3v8xmHmRQv5yxJz81lYhdYSNm0PQ63Xrws= github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240206003101-928bf99024d7 h1:WAx8ftVz1BeXiKvQ9gLKEf1J3NBWK26Pbczd0iH4C6I= @@ -2557,42 +2556,14 @@ github.com/onflow/flow-go-sdk v1.0.0-M4/go.mod h1:HIGOKJVR47QNs81sPHmZDVcLr+syNk github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6 h1:/2vvjKkWG/3cKP3IpgiGNqXi0yskn4GmNTjmeCwMoz8= github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE= github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= -======= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc= -github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M= -github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo= -github.com/onflow/flow-emulator v0.58.1-0.20240130123529-733cc9417abc h1:KwGHzWXsiYajQxc2FGgQDWVEityhrfQwXgEYmksohOA= -github.com/onflow/flow-emulator v0.58.1-0.20240130123529-733cc9417abc/go.mod h1:zYCPwOMqoJK+38+Pxzl1WmN5S1x4+Fh1UIOXVgiiOck= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU= -github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74= -github.com/onflow/flow-go-sdk v0.44.0 h1:gVRLcZ6LUNs/5mzHDx0mp4mEnBAWD62O51P4/nYm4rE= -github.com/onflow/flow-go-sdk v0.44.0/go.mod h1:mm1Fi2hiMrexNMwRzTrAN2zwTvlP8iQ5CF2JSAgJR8U= -github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ= -github.com/onflow/flow-go/crypto v0.25.0 h1:6lmoiAQ3APCF+nV7f4f2AXL3PuDKqQiWqRJXmjrMEq4= -github.com/onflow/flow-go/crypto v0.25.0/go.mod h1:OOb2vYcS8AOCajBClhHTJ0NKftFl1RQgTQ0+Vh4nbqk= -github.com/onflow/flow-nft/lib/go/contracts v1.1.0 h1:rhUDeD27jhLwOqQKI/23008CYfnqXErrJvc4EFRP2a0= -github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9jxdwoTuuhjK8WYWXTyLkIigZY= -github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk= github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d h1:QcOAeEyF3iAUHv21LQ12sdcsr0yFrJGoGLyCAzYYtvI= github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d/go.mod h1:GCPpiyRoHncdqPj++zPr9ZOYBX4hpJ0pYZRYqSE8VKk= -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d h1:gAEqYPn3DS83rHIKEpsajnppVD1+zwuYPFyeDVFaQvg= github.com/onflow/wal v0.0.0-20230529184820-bc9f8244608d/go.mod h1:iMC8gkLqu4nkbkAla5HkSBb+FGyQOZiWz3DYm2wSXCk= -======= -github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead h1:2j1Unqs76Z1b95Gu4C3Y28hzNUHBix7wL490e61SMSw= -github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead/go.mod h1:E3ScfQb5XcWJCIAdtIeEnr5i5l2y60GT0BTXeIHseWg= -github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8= -github.com/onflow/sdks v0.5.0/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= -github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b h1:6O/BEmA99PDT5QVjoJgrYlGsWnpxGJTAMmsC+V9gyds= -github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b/go.mod h1:iMC8gkLqu4nkbkAla5HkSBb+FGyQOZiWz3DYm2wSXCk= ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/utils/unittest/execution_state.go b/utils/unittest/execution_state.go remerge CONFLICT (content): Merge conflict in utils/unittest/execution_state.go index 388b3bd770..93beaf5e26 100644 --- a/utils/unittest/execution_state.go +++ b/utils/unittest/execution_state.go @@ -89,12 +89,8 @@ func genesisCommitHexByChainID(chainID flow.ChainID) string { if chainID == flow.Testnet { return "0bb471053b13ee0f08ca9b9fdb733f6ce8da189e57f473de2db32469f855af3e" } -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) if chainID == flow.Sandboxnet { return "e1c08b17f9e5896f03fe28dd37ca396c19b26628161506924fbf785834646ea1" } return "b037ec65e94310d43b13aab5d0f99af44edac9948a4f17cd4ca797762271630e" -======= - return "ef65504ae38f3666acdd1a3cc260620464827082a7c554751527a82bdee4dc89" ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) } diff --git a/utils/unittest/service_events_fixtures.go b/utils/unittest/service_events_fixtures.go remerge CONFLICT (content): Merge conflict in utils/unittest/service_events_fixtures.go index 50d3f5c206..120a18c379 100644 --- a/utils/unittest/service_events_fixtures.go +++ b/utils/unittest/service_events_fixtures.go @@ -657,13 +657,8 @@ func createEpochCommitEvent() cadence.Event { cadence.NewArray([]cadence.Value{ cadence.String("8c588266db5f5cda629e83f8aa04ae9413593fac19e4865d06d291c9d14fbdd9bdb86a7a12f9ef8590c79cb635e3163315d193087e9336092987150d0cd2b14ac6365f7dc93eec573752108b8c12368abb65f0652d9f644e5aed611c37926950"), cadence.String("87a339e4e5c74f089da20a33f515d8c8f4464ab53ede5a74aa2432cd1ae66d522da0c122249ee176cd747ddc83ca81090498389384201614caf51eac392c1c0a916dfdcfbbdf7363f9552b6468434add3d3f6dc91a92bbe3ee368b59b7828488"), -<<<<<<< b11eeaa896 (Merge pull request #5393 from onflow/auto-update-onflow-cadence-v1.0.0-M7) }).WithType(cadence.NewVariableSizedArrayType(cadence.StringType)), }).WithType(newFlowEpochEpochCommittedEventType()) -======= - }).WithType(cadence.NewVariableSizedArrayType(cadence.StringType{})), - }).WithType(newFlowEpochEpochCommitEventType()) ->>>>>>> ae8ab050ac (Merge pull request #5355 from onflow/khalil/6932-fix-subscription-validator-test) } func createVersionBeaconEvent() cadence.Event { @@ -894,11 +889,11 @@ func newFlowEpochEpochSetupEventType() *cadence.EventType { }, { Identifier: "targetDuration", - Type: cadence.UInt64Type{}, + Type: cadence.UInt64Type, }, { Identifier: "targetEndTime", - Type: cadence.UInt64Type{}, + Type: cadence.UInt64Type, }, }, }