Merge branch 'feature/stable-cadence' of https://github.com/onflow/fl…

…ow-go into supun/stable-cadence-sync
onflow · Jan 20, 2024 · d3a7e3b · d3a7e3b
2 parents 55f1cc8 + 7dca2e8
commit d3a7e3b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/fvm/fvm_signature_test.go b/fvm/fvm_signature_test.go
@@ -122,11 +122,13 @@ func TestKeyListSignature(t *testing.T) {
                           return keyList.verify(
                               signatureSet: signatureSet,
                               signedData: message,
+                              domainSeparationTag: "%s"
                           )
                       }
                     `,
 				signatureAlgorithm.name,
 				hashAlgorithm.name,
+				tag,
 			),
 		)
 

diff --git a/fvm/meter/memory_meter.go b/fvm/meter/memory_meter.go
@@ -243,6 +243,12 @@ var (
 		common.MemoryKindEntitlementMapStaticAccess:  17,
 		common.MemoryKindCadenceEntitlementSetAccess: 33,
 		common.MemoryKindCadenceEntitlementMapAccess: 17,
+
+		// InclusiveRange
+		common.MemoryKindInclusiveRangeStaticType:   17,
+		common.MemoryKindCadenceInclusiveRangeValue: 81,
+		common.MemoryKindCadenceInclusiveRangeType:  33,
+		common.MemoryKindInclusiveRangeSemaType:     17,
 	}
 )
 

diff --git a/insecure/go.mod b/insecure/go.mod
@@ -207,11 +207,11 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f // indirect
 	github.com/onflow/cadence v1.0.0-preview.2.0.20240120000236-f3397a0efdad // indirect
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1-0.20231219201108-fbdb10b0a2da // indirect
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1-0.20231219201108-fbdb10b0a2da // indirect
+	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1-0.20240120002724-ff3d1a4bab55 // indirect
+	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1-0.20240120002724-ff3d1a4bab55 // indirect
 	github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20231212194336-a2802ba36596 // indirect
 	github.com/onflow/flow-go-sdk v0.44.0-stable-cadence.2.0.20240120000948-4c9b2354a373 // indirect
-	github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20231212194623-24d595274bdd // indirect
+	github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240120002146-9f1763b66d80 // indirect
 	github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231213135419-ae911cc351a2 // indirect
 	github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d // indirect
 	github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba // indirect