Merge pull request #3744 from onflow/bastian/sync-compiler

[Compiler] Sync with master
onflow · Jan 29, 2025 · 3a904fd · 3a904fd
2 parents 4703a34 + 44406d4
commit 3a904fd
Show file tree

Hide file tree

Showing 186 changed files with 20,003 additions and 16,296 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -13,7 +13,7 @@ on:
       - 'v**'
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ on:
       - 'v**'
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ on:
       - 'v**'
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

diff --git a/.github/workflows/compatibility-check-template.yml b/.github/workflows/compatibility-check-template.yml
@@ -17,11 +17,11 @@ on:
         required: true
         type: string
     secrets:
-      FLOWDIVER_API_KEY:
+      FIND_API_AUTH:
         required: true
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 concurrency:
   group: ${{ github.workflow }}-${{ inputs.base-branch || github.run_id }}-${{ inputs.chain }}
@@ -62,10 +62,10 @@ jobs:
       - name: Download contracts
         if: ${{ steps.restore-cached-contracts.outputs.cache-hit != 'true' }}
         env:
-          FLOWDIVER_API_KEY: ${{ secrets.FLOWDIVER_API_KEY }}
+          FIND_API_AUTH: ${{ secrets.FIND_API_AUTH }}
         working-directory: ./tools/get-contracts
         run: |
-          go run . --chain=${{ inputs.chain }} --apiKey="$FLOWDIVER_API_KEY" > ../../tmp/contracts.csv
+          go run . -chain=${{ inputs.chain }} -auth="$FIND_API_AUTH" > ../../tmp/contracts.csv
 
       - name: Cache Contracts
         id: cache-contracts

diff --git a/.github/workflows/compatibility-check.yml b/.github/workflows/compatibility-check.yml
@@ -23,7 +23,7 @@ on:
       - 'v**'
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 concurrency:
   group: ${{ github.workflow }}-${{ inputs.base || github.run_id }}
@@ -66,7 +66,7 @@ jobs:
       current-branch: ${{ needs.setup.outputs.branch }}
       chain: mainnet
     secrets:
-      FLOWDIVER_API_KEY: ${{ secrets.FLOWDIVER_API_KEY }}
+      FIND_API_AUTH: ${{ secrets.FIND_API_AUTH }}
 
   testnet:
     needs: setup
@@ -77,4 +77,4 @@ jobs:
       current-branch: ${{ needs.setup.outputs.branch }}
       chain: testnet
     secrets:
-      FLOWDIVER_API_KEY: ${{ secrets.FLOWDIVER_API_KEY }}
+      FIND_API_AUTH: ${{ secrets.FIND_API_AUTH }}
diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
@@ -13,7 +13,7 @@ on:
       - 'v**'
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

diff --git a/.github/workflows/get-contracts.yml b/.github/workflows/get-contracts.yml
@@ -7,11 +7,11 @@ on:
         required: true
         type: string
     secrets:
-      FLOWDIVER_API_KEY:
+      FIND_API_AUTH:
         required: true
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.run_id }}-${{ inputs.chain }}
@@ -37,10 +37,10 @@ jobs:
 
       - name: Download contracts
         env:
-          FLOWDIVER_API_KEY: ${{ secrets.FLOWDIVER_API_KEY }}
+          FIND_API_AUTH: ${{ secrets.FIND_API_AUTH }}
         working-directory: ./tools/get-contracts
         run: |
-          go run . --chain=${{ inputs.chain }} --apiKey="$FLOWDIVER_API_KEY" > ../../tmp/contracts.csv
+          go run . -chain=${{ inputs.chain }} -auth="$FIND_API_AUTH" > ../../tmp/contracts.csv
 
       # Upload
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ on:
         default: 'master'
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

diff --git a/bbq/vm/storage.go b/bbq/vm/storage.go
@@ -43,33 +43,44 @@ func MustConvertStoredValue(gauge common.MemoryGauge, storage interpreter.Storag
 }
 
 func ReadStored(
-	gauge common.MemoryGauge,
-	storage interpreter.Storage,
+	config *Config,
 	address common.Address,
 	domain string,
 	identifier string,
 ) Value {
-	accountStorage := storage.GetStorageMap(address, domain, false)
+	storage := config.Storage
+
+	storageDomain, _ := common.StorageDomainFromIdentifier(domain)
+
+	accountStorage := storage.GetDomainStorageMap(
+		config.interpreter(),
+		address,
+		storageDomain,
+		false,
+	)
 	if accountStorage == nil {
 		return nil
 	}
 
-	referenced := accountStorage.ReadValue(gauge, interpreter.StringStorageMapKey(identifier))
+	referenced := accountStorage.ReadValue(config.MemoryGauge, interpreter.StringStorageMapKey(identifier))
 	return InterpreterValueToVMValue(storage, referenced)
 }
 
 func WriteStored(
 	config *Config,
 	storageAddress common.Address,
-	domain string,
+	domain common.StorageDomain,
 	key interpreter.StorageMapKey,
 	value Value,
 ) (existed bool) {
-	accountStorage := config.Storage.GetStorageMap(storageAddress, domain, true)
+
+	inter := config.interpreter()
+
+	accountStorage := config.Storage.GetDomainStorageMap(inter, storageAddress, domain, true)
 	interValue := VMValueToInterpreterValue(config, value)
 
 	return accountStorage.WriteValue(
-		config.interpreter(),
+		inter,
 		key,
 		interValue,
 	)
@@ -90,12 +101,17 @@ func RemoveReferencedSlab(storage interpreter.Storage, storable atree.Storable)
 }
 
 func StoredValueExists(
-	storage interpreter.Storage,
+	config *Config,
 	storageAddress common.Address,
-	domain string,
+	domain common.StorageDomain,
 	identifier interpreter.StorageMapKey,
 ) bool {
-	accountStorage := storage.GetStorageMap(storageAddress, domain, false)
+	accountStorage := config.Storage.GetDomainStorageMap(
+		config.interpreter(),
+		storageAddress,
+		domain,
+		false,
+	)
 	if accountStorage == nil {
 		return false
 	}

diff --git a/bbq/vm/value_account.go b/bbq/vm/value_account.go
@@ -23,7 +23,6 @@ import (
 	"github.com/onflow/cadence/errors"
 	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/cadence/sema"
-	"github.com/onflow/cadence/stdlib"
 )
 
 type AccountIDGenerator interface {
@@ -143,8 +142,7 @@ func getCapability(
 	// Read stored capability, if any
 
 	readValue := ReadStored(
-		config.MemoryGauge,
-		config.Storage,
+		config,
 		address,
 		domain,
 		identifier,
@@ -339,7 +337,7 @@ func storeCapabilityController(
 	existed := WriteStored(
 		config,
 		address,
-		stdlib.CapabilityControllerStorageDomain,
+		common.StorageDomainCapabilityController,
 		storageMapKey,
 		controller,
 	)
@@ -376,7 +374,12 @@ func recordStorageCapabilityController(
 
 	storageMapKey := interpreter.StringStorageMapKey(identifier)
 
-	accountStorage := config.Storage.GetStorageMap(address, stdlib.PathCapabilityStorageDomain, true)
+	accountStorage := config.Storage.GetDomainStorageMap(
+		config.interpreter(),
+		address,
+		common.StorageDomainPathCapability,
+		true,
+	)
 
 	referenced := accountStorage.ReadValue(config.MemoryGauge, interpreter.StringStorageMapKey(identifier))
 	readValue := InterpreterValueToVMValue(config.Storage, referenced)

diff --git a/bbq/vm/value_account_capabilities.go b/bbq/vm/value_account_capabilities.go
@@ -142,15 +142,17 @@ func init() {
 				}
 
 				domain := path.Domain.Identifier()
+				storageDomain, _ := common.StorageDomainFromIdentifier(domain)
+
 				identifier := path.Identifier
 
 				// Prevent an overwrite
 
 				storageMapKey := interpreter.StringStorageMapKey(identifier)
 				if StoredValueExists(
-					config.Storage,
+					config,
 					accountAddress,
-					domain,
+					storageDomain,
 					storageMapKey,
 				) {
 					panic(interpreter.OverwriteError{
@@ -174,7 +176,7 @@ func init() {
 				WriteStored(
 					config,
 					accountAddress,
-					domain,
+					storageDomain,
 					storageMapKey,
 					capabilityValue,
 				)

diff --git a/bbq/vm/value_account_storage.go b/bbq/vm/value_account_storage.go
@@ -85,10 +85,11 @@ func init() {
 
 				// Write new value
 
+				storageDomain, _ := common.StorageDomainFromIdentifier(domain)
 				WriteStored(
 					config,
 					address,
-					domain,
+					storageDomain,
 					interpreter.StringStorageMapKey(identifier),
 					value,
 				)

diff --git a/bbq/vm/value_capability.go b/bbq/vm/value_capability.go
@@ -26,7 +26,6 @@ import (
 	"github.com/onflow/cadence/format"
 	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/cadence/sema"
-	"github.com/onflow/cadence/stdlib"
 )
 
 // members
@@ -210,7 +209,12 @@ func getCapabilityController(
 
 	storageMapKey := interpreter.Uint64StorageMapKey(capabilityID)
 
-	accountStorage := config.Storage.GetStorageMap(address, stdlib.CapabilityControllerStorageDomain, false)
+	accountStorage := config.Storage.GetDomainStorageMap(
+		config.interpreter(),
+		address,
+		common.StorageDomainCapabilityController,
+		false,
+	)
 	if accountStorage == nil {
 		return nil
 	}

diff --git a/bbq/vm/value_storage_reference.go b/bbq/vm/value_storage_reference.go
@@ -86,12 +86,11 @@ func (v *StorageReferenceValue) StaticType(config *Config) StaticType {
 }
 
 func (v *StorageReferenceValue) dereference(config *Config) (*Value, error) {
-	memoryGauge := config.MemoryGauge
 	address := v.TargetStorageAddress
 	domain := v.TargetPath.Domain.Identifier()
 	identifier := v.TargetPath.Identifier
 
-	vmReferencedValue := ReadStored(memoryGauge, config.Storage, address, domain, identifier)
+	vmReferencedValue := ReadStored(config, address, domain, identifier)
 	if vmReferencedValue == nil {
 		return nil, nil
 	}

diff --git a/benchmarks/binarytrees.cdc b/benchmarks/binarytrees.cdc
@@ -0,0 +1,82 @@
+
+access(all)
+struct Tree {
+    access(all)
+    var left: Tree?
+
+    access(all)
+    var right: Tree?
+
+    init(left: Tree?, right: Tree?) {
+        self.left = left
+        self.right = right
+    }
+
+    access(all)
+    fun nodeCount(): Int {
+        return 1
+            + (self.left?.nodeCount() ?? 0)
+            + (self.right?.nodeCount() ?? 0)
+    }
+
+    access(all)
+    fun clear() {
+        if (self.left != nil) {
+            self.left?.clear()
+            self.left = nil
+            self.right?.clear()
+            self.right = nil
+        }
+    }
+}
+
+access(all)
+fun newTree(depth: Int): Tree {
+    if depth == 0 {
+        return Tree(left: nil, right: nil)
+    }
+    return Tree(
+        left: newTree(depth: depth - 1),
+        right: newTree(depth: depth - 1)
+    )
+}
+
+access(all)
+fun stretch(_ depth: Int) {
+   log("stretch tree of depth \(depth), check: \(count(depth))")
+}
+
+access(all)
+fun count(_ depth: Int): Int {
+    let t = newTree(depth: depth)
+    let c = t.nodeCount()
+    t.clear()
+    return c
+}
+
+access(all)
+fun run(_ n: Int) {
+    let minDepth = 4
+    let maxDepth = minDepth + 2 > n ? minDepth + 2 : n
+    let stretchDepth = maxDepth + 1
+
+    stretch(stretchDepth)
+    let longLivedTree = newTree(depth: maxDepth)
+
+    for depth in InclusiveRange(minDepth, maxDepth, step: 2) {
+        let iterations = 1 << (maxDepth - depth + minDepth)
+        var sum = 0
+        for _ in InclusiveRange(1, iterations, step: 1) {
+            sum = sum + count(depth)
+        }
+        log("\(iterations), trees of depth \(depth), check: \(sum)")
+    }
+    let count = longLivedTree.nodeCount()
+    longLivedTree.clear()
+    log("long lived tree of depth \(maxDepth), check: \(count)")
+}
+
+access(all)
+fun main() {
+    run(10)
+}