Skip to content

Backport fix for access scripts to experimental-cadence-v1.8.7 #8296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterargue wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Backport fix for access scripts to experimental-cadence-v1.8.7 #8296

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2008b1a
fix script execution for scripts that invokes system contract functio…
zhangchiqing Jan 2, 2026
69a5fc7
Merge branch 'master' into peter/v0.45.0-experimental-cadence-v1.8.7-…
peterargue Jan 6, 2026
2b5aaef
remove executor.ctx.EVMEnabled
peterargue Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions fvm/script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ func (executor *scriptExecutor) executeScript() error {

chainID := executor.ctx.Chain.ChainID()

// Setup InternalEVM in both environments because:
// - Scripts execute in ScriptRuntimeEnv
// - But system contract invocations (e.g., getAccount().balance) use TxRuntimeEnv

// Setup InternalEVM in ScriptRuntimeEnv (for script execution)
err := evm.SetupEnvironment(
chainID,
executor.env,
Expand All @@ -211,6 +216,21 @@ func (executor *scriptExecutor) executeScript() error {
return err
}

// Setup InternalEVM in TxRuntimeEnv (for system contract invocations)
// This solves the problem where FlowServiceAccount (which imports EVM) needs
// InternalEVM to be available during dependency checking when invoked via
// system contracts (e.g., getAccount().balance). Without this, type checking
// fails with "cannot find variable in this scope: `InternalEVM`" because
// system contract invocations use TxRuntimeEnv, not ScriptRuntimeEnv.
err = evm.SetupEnvironment(
chainID,
executor.env,
rt.TxRuntimeEnv,
)
if err != nil {
return err
}

value, err := rt.ExecuteScript(
runtime.Script{
Source: executor.proc.Script,
Expand Down
Loading