Merge branch 'master' into dependabot/go_modules/github.com/prometheu…

…s/client_golang-1.16.0

.github/workflows/nightly-builds.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
           cache: true

adapters/access_test.go

@@ -1,3 +1,21 @@
+/*
+ * Flow Emulator
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package adapters
 
 import (

adapters/sdk_test.go

@@ -1,3 +1,21 @@
+/*
+ * Flow Emulator
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package adapters
 
 import (

check-headers.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-files=$(find . -name \*.go -type f -print0 | xargs -0 egrep -L '(Licensed under the Apache License)|(Code generated from|by)')
+files=$(find . -name \*.go -type f -print0 | xargs -0 egrep -L '(Licensed under the Apache License)|(Code generated (from|by))')
 if [ -n "$files" ]; then
   echo "Missing license header in:"
   echo "$files"

convert/flow_test.go

@@ -1,3 +1,21 @@
+/*
+ * Flow Emulator
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package convert
 
 import (

emulator/blockchain.go

@@ -1,3 +1,21 @@
+/*
+ * Flow Emulator
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // Package emulator provides an emulated version of the Flow emulator that can be used
 // for development purposes.
 //
@@ -15,6 +33,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"math"
 	"strings"
 	"sync"
 	"time"
@@ -38,6 +57,7 @@ import (
 	fvmcrypto "github.com/onflow/flow-go/fvm/crypto"
 	"github.com/onflow/flow-go/fvm/environment"
 	fvmerrors "github.com/onflow/flow-go/fvm/errors"
+	"github.com/onflow/flow-go/fvm/meter"
 	reusableRuntime "github.com/onflow/flow-go/fvm/runtime"
 	"github.com/onflow/flow-go/fvm/storage/snapshot"
 	flowgo "github.com/onflow/flow-go/model/flow"
@@ -62,6 +82,7 @@ func New(opts ...Option) (*Blockchain, error) {
 		activeDebuggingSession: false,
 		conf:                   conf,
 		clock:                  NewSystemClock(),
+		sourceFileMap:          make(map[common.Location]string),
 	}
 	err := b.ReloadBlockchain()
 	if err != nil {
@@ -263,7 +284,7 @@ func WithCoverageReport(coverageReport *runtime.CoverageReport) Option {
 // Contracts allows users to deploy the given contracts.
 // Some default common contracts are pre-configured in the `CommonContracts`
 // global variable. It includes contracts such as:
-// NonFungibleToken, FUSD, MetadataViews, NFTStorefront, NFTStorefrontV2, ExampleNFT
+// NonFungibleToken, MetadataViews, NFTStorefront, NFTStorefrontV2, ExampleNFT
 // The default value is []ContractDescription{}.
 func Contracts(contracts []ContractDescription) Option {
 	return func(c *config) {
@@ -299,6 +320,8 @@ type Blockchain struct {
 	conf config
 
 	coverageReportedRuntime *CoverageReportedRuntime
+
+	sourceFileMap map[common.Location]string
 }
 
 // config is a set of configuration options for an emulated emulator.
@@ -538,7 +561,7 @@ func configureFVM(blockchain *Blockchain, conf config, blocks *blocks) (*fvm.Vir
 		fvm.WithBlocks(blocks),
 		fvm.WithContractDeploymentRestricted(false),
 		fvm.WithContractRemovalRestricted(!conf.ContractRemovalEnabled),
-		fvm.WithGasLimit(conf.ScriptGasLimit),
+		fvm.WithComputationLimit(conf.ScriptGasLimit),
 		fvm.WithCadenceLogging(true),
 		fvm.WithAccountStorageLimit(conf.StorageLimitEnabled),
 		fvm.WithTransactionFeesEnabled(conf.TransactionFeesEnabled),
@@ -692,6 +715,17 @@ func configureBootstrapProcedure(conf config, flowAccountKey flowgo.AccountPubli
 	options = append(options,
 		fvm.WithInitialTokenSupply(supply),
 		fvm.WithRestrictedAccountCreationEnabled(false),
+		fvm.WithTransactionFee(fvm.DefaultTransactionFees),
+		fvm.WithExecutionMemoryLimit(math.MaxUint32),
+		fvm.WithExecutionMemoryWeights(meter.DefaultMemoryWeights),
+		fvm.WithExecutionEffortWeights(map[common.ComputationKind]uint64{
+			common.ComputationKindStatement:          1569,
+			common.ComputationKindLoop:               1569,
+			common.ComputationKindFunctionInvocation: 1569,
+			environment.ComputationKindGetValue:      808,
+			environment.ComputationKindCreateAccount: 2837670,
+			environment.ComputationKindSetValue:      765,
+		}),
 	)
 	if conf.StorageLimitEnabled {
 		options = append(options,
@@ -700,27 +734,6 @@ func configureBootstrapProcedure(conf config, flowAccountKey flowgo.AccountPubli
 			fvm.WithStorageMBPerFLOW(conf.StorageMBPerFLOW),
 		)
 	}
-	if conf.TransactionFeesEnabled {
-		// This enables variable transaction fees AND execution effort metering
-		// as described in Variable Transaction Fees: Execution Effort FLIP: https://github.com/onflow/flow/pull/753)
-		// TODO: In the future this should be an injectable parameter. For now this is hard coded
-		// as this is the first iteration of variable execution fees.
-		options = append(options,
-			fvm.WithTransactionFee(fvm.BootstrapProcedureFeeParameters{
-				SurgeFactor:         cadence.UFix64(100_000_000), // 1.0
-				InclusionEffortCost: cadence.UFix64(100),         // 1E-6
-				ExecutionEffortCost: cadence.UFix64(499_000_000), // 4.99
-			}),
-			fvm.WithExecutionEffortWeights(map[common.ComputationKind]uint64{
-				common.ComputationKindStatement:          1569,
-				common.ComputationKindLoop:               1569,
-				common.ComputationKindFunctionInvocation: 1569,
-				environment.ComputationKindGetValue:      808,
-				environment.ComputationKindCreateAccount: 2837670,
-				environment.ComputationKindSetValue:      765,
-			}),
-		)
-	}
 	return fvm.Bootstrap(
 		flowAccountKey,
 		options...,
@@ -1182,7 +1195,10 @@ func (b *Blockchain) executeNextTransaction(ctx fvm.Context) (*types.Transaction
 
 	b.currentCode = string(txnBody.Script)
 	b.currentScriptID = txnId.String()
-	if b.activeDebuggingSession {
+
+	pragmas := ExtractPragmas(b.currentCode)
+
+	if b.activeDebuggingSession && pragmas.Contains(PragmaDebug) {
 		b.debugger.RequestPause()
 	}
 
@@ -1204,6 +1220,13 @@ func (b *Blockchain) executeNextTransaction(ctx fvm.Context) (*types.Transaction
 		tr.Debug = b.debugSignatureError(tr.Error, txnBody)
 	}
 
+	//add to source map if any pragma
+	if pragmas.Contains(PragmaSourceFile) {
+		location := common.NewTransactionLocation(nil, tr.TransactionID.Bytes())
+		sourceFile := pragmas.FilterByName(PragmaSourceFile).First().Argument()
+		b.sourceFileMap[location] = sourceFile
+	}
+
 	return tr, nil
 }
 
@@ -1371,7 +1394,10 @@ func (b *Blockchain) executeScriptAtBlockID(script []byte, arguments [][]byte, i
 	scriptProc := fvm.Script(script).WithArguments(arguments...)
 	b.currentCode = string(script)
 	b.currentScriptID = scriptProc.ID.String()
-	if b.activeDebuggingSession {
+
+	pragmas := ExtractPragmas(b.currentCode)
+
+	if b.activeDebuggingSession && pragmas.Contains(PragmaDebug) {
 		b.debugger.RequestPause()
 	}
 	_, output, err := b.vm.Run(
@@ -1398,6 +1424,13 @@ func (b *Blockchain) executeScriptAtBlockID(script []byte, arguments [][]byte, i
 		scriptError = convert.VMErrorToEmulator(output.Err)
 	}
 
+	//add to source map if any pragma
+	if pragmas.Contains(PragmaSourceFile) {
+		location := common.NewScriptLocation(nil, scriptID.Bytes())
+		sourceFile := pragmas.FilterByName(PragmaSourceFile).First().Argument()
+		b.sourceFileMap[location] = sourceFile
+	}
+
 	return &types.ScriptResult{
 		ScriptID:        scriptID,
 		Value:           convertedValue,
@@ -1578,3 +1611,37 @@ func (b *Blockchain) SetClock(clock Clock) {
 	b.clock = clock
 	b.pendingBlock.SetClock(clock)
 }
+
+func (b *Blockchain) GetSourceFile(location common.Location) string {
+
+	value, exists := b.sourceFileMap[location]
+	if exists {
+		return value
+	}
+
+	addressLocation, isAddressLocation := location.(common.AddressLocation)
+	if !isAddressLocation {
+		return location.ID()
+	}
+	view := b.pendingBlock.ledgerState.NewChild()
+
+	env := environment.NewScriptEnvironmentFromStorageSnapshot(
+		b.vmCtx.EnvironmentParams,
+		view)
+
+	r := b.vmCtx.Borrow(env)
+	defer b.vmCtx.Return(r)
+
+	code, err := r.GetAccountContractCode(addressLocation)
+
+	if err != nil {
+		return location.ID()
+	}
+	pragmas := ExtractPragmas(string(code))
+	if pragmas.Contains(PragmaSourceFile) {
+		return pragmas.FilterByName(PragmaSourceFile).First().Argument()
+	}
+
+	return location.ID()
+
+}

emulator/collection_test.go

@@ -1,3 +1,20 @@
+/*
+ * Flow Emulator
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package emulator_test
 
 import (

emulator/contracts.go

@@ -1,3 +1,21 @@
+/*
+ * Flow Emulator
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package emulator
 
 import (
@@ -10,20 +28,13 @@ import (
 	"github.com/onflow/flow-go/fvm"
 	flowgo "github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-nft/lib/go/contracts"
-	fusd "github.com/onflow/fusd/lib/go/contracts"
 	nftstorefront "github.com/onflow/nft-storefront/lib/go/contracts"
 )
 
 func NewCommonContracts(chain flowgo.Chain) []ContractDescription {
 	ftAddress := flowsdk.HexToAddress(fvm.FungibleTokenAddress(chain).HexWithPrefix())
 	serviceAddress := flowsdk.HexToAddress(chain.ServiceAddress().HexWithPrefix())
 	return []ContractDescription{
-		{
-			Name:        "FUSD",
-			Address:     serviceAddress,
-			Description: "💵  FUSD contract",
-			Source:      fusd.FUSD(ftAddress.String()),
-		},
 		{
 			Name:        "ExampleNFT",
 			Address:     serviceAddress,

emulator/contracts_test.go

@@ -1,3 +1,20 @@
+/*
+ * Flow Emulator
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package emulator_test
 
 import (

emulator/coverage_report_test.go

@@ -1,3 +1,21 @@
+/*
+ * Flow Emulator
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package emulator_test
 
 import (