Merge branch 'master' into feature/efm-recovery

Author: jordanschalm

flow.json

@@ -62,6 +62,15 @@
 				"testnet": "9eca2b38b18b5dfe"
 			}
 		},
+        "FlowExecutionParameters": {
+			"source": "./contracts/FlowExecutionParameters.cdc",
+			"aliases": {
+				"emulator": "f8d6e0586b0a20c7",
+				"mainnet": "f426ff57ee8f6110",
+				"testing": "0000000000000007",
+				"testnet": "6997a2f2cf57b73a"
+			}
+		},
 		"FlowServiceAccount": {
 			"source": "./contracts/FlowServiceAccount.cdc",
 			"aliases": {

lib/go/templates/templates.go

@@ -15,6 +15,8 @@ import (
 
 const (
 	placeholderFungibleTokenAddress       = "\"FungibleToken\""
+	placeholderNonFungibleTokenAddress    = "\"NonFungibleToken\""
+	placeholderEVMAddress                 = "\"EVM\""
 	placeholderViewResolverAddress        = "\"ViewResolver\""
 	placeholderFungibleTokenMVAddress     = "\"FungibleTokenMetadataViews\""
 	placeholderMetadataViewsAddress       = "\"MetadataViews\""
@@ -43,6 +45,7 @@ type Environment struct {
 	CryptoAddress                     string
 	FungibleTokenAddress              string
 	NonFungibleTokenAddress           string
+	EVMAddress                        string
 	MetadataViewsAddress              string
 	FungibleTokenMetadataViewsAddress string
 	FungibleTokenSwitchboardAddress   string
@@ -74,126 +77,149 @@ func withHexPrefix(address string) string {
 	return fmt.Sprintf("0x%s", address)
 }
 
+func ReplaceAddress(code, placeholder, replacement string) string {
+	if len(replacement) > 0 {
+		code = strings.ReplaceAll(
+			code,
+			placeholder,
+			withHexPrefix(replacement),
+		)
+	}
+	return code
+}
+
 func ReplaceAddresses(code string, env Environment) string {
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderFungibleTokenMVAddress,
-		withHexPrefix(env.FungibleTokenMetadataViewsAddress),
+		env.FungibleTokenMetadataViewsAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderMetadataViewsAddress,
-		withHexPrefix(env.MetadataViewsAddress),
+		env.MetadataViewsAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderBurnerAddress,
-		withHexPrefix(env.BurnerAddress),
+		env.BurnerAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderCryptoAddress,
-		withHexPrefix(env.CryptoAddress),
+		env.CryptoAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderViewResolverAddress,
-		withHexPrefix(env.ViewResolverAddress),
+		env.ViewResolverAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderFungibleTokenAddress,
-		withHexPrefix(env.FungibleTokenAddress),
+		env.FungibleTokenAddress,
+	)
+
+	code = ReplaceAddress(
+		code,
+		placeholderNonFungibleTokenAddress,
+		env.NonFungibleTokenAddress,
+	)
+
+	code = ReplaceAddress(
+		code,
+		placeholderEVMAddress,
+		env.EVMAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderFlowTokenAddress,
-		withHexPrefix(env.FlowTokenAddress),
+		env.FlowTokenAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderIDTableAddress,
-		withHexPrefix(env.IDTableAddress),
+		env.IDTableAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderLockedTokensAddress,
-		withHexPrefix(env.LockedTokensAddress),
+		env.LockedTokensAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderStakingProxyAddress,
-		withHexPrefix(env.StakingProxyAddress),
+		env.StakingProxyAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderQuorumCertificateAddress,
-		withHexPrefix(env.QuorumCertificateAddress),
+		env.QuorumCertificateAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderDKGAddress,
-		withHexPrefix(env.DkgAddress),
+		env.DkgAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderEpochAddress,
-		withHexPrefix(env.EpochAddress),
+		env.EpochAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderStorageFeesAddress,
-		withHexPrefix(env.StorageFeesAddress),
+		env.StorageFeesAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderFlowFeesAddress,
-		withHexPrefix(env.FlowFeesAddress),
+		env.FlowFeesAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderStakingCollectionAddress,
-		withHexPrefix(env.LockedTokensAddress),
+		env.LockedTokensAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderExecutionParametersAddress,
-		withHexPrefix(env.FlowExecutionParametersAddress),
+		env.FlowExecutionParametersAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderServiceAccountAddress,
-		withHexPrefix(env.ServiceAccountAddress),
+		env.ServiceAccountAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderNodeVersionBeaconAddress,
-		withHexPrefix(env.NodeVersionBeaconAddress),
+		env.NodeVersionBeaconAddress,
 	)
 
-	code = strings.ReplaceAll(
+	code = ReplaceAddress(
 		code,
 		placeholderRandomBeaconHistoryAddress,
-		withHexPrefix(env.RandomBeaconHistoryAddress),
+		env.RandomBeaconHistoryAddress,
 	)
 
 	return code

lib/go/test/epoch_test_helpers.go

@@ -8,10 +8,9 @@ import (
 	"testing"
 
 	"github.com/onflow/cadence"
+	"github.com/onflow/cadence/common"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
-	"github.com/onflow/cadence/runtime/common"
-	cdcCommon "github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/interpreter"
+	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/flow-emulator/adapters"
 	emulator "github.com/onflow/flow-emulator/emulator"
 	"github.com/onflow/flow-go-sdk"
@@ -891,8 +890,8 @@ func getCurrentEpochCounter(t *testing.T, b emulator.Emulator, env templates.Env
 // newClusterQCVoteDataCdcType returns a new (empty) FlowClusterQC cadence struct type.
 func newClusterQCVoteDataCdcType(clusterQcAddress string) *cadence.StructType {
 	// FlowClusterQC.ClusterQCVoteData
-	address, _ := cdcCommon.HexToAddress(clusterQcAddress)
-	location := cdcCommon.NewAddressLocation(nil, address, "FlowClusterQC")
+	address, _ := common.HexToAddress(clusterQcAddress)
+	location := common.NewAddressLocation(nil, address, "FlowClusterQC")
 
 	return cadence.NewStructType(location, "FlowClusterQC.ClusterQCVoteData",
 		[]cadence.Field{

lib/go/test/flow_idtable_nodes_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

lib/go/test/flow_idtable_staking_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/onflow/cadence"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
-	"github.com/onflow/cadence/runtime/interpreter"
+	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/crypto"
 	"github.com/onflow/flow-go-sdk/test"

lib/go/test/flow_stakingcollection_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/onflow/cadence"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
-	"github.com/onflow/cadence/runtime/interpreter"
+	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/crypto"
 	"github.com/stretchr/testify/assert"