Merge branch 'master' into feature/efm-recovery

Author: jordanschalm

contracts/FlowExecutionParameters.cdc

@@ -0,0 +1,23 @@
+/// FlowExecutionParameters stores the parameters for metering
+/// transaction fees for Flow transactions
+
+access(all) contract FlowExecutionParameters {
+				
+    // Gets Execution Effort Weights from the parameters account's storage
+    access(all) view fun getExecutionEffortWeights(): {UInt64: UInt64} {
+        return self.account.storage.copy<{UInt64: UInt64}>(from: /storage/executionEffortWeights)
+            ?? panic("execution effort weights not set yet")
+    }
+
+    // Gets Execution Memory Weights from the parameters account's storage
+    access(all) view fun getExecutionMemoryWeights(): {UInt64: UInt64} {
+        return self.account.storage.copy<{UInt64: UInt64}>(from: /storage/executionMemoryWeights)
+            ?? panic("execution memory weights not set yet")
+    }
+
+    // Gets Execution Memory Limit from the parameters account's storage
+    access(all) view fun getExecutionMemoryLimit(): UInt64 {
+        return self.account.storage.copy<UInt64>(from: /storage/executionMemoryLimit)
+            ?? panic("execution memory limit not set yet")
+    }
+}

contracts/FlowServiceAccount.cdc

@@ -2,6 +2,7 @@ import FungibleToken from "FungibleToken"
 import FlowToken from "FlowToken"
 import FlowFees from "FlowFees"
 import FlowStorageFees from "FlowStorageFees"
+import FlowExecutionParameters from "FlowExecutionParameters"
 
 access(all) contract FlowServiceAccount {
 
@@ -128,20 +129,17 @@ access(all) contract FlowServiceAccount {
 
     // Gets Execution Effort Weights from the service account's storage 
     access(all) view fun getExecutionEffortWeights(): {UInt64: UInt64} {
-        return self.account.storage.copy<{UInt64: UInt64}>(from: /storage/executionEffortWeights)
-            ?? panic("execution effort weights not set yet")
+        return FlowExecutionParameters.getExecutionEffortWeights()
     }
 
     // Gets Execution Memory Weights from the service account's storage 
     access(all) view fun getExecutionMemoryWeights(): {UInt64: UInt64} {
-        return self.account.storage.copy<{UInt64: UInt64}>(from: /storage/executionMemoryWeights)
-            ?? panic("execution memory weights not set yet")
+        return FlowExecutionParameters.getExecutionMemoryWeights()
     }
 
     // Gets Execution Memory Limit from the service account's storage
     access(all) view fun getExecutionMemoryLimit(): UInt64 {
-        return self.account.storage.copy<UInt64>(from: /storage/executionMemoryLimit)
-            ?? panic("execution memory limit not set yet")
+        return FlowExecutionParameters.getExecutionMemoryLimit()
     }
 
     /// Authorization resource to change the fields of the contract

lib/go/contracts/contracts.go

@@ -28,6 +28,7 @@ import (
 const (
 	flowFeesFilename                = "FlowFees.cdc"
 	storageFeesFilename             = "FlowStorageFees.cdc"
+	executionParametersFilename     = "FlowExecutionParameters.cdc"
 	flowServiceAccountFilename      = "FlowServiceAccount.cdc"
 	flowTokenFilename               = "FlowToken.cdc"
 	flowIdentityTableFilename       = "FlowIDTableStaking.cdc"
@@ -171,13 +172,51 @@ func FlowStorageFees(env templates.Environment) []byte {
 	return []byte(code)
 }
 
+// FlowExecutionParameters returns the FlowExecutionParameters contract
+func FlowExecutionParameters(env templates.Environment) []byte {
+	code := assets.MustAssetString(executionParametersFilename)
+
+	code = templates.ReplaceAddresses(code, env)
+
+	return []byte(code)
+}
+
 // FlowServiceAccount returns the FlowServiceAccount contract.
 //
 // The returned contract will import the FungibleToken, FlowToken, FlowFees, and FlowStorageFees
 // contracts from the specified addresses.
 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\"",
+		)
+
+		// Replace the metering getter functions
+		code = strings.ReplaceAll(
+			code,
+			"return FlowExecutionParameters.getExecutionEffortWeights()",
+			"return self.account.storage.copy<{UInt64: UInt64}>(from: /storage/executionEffortWeights) ?? panic(\"execution effort weights not set yet\")",
+		)
+
+		code = strings.ReplaceAll(
+			code,
+			"return FlowExecutionParameters.getExecutionMemoryWeights()",
+			"return self.account.storage.copy<{UInt64: UInt64}>(from: /storage/executionMemoryWeights) ?? panic(\"execution memory weights not set yet\")",
+		)
+
+		code = strings.ReplaceAll(
+			code,
+			"return FlowExecutionParameters.getExecutionMemoryLimit()",
+			"return self.account.storage.copy<UInt64>(from: /storage/executionMemoryLimit) ?? panic(\"execution memory limit not set yet\")",
+		)
+	}
+
 	code = templates.ReplaceAddresses(code, env)
 
 	return []byte(code)

lib/go/contracts/go.mod

@@ -6,7 +6,7 @@ toolchain go1.22.4
 
 require (
 	github.com/kevinburke/go-bindata v3.24.0+incompatible
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240215153337-0be5cb4b4bc9
+	github.com/onflow/flow-core-contracts/lib/go/templates v1.4.1-0.20250121150329-3add9787ef8b
 	github.com/onflow/flow-ft/lib/go/contracts v1.0.1
 	github.com/onflow/flow-nft/lib/go/contracts v1.2.2
 	github.com/stretchr/testify v1.9.0
@@ -37,9 +37,9 @@ require (
 	github.com/onflow/atree v0.8.0-rc.6 // indirect
 	github.com/onflow/cadence v1.0.0-preview.51 // indirect
 	github.com/onflow/crypto v0.25.1 // indirect
-	github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240213220156-959b70719876 // indirect
+	github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
 	github.com/onflow/flow-go-sdk v1.0.0-preview.54 // indirect
-	github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240213205729-48f42d9896f8 // indirect
+	github.com/onflow/flow-nft/lib/go/templates v1.2.1 // indirect
 	github.com/onflow/flow/protobuf/go/flow v0.4.3 // indirect
 	github.com/onflow/go-ethereum v1.13.4 // indirect
 	github.com/pelletier/go-toml v1.2.0 // indirect