Merge #4059 #4066

4059: Track script/transaction procedure program depedencies r=janezpodhostnik a=janezpodhostnik

ref: onflow/cadence#1684

Change the dependency stack for transaction/script programs to always have root dependencies. The root dependencies in this case are dependencies of the script/transaction procedure itself. 

The reason we want this is to have a map of "seen" imports, so we know when we need to reapply metering and when not... which is the next/last step in this PR chain.

I added a reset (which is called when switching from the transactions happy path/normal execution to the transaction failure path/fee deduction) that clears all non address programs and dependencies tracked, to avoid any potential cache poisoning.

4066: Remove derived block/txn data from (most) tests r=pattyshack a=pattyshack

Derived txn data is now an optional parameter.  The explicit setup is no longer needed (except for programs test and benchmark)

Co-authored-by: Janez Podhostnik <[email protected]>
Co-authored-by: Patrick Lee <[email protected]>

Author: 3 people

cmd/util/ledger/reporters/fungible_token_tracker_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/onflow/flow-go/cmd/util/ledger/reporters"
 	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/fvm"
-	"github.com/onflow/flow-go/fvm/derived"
 	"github.com/onflow/flow-go/ledger"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/utils/unittest"
@@ -49,12 +48,10 @@ func TestFungibleTokenTracker(t *testing.T) {
 		reporters.NewStorageSnapshotFromPayload(payloads))
 
 	vm := fvm.NewVirtualMachine()
-	derivedBlockData := derived.NewEmptyDerivedBlockData()
 	opts := []fvm.Option{
 		fvm.WithChain(chain),
 		fvm.WithAuthorizationChecksEnabled(false),
 		fvm.WithSequenceNumberCheckAndIncrementEnabled(false),
-		fvm.WithDerivedBlockData(derivedBlockData),
 	}
 	ctx := fvm.NewContext(opts...)
 	bootstrapOptions := []fvm.BootstrapProcedureOption{
@@ -103,7 +100,7 @@ func TestFungibleTokenTracker(t *testing.T) {
 		SetScript(deployingTestContractScript).
 		AddAuthorizer(chain.ServiceAddress())
 
-	tx := fvm.Transaction(txBody, derivedBlockData.NextTxIndexForTestingOnly())
+	tx := fvm.Transaction(txBody, 0)
 	snapshot, output, err := vm.RunV2(ctx, tx, view)
 	require.NoError(t, err)
 	require.NoError(t, output.Err)
@@ -132,7 +129,7 @@ func TestFungibleTokenTracker(t *testing.T) {
 		AddArgument(jsoncdc.MustEncode(cadence.UFix64(105))).
 		AddAuthorizer(chain.ServiceAddress())
 
-	tx = fvm.Transaction(txBody, derivedBlockData.NextTxIndexForTestingOnly())
+	tx = fvm.Transaction(txBody, 0)
 	snapshot, output, err = vm.RunV2(ctx, tx, view)
 	require.NoError(t, err)
 	require.NoError(t, output.Err)

engine/execution/computation/manager_benchmark_test.go

@@ -51,7 +51,6 @@ func createAccounts(b *testing.B, vm fvm.VM, ledger state.View, num int) *testAc
 	addresses, err := testutil.CreateAccounts(
 		vm,
 		ledger,
-		derived.NewEmptyDerivedBlockData(),
 		privateKeys,
 		chain)
 	require.NoError(b, err)

engine/execution/computation/manager_test.go

@@ -60,7 +60,7 @@ func TestComputeBlockWithStorage(t *testing.T) {
 	require.NoError(t, err)
 
 	ledger := testutil.RootBootstrappedLedger(vm, execCtx)
-	accounts, err := testutil.CreateAccounts(vm, ledger, derived.NewEmptyDerivedBlockData(), privateKeys, chain)
+	accounts, err := testutil.CreateAccounts(vm, ledger, privateKeys, chain)
 	require.NoError(t, err)
 
 	tx1 := testutil.DeployCounterContractTransaction(accounts[0], chain)
@@ -705,7 +705,7 @@ func Test_EventEncodingFailsOnlyTxAndCarriesOn(t *testing.T) {
 	privateKeys, err := testutil.GenerateAccountPrivateKeys(1)
 	require.NoError(t, err)
 	ledger := testutil.RootBootstrappedLedger(vm, execCtx)
-	accounts, err := testutil.CreateAccounts(vm, ledger, derived.NewEmptyDerivedBlockData(), privateKeys, chain)
+	accounts, err := testutil.CreateAccounts(vm, ledger, privateKeys, chain)
 	require.NoError(t, err)
 
 	// setup transactions
@@ -861,14 +861,12 @@ func TestScriptStorageMutationsDiscarded(t *testing.T) {
 	vm := manager.vm
 	view := testutil.RootBootstrappedLedger(vm, ctx)
 
-	derivedBlockData := derived.NewEmptyDerivedBlockData()
-
 	// Create an account private key.
 	privateKeys, err := testutil.GenerateAccountPrivateKeys(1)
 	require.NoError(t, err)
 
 	// Bootstrap a ledger, creating accounts with the provided private keys and the root account.
-	accounts, err := testutil.CreateAccounts(vm, view, derivedBlockData, privateKeys, chain)
+	accounts, err := testutil.CreateAccounts(vm, view, privateKeys, chain)
 	require.NoError(t, err)
 	account := accounts[0]
 	address := cadence.NewAddress(account)

engine/execution/computation/programs_test.go

@@ -47,7 +47,6 @@ func TestPrograms_TestContractUpdates(t *testing.T) {
 	accounts, err := testutil.CreateAccounts(
 		vm,
 		ledger,
-		derived.NewEmptyDerivedBlockData(),
 		privateKeys,
 		chain)
 	require.NoError(t, err)
@@ -214,7 +213,6 @@ func TestPrograms_TestBlockForks(t *testing.T) {
 	accounts, err := testutil.CreateAccounts(
 		vm,
 		ledger,
-		derived.NewEmptyDerivedBlockData(),
 		privateKeys,
 		chain)
 	require.NoError(t, err)

engine/execution/testutil/fixtures.go

@@ -16,7 +16,6 @@ import (
 	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/engine/execution/utils"
 	"github.com/onflow/flow-go/fvm"
-	"github.com/onflow/flow-go/fvm/derived"
 	"github.com/onflow/flow-go/fvm/state"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module/epochs"
@@ -190,25 +189,22 @@ func GenerateAccountPrivateKey() (flow.AccountPrivateKey, error) {
 func CreateAccounts(
 	vm fvm.VM,
 	view state.View,
-	derivedBlockData *derived.DerivedBlockData,
 	privateKeys []flow.AccountPrivateKey,
 	chain flow.Chain,
 ) ([]flow.Address, error) {
-	return CreateAccountsWithSimpleAddresses(vm, view, derivedBlockData, privateKeys, chain)
+	return CreateAccountsWithSimpleAddresses(vm, view, privateKeys, chain)
 }
 
 func CreateAccountsWithSimpleAddresses(
 	vm fvm.VM,
 	view state.View,
-	derivedBlockData *derived.DerivedBlockData,
 	privateKeys []flow.AccountPrivateKey,
 	chain flow.Chain,
 ) ([]flow.Address, error) {
 	ctx := fvm.NewContext(
 		fvm.WithChain(chain),
 		fvm.WithAuthorizationChecksEnabled(false),
 		fvm.WithSequenceNumberCheckAndIncrementEnabled(false),
-		fvm.WithDerivedBlockData(derivedBlockData),
 	)
 
 	var accounts []flow.Address
@@ -251,9 +247,7 @@ func CreateAccountsWithSimpleAddresses(
 			AddArgument(encCadPublicKey).
 			AddAuthorizer(serviceAddress)
 
-		tx := fvm.Transaction(
-			txBody,
-			derivedBlockData.NextTxIndexForTestingOnly())
+		tx := fvm.Transaction(txBody, 0)
 		err := vm.Run(ctx, tx, view)
 		if err != nil {
 			return nil, err