Use standard import placeholders

.gitignore

@@ -15,6 +15,7 @@ git
 
 coverage.json
 coverage.lcov
+lcov.info
 *.pkey
 
 # Private flow.jsons

contracts/FlowFees.cdc

@@ -1,6 +1,6 @@
-import FungibleToken from "FungibleToken"
-import FlowToken from "FlowToken"
-import FlowStorageFees from "FlowStorageFees"
+import "FungibleToken"
+import "FlowToken"
+import "FlowStorageFees"
 
 access(all) contract FlowFees {
 

contracts/FlowIDTableStaking.cdc

@@ -27,10 +27,10 @@
 
  */
 
-import FungibleToken from "FungibleToken"
-import FlowToken from "FlowToken"
-import Burner from "Burner"
-import FlowFees from "FlowFees"
+import "FungibleToken"
+import "FlowToken"
+import "Burner"
+import "FlowFees"
 import Crypto
 
 access(all) contract FlowIDTableStaking {

contracts/FlowServiceAccount.cdc

@@ -1,8 +1,8 @@
-import FungibleToken from "FungibleToken"
-import FlowToken from "FlowToken"
-import FlowFees from "FlowFees"
-import FlowStorageFees from "FlowStorageFees"
-import FlowExecutionParameters from "FlowExecutionParameters"
+import "FungibleToken"
+import "FlowToken"
+import "FlowFees"
+import "FlowStorageFees"
+import "FlowExecutionParameters"
 
 access(all) contract FlowServiceAccount {
 

contracts/FlowStakingCollection.cdc

@@ -10,15 +10,15 @@
 
  */
 
-import FungibleToken from "FungibleToken"
-import FlowToken from "FlowToken"
-import FlowIDTableStaking from "FlowIDTableStaking"
-import LockedTokens from "LockedTokens"
-import FlowStorageFees from "FlowStorageFees"
-import FlowClusterQC from "FlowClusterQC"
-import FlowDKG from "FlowDKG"
-import FlowEpoch from "FlowEpoch"
-import Burner from "Burner"
+import "FungibleToken"
+import "FlowToken"
+import "FlowIDTableStaking"
+import "LockedTokens"
+import "FlowStorageFees"
+import "FlowClusterQC"
+import "FlowDKG"
+import "FlowEpoch"
+import "Burner"
 
 access(all) contract FlowStakingCollection {
 

contracts/FlowStorageFees.cdc

@@ -14,8 +14,8 @@
  * 
  */
 
-import FungibleToken from "FungibleToken"
-import FlowToken from "FlowToken"
+import "FungibleToken"
+import "FlowToken"
 
 access(all) contract FlowStorageFees {
 

contracts/FlowToken.cdc

@@ -1,6 +1,6 @@
-import FungibleToken from "FungibleToken"
-import MetadataViews from "MetadataViews"
-import FungibleTokenMetadataViews from "FungibleTokenMetadataViews"
+import "FungibleToken"
+import "MetadataViews"
+import "FungibleTokenMetadataViews"
 
 access(all) contract FlowToken: FungibleToken {
 

contracts/LockedTokens.cdc

@@ -25,11 +25,11 @@
 
  */
 
-import FlowToken from "FlowToken"
-import FungibleToken from "FungibleToken"
-import FlowIDTableStaking from "FlowIDTableStaking"
-import FlowStorageFees from "FlowStorageFees"
-import StakingProxy from "StakingProxy"
+import "FlowToken"
+import "FungibleToken"
+import "FlowIDTableStaking"
+import "FlowStorageFees"
+import "StakingProxy"
 
 access(all) contract LockedTokens {
 

contracts/epochs/FlowEpoch.cdc

@@ -1,9 +1,9 @@
-import FungibleToken from "FungibleToken"
-import FlowToken from "FlowToken"
-import FlowIDTableStaking from "FlowIDTableStaking"
-import FlowClusterQC from "FlowClusterQC"
-import FlowDKG from "FlowDKG"
-import FlowFees from "FlowFees"
+import "FungibleToken"
+import "FlowToken"
+import "FlowIDTableStaking"
+import "FlowClusterQC"
+import "FlowDKG"
+import "FlowFees"
 
 // The top-level smart contract managing the lifecycle of epochs. In Flow,
 // epochs are the smallest unit of time where the identity table (the set of

contracts/testContracts/TestFlowIDTableStaking.cdc

@@ -7,8 +7,8 @@
 
  */
 
-import FungibleToken from "FungibleToken"
-import FlowToken from "FlowToken"
+import "FungibleToken"
+import "FlowToken"
 // import Burner from "Burner"
 
 access(all) contract FlowIDTableStaking {

lib/go/contracts/contracts.go

@@ -111,6 +111,10 @@ func MetadataViews(env templates.Environment) []byte {
 	return nftcontracts.MetadataViews(env.FungibleTokenAddress, env.NonFungibleTokenAddress, env.ViewResolverAddress)
 }
 
+func CrossVMMetadataViews(env templates.Environment) []byte {
+	return nftcontracts.CrossVMMetadataViews(env.ViewResolverAddress, env.EVMAddress)
+}
+
 // FlowToken returns the FlowToken contract.
 //
 // The returned contract will import the FungibleToken contract from the specified address.
@@ -189,12 +193,11 @@ func FlowServiceAccount(env templates.Environment) []byte {
 	code := assets.MustAssetString(flowServiceAccountFilename)
 
 	if env.FlowExecutionParametersAddress == "" {
-
 		// Remove the import of FlowExecutionParameters
 		code = strings.ReplaceAll(
 			code,
-			"import FlowExecutionParameters from \"FlowExecutionParameters\"",
-			"//import FlowExecutionParameters from \"FlowExecutionParameters\"",
+			"import \"FlowExecutionParameters\"",
+			"//import \"FlowExecutionParameters\"",
 		)
 
 		// Replace the metering getter functions
@@ -294,6 +297,10 @@ func FlowContractAudits() []byte {
 	return assets.MustAsset(flowContractAuditsFilename)
 }
 
+func Crypto() []byte {
+	return assets.MustAsset(cryptoFilename)
+}
+
 /******************** Test contracts *********************/
 
 // TESTFlowIDTableStaking returns the TestFlowIDTableStaking contract
@@ -320,16 +327,20 @@ func TESTFlowStakingCollection(
 ) []byte {
 	code := assets.MustAssetString(flowStakingCollectionFilename)
 
-	code = strings.ReplaceAll(code, placeholderFungibleTokenAddress, withHexPrefix(fungibleTokenAddress))
-	code = strings.ReplaceAll(code, placeholderBurnerAddress, withHexPrefix(storageFeesAddress))
-	code = strings.ReplaceAll(code, placeholderFlowTokenAddress, withHexPrefix(flowTokenAddress))
-	code = strings.ReplaceAll(code, placeholderIDTableAddress, withHexPrefix(idTableAddress))
-	code = strings.ReplaceAll(code, placeholderStakingProxyAddress, withHexPrefix(stakingProxyAddress))
-	code = strings.ReplaceAll(code, placeholderLockedTokensAddress, withHexPrefix(lockedTokensAddress))
-	code = strings.ReplaceAll(code, placeholderStorageFeesAddress, withHexPrefix(storageFeesAddress))
-	code = strings.ReplaceAll(code, placeholderQCAddr, withHexPrefix(qcAddress))
-	code = strings.ReplaceAll(code, placeholderDKGAddr, withHexPrefix(dkgAddress))
-	code = strings.ReplaceAll(code, placeholderEpochAddr, withHexPrefix(epochAddress))
+	env := templates.Environment{
+		FungibleTokenAddress:     fungibleTokenAddress,
+		FlowTokenAddress:         flowTokenAddress,
+		IDTableAddress:           idTableAddress,
+		StakingProxyAddress:      stakingProxyAddress,
+		LockedTokensAddress:      lockedTokensAddress,
+		StorageFeesAddress:       storageFeesAddress,
+		QuorumCertificateAddress: qcAddress,
+		DkgAddress:               dkgAddress,
+		EpochAddress:             epochAddress,
+		BurnerAddress:            storageFeesAddress,
+	}
+
+	code = templates.ReplaceAddresses(code, env)
 
 	code = strings.ReplaceAll(code, "access(self) fun getTokens", "access(all) fun getTokens")
 	code = strings.ReplaceAll(code, "access(self) fun depositTokens", "access(all) fun depositTokens")
@@ -340,27 +351,13 @@ func TESTFlowStakingCollection(
 func TestFlowFees(fungibleTokenAddress, flowTokenAddress, storageFeesAddress string) []byte {
 	code := assets.MustAssetString(flowFeesFilename)
 
-	code = strings.ReplaceAll(
-		code,
-		placeholderFungibleTokenAddress,
-		withHexPrefix(fungibleTokenAddress),
-	)
-
-	code = strings.ReplaceAll(
-		code,
-		placeholderFlowTokenAddress,
-		withHexPrefix(flowTokenAddress),
-	)
+	env := templates.Environment{
+		FungibleTokenAddress: fungibleTokenAddress,
+		FlowTokenAddress:     flowTokenAddress,
+		StorageFeesAddress:   storageFeesAddress,
+	}
 
-	code = strings.ReplaceAll(
-		code,
-		placeholderStorageFeesAddress,
-		withHexPrefix(storageFeesAddress),
-	)
+	code = templates.ReplaceAddresses(code, env)
 
 	return []byte(code)
 }
-
-func Crypto() []byte {
-	return assets.MustAsset(cryptoFilename)
-}