Get execution version from snapshot instead of state #6867
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -705,7 +705,6 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) { | |
| }, | ||
| ), | ||
| ), | ||
| ) | ||
|
|
||
| vm := fvm.NewVirtualMachine() | ||
|
|
@@ -818,7 +817,6 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) { | |
| func(_ runtime.Config) runtime.Runtime { | ||
| return rt | ||
| })), | ||
| ) | ||
|
|
||
| vm := fvm.NewVirtualMachine() | ||
|
|
@@ -933,7 +931,6 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) { | |
| func(_ runtime.Config) runtime.Runtime { | ||
| return rt | ||
| })), | ||
| ) | ||
|
|
||
| vm := fvm.NewVirtualMachine() | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,6 @@ import ( | |
| "github.com/onflow/flow-go/module" | ||
| "github.com/onflow/flow-go/module/executiondatasync/provider" | ||
| "github.com/onflow/flow-go/module/mempool/entity" | ||
| "github.com/onflow/flow-go/utils/logging" | ||
| ) | ||
|
|
||
|
|
@@ -91,7 +90,7 @@ func New( | |
| metrics module.ExecutionMetrics, | ||
| tracer module.Tracer, | ||
| me module.Local, | ||
| protoState fvm.ProtocolStateSnapshotProvider, | ||
| vmCtx fvm.Context, | ||
| committer computer.ViewCommitter, | ||
| executionDataProvider provider.Provider, | ||
|
|
@@ -140,7 +139,7 @@ func New( | |
| vm, | ||
| vmCtx, | ||
| derivedChainData, | ||
| protoState, | ||
| ) | ||
|
|
||
| e := Manager{ | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ import ( | |
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/ipfs/boxo/blockstore" | ||
| "github.com/ipfs/go-datastore" | ||
| dssync "github.com/ipfs/go-datastore/sync" | ||
| "github.com/onflow/cadence/runtime" | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,14 +110,14 @@ func NewDefaultConfig() QueryConfig { | |
| } | ||
|
|
||
| type QueryExecutor struct { | ||
| config QueryConfig | ||
| logger zerolog.Logger | ||
| metrics module.ExecutionMetrics | ||
| vm fvm.VM | ||
| vmCtx fvm.Context | ||
| derivedChainData *derived.DerivedChainData | ||
| rngLock *sync.Mutex | ||
| protocolStateSnapshot fvm.ProtocolStateSnapshotProvider | ||
| } | ||
|
|
||
| var _ Executor = &QueryExecutor{} | ||
|
|
@@ -129,20 +129,20 @@ func NewQueryExecutor( | |
| vm fvm.VM, | ||
| vmCtx fvm.Context, | ||
| derivedChainData *derived.DerivedChainData, | ||
| protocolStateSnapshot fvm.ProtocolStateSnapshotProvider, | ||
| ) *QueryExecutor { | ||
| if config.ComputationLimit > 0 { | ||
| vmCtx = fvm.NewContextFromParent(vmCtx, fvm.WithComputationLimit(config.ComputationLimit)) | ||
| } | ||
| return &QueryExecutor{ | ||
| config: config, | ||
| logger: logger, | ||
| metrics: metrics, | ||
| vm: vm, | ||
| vmCtx: vmCtx, | ||
| derivedChainData: derivedChainData, | ||
| rngLock: &sync.Mutex{}, | ||
| protocolStateSnapshot: protocolStateSnapshot, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -215,7 +215,7 @@ func (e *QueryExecutor) ExecuteScript( | |
| fvm.NewContextFromParent( | ||
| e.vmCtx, | ||
| fvm.WithBlockHeader(blockHeader), | ||
| fvm.WithProtocolStateSnapshot(e.protocolStateSnapshot.AtBlockID(blockHeader.ID())), | ||
| fvm.WithDerivedBlockData( | ||
| e.derivedChainData.NewDerivedBlockDataForScript(blockHeader.ID()))), | ||
| fvm.NewScriptWithContextAndArgs(script, requestCtx, arguments...), | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,23 @@ | ||||||
| package execution | ||||||
|
|
||||||
| import ( | ||||||
| "github.com/onflow/flow-go/fvm" | ||||||
| "github.com/onflow/flow-go/model/flow" | ||||||
| "github.com/onflow/flow-go/state/protocol" | ||||||
| ) | ||||||
|
|
||||||
| // protocolStateWrapper implements `EntropyProviderPerBlock` | ||||||
| var _ fvm.ProtocolStateSnapshotProvider = protocolStateWrapper{} | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| type protocolStateWrapper struct { | ||||||
| protocol.State | ||||||
| } | ||||||
|
|
||||||
| func (p protocolStateWrapper) AtBlockID(blockID flow.Identifier) flow.SnapshotSubset { | ||||||
| return p.State.AtBlockID(blockID) | ||||||
| } | ||||||
|
|
||||||
| // NewProtocolStateWrapper wraps a protocol.State input as an `EntropyProviderPerBlock` | ||||||
| func NewProtocolStateWrapper(s protocol.State) fvm.ProtocolStateSnapshotProvider { | ||||||
| return protocolStateWrapper{s} | ||||||
| } | ||||||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.