Blockchain's vmCtx should always be updated to point to the latest He…

…ader
onflow · Sep 21, 2023 · 5566481 · 5566481
1 parent e300dd2
commit 5566481
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/emulator/blockchain.go b/emulator/blockchain.go
@@ -791,10 +791,12 @@ func configureTransactionValidator(conf config, blocks *blocks) *access.Transact
 }
 
 func (b *Blockchain) newFVMContextFromHeader(header *flowgo.Header) fvm.Context {
-	return fvm.NewContextFromParent(
+	b.vmCtx = fvm.NewContextFromParent(
 		b.vmCtx,
 		fvm.WithBlockHeader(header),
 	)
+
+	return b.vmCtx
 }
 
 func (b *Blockchain) CurrentScript() (string, string) {
@@ -1421,8 +1423,10 @@ func (b *Blockchain) executeScriptAtBlockID(script []byte, arguments [][]byte, i
 		return nil, err
 	}
 
-	header := requestedBlock.Header
-	blockContext := b.newFVMContextFromHeader(header)
+	blockContext := fvm.NewContextFromParent(
+		b.vmCtx,
+		fvm.WithBlockHeader(requestedBlock.Header),
+	)
 
 	scriptProc := fvm.Script(script).WithArguments(arguments...)
 	b.currentCode = string(script)