Update Cadence 1.0 feature branch #5767

turbolent · 2024-04-24T00:12:36Z

Conflict resolution:

commit 26d76bf29071156a48d1d4d91dc6d4549c17ef08
Merge: 3c85102f04 eff9395a09
Author: Bastian Müller <bastian@turbolent.com>
Date:   Tue Apr 23 17:11:06 2024 -0700

    Merge branch 'master' into bastian/sync-stable-cadence-16

diff --git a/cmd/util/cmd/execution-state-extract/execution_state_extract.go b/cmd/util/cmd/execution-state-extract/execution_state_extract.go
remerge CONFLICT (content): Merge conflict in cmd/util/cmd/execution-state-extract/execution_state_extract.go
index d4ff236f7c..bf1f6d131d 100644
--- a/cmd/util/cmd/execution-state-extract/execution_state_extract.go
+++ b/cmd/util/cmd/execution-state-extract/execution_state_extract.go
@@ -376,36 +376,8 @@ func newMigrations(
 	runMigrations bool,
 	opts migrators.Options,
 ) []ledger.Migration {
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 	if !runMigrations {
 		return nil
-=======
-	if runMigrations {
-		rwf := reporters.NewReportFileWriterFactory(dir, log)
-
-		migrations := []ledger.Migration{
-			migrators.CreateAccountBasedMigration(
-				log,
-				nWorker,
-				[]migrators.AccountBasedMigration{
-					migrators.NewAtreeRegisterMigrator(
-						rwf,
-						flagValidateMigration,
-						flagLogVerboseValidationError,
-						flagContinueMigrationOnValidationError,
-						flagCheckStorageHealthBeforeMigration,
-						flagCheckStorageHealthAfterMigration,
-					),
-
-					&migrators.DeduplicateContractNamesMigration{},
-
-					// This will fix storage used discrepancies caused by the previous migrations
-					&migrators.AccountUsageMigrator{},
-				}),
-		}
-
-		return migrations
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 	}
 
 	log.Info().Msgf("initializing migrations")
diff --git a/cmd/util/ledger/migrations/atree_register_migration.go b/cmd/util/ledger/migrations/atree_register_migration.go
remerge CONFLICT (content): Merge conflict in cmd/util/ledger/migrations/atree_register_migration.go
index b525e4eb26..3885a9703b 100644
--- a/cmd/util/ledger/migrations/atree_register_migration.go
+++ b/cmd/util/ledger/migrations/atree_register_migration.go
@@ -9,11 +9,6 @@ import (
 	"time"
 
 	"github.com/onflow/atree"
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
-=======
-	"github.com/rs/zerolog"
-
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 	"github.com/onflow/cadence/runtime"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/interpreter"
diff --git a/cmd/util/ledger/migrations/change_contract_code_migration.go b/cmd/util/ledger/migrations/change_contract_code_migration.go
remerge CONFLICT (content): Merge conflict in cmd/util/ledger/migrations/change_contract_code_migration.go
index cdd2175cab..cbee293d59 100644
--- a/cmd/util/ledger/migrations/change_contract_code_migration.go
+++ b/cmd/util/ledger/migrations/change_contract_code_migration.go
@@ -192,21 +192,7 @@ func SystemContractChanges(chainID flow.ChainID, options SystemContractsMigratio
 		),
 		NewSystemContractChange(
 			systemContracts.ViewResolver,
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 			coreContracts.ViewResolver(),
-=======
-			nftContracts.Resolver(),
-		),
-
-		// EVM related contracts
-		NewSystemContractChange(
-			systemContracts.EVMContract,
-			evm.ContractCode(
-				systemContracts.NonFungibleToken.Address,
-				systemContracts.FungibleToken.Address,
-				systemContracts.FlowToken.Address,
-			),
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 		),
 	}
 
@@ -237,7 +223,9 @@ func SystemContractChanges(chainID flow.ChainID, options SystemContractsMigratio
 			NewSystemContractChange(
 				systemContracts.EVMContract,
 				evm.ContractCode(
-					flow.HexToAddress(env.FlowTokenAddress),
+					systemContracts.NonFungibleToken.Address,
+					systemContracts.FungibleToken.Address,
+					systemContracts.FlowToken.Address,
 				),
 			),
 		)
diff --git a/fvm/bootstrap.go b/fvm/bootstrap.go
remerge CONFLICT (content): Merge conflict in fvm/bootstrap.go
index d881531abb..5c7e09d31e 100644
--- a/fvm/bootstrap.go
+++ b/fvm/bootstrap.go
@@ -434,7 +434,7 @@ func (b *bootstrapExecutor) Execute() error {
 	b.deployStakingCollection(service, &env)
 
 	// sets up the EVM environment
-	b.setupEVM(service, fungibleToken, flowToken)
+	b.setupEVM(service, nonFungibleToken, fungibleToken, flowToken)
 
 	err = expectAccounts(systemcontracts.EVMStorageAccountIndex)
 	if err != nil {
@@ -446,12 +446,6 @@ func (b *bootstrapExecutor) Execute() error {
 	// set the list of nodes which are allowed to stake in this network
 	b.setStakingAllowlist(service, b.identities.NodeIDs())
 
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
-=======
-	// sets up the EVM environment
-	b.setupEVM(service, nonFungibleToken, fungibleToken, flowToken)
-
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 	return nil
 }
 
diff --git a/fvm/evm/stdlib/contract.cdc b/fvm/evm/stdlib/contract.cdc
index c8ef668599..aff2b5c73e 100644
--- a/fvm/evm/stdlib/contract.cdc
+++ b/fvm/evm/stdlib/contract.cdc
@@ -321,7 +321,7 @@ contract EVM {
         /// the bridge request
         access(all)
         fun depositNFT(
-            nft: @NonFungibleToken.NFT,
+            nft: @{NonFungibleToken.NFT},
             feeProvider: &{FungibleToken.Provider}
         ) {
             EVM.borrowBridgeAccessor().depositNFT(nft: <-nft, to: self.address(), feeProvider: feeProvider)
@@ -334,7 +334,7 @@ contract EVM {
             type: Type,
             id: UInt256,
             feeProvider: &{FungibleToken.Provider}
-        ): @NonFungibleToken.NFT {
+        ): @{NonFungibleToken.NFT} {
             return <- EVM.borrowBridgeAccessor().withdrawNFT(
                 caller: &self as &CadenceOwnedAccount,
                 type: type,
@@ -347,10 +347,14 @@ contract EVM {
         /// the bridge request
         access(all)
         fun depositTokens(
-            vault: @FungibleToken.Vault,
+            vault: @{FungibleToken.Vault},
             feeProvider: &{FungibleToken.Provider}
         ) {
-            EVM.borrowBridgeAccessor().depositTokens(vault: <-vault, to: self.address(), feeProvider: feeProvider)
+            EVM.borrowBridgeAccessor().depositTokens(
+                vault: <-vault,
+                to: self.address(),
+                feeProvider: feeProvider
+            )
         }
 
         /// Bridges the given fungible tokens from the EVM environment, requiring a Provider from which to withdraw a
@@ -361,7 +365,7 @@ contract EVM {
             type: Type,
             amount: UInt256,
             feeProvider: &{FungibleToken.Provider}
-        ): @FungibleToken.Vault {
+        ): @{FungibleToken.Vault} {
             return <- EVM.borrowBridgeAccessor().withdrawTokens(
                 caller: &self as &CadenceOwnedAccount,
                 type: type,
@@ -580,7 +584,7 @@ contract EVM {
         /// Endpoint enabling the bridging of an NFT to EVM
         access(all)
         fun depositNFT(
-            nft: @NonFungibleToken.NFT,
+            nft: @{NonFungibleToken.NFT},
             to: EVMAddress,
             feeProvider: &{FungibleToken.Provider}
         )
@@ -592,12 +596,12 @@ contract EVM {
             type: Type,
             id: UInt256,
             feeProvider: &{FungibleToken.Provider}
-        ): @NonFungibleToken.NFT
+        ): @{NonFungibleToken.NFT}
 
         /// Endpoint enabling the bridging of a fungible token vault to EVM
         access(all)
         fun depositTokens(
-            vault: @FungibleToken.Vault,
+            vault: @{FungibleToken.Vault},
             to: EVMAddress,
             feeProvider: &{FungibleToken.Provider}
         )
@@ -609,7 +613,7 @@ contract EVM {
             type: Type,
             amount: UInt256,
             feeProvider: &{FungibleToken.Provider}
-        ): @FungibleToken.Vault
+        ): @{FungibleToken.Vault}
     }
 
     /// Interface which captures a Capability to the bridge Accessor, saving it within the BridgeRouter resource
@@ -630,7 +634,7 @@ contract EVM {
     /// Returns a reference to the BridgeAccessor designated for internal bridge requests
     access(self)
     view fun borrowBridgeAccessor(): &{BridgeAccessor} {
-        return self.account.borrow<&{BridgeRouter}>(from: /storage/evmBridgeRouter)
+        return self.account.storage.borrow<&{BridgeRouter}>(from: /storage/evmBridgeRouter)
             ?.borrowBridgeAccessor()
             ?? panic("Could not borrow reference to the EVM bridge")
     }
diff --git a/fvm/evm/stdlib/contract.go b/fvm/evm/stdlib/contract.go
index 12519b498f..9dd858631c 100644
--- a/fvm/evm/stdlib/contract.go
+++ b/fvm/evm/stdlib/contract.go
@@ -2122,7 +2122,7 @@ func NewEVMBlockCadenceType(address common.Address) *cadence.StructType {
 			},
 			{
 				Identifier: "timestamp",
-				Type:       cadence.UInt64Type{},
+				Type:       cadence.UInt64Type,
 			},
 		},
 		nil,
diff --git a/fvm/evm/types/events.go b/fvm/evm/types/events.go
remerge CONFLICT (content): Merge conflict in fvm/evm/types/events.go
index 5723079410..f9b6fbcdc2 100644
--- a/fvm/evm/types/events.go
+++ b/fvm/evm/types/events.go
@@ -8,6 +8,7 @@ import (
 	"github.com/onflow/go-ethereum/rlp"
 
 	flowSdk "github.com/onflow/flow-go-sdk"
+
 	"github.com/onflow/flow-go/model/flow"
 )
 
@@ -26,78 +27,8 @@ type Event struct {
 	Payload EventPayload
 }
 
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 // we might break this event into two (tx included /tx executed) if size becomes an issue
-=======
-var _ common.Location = EVMLocation{}
-
-type EVMLocation struct{}
-
-func (l EVMLocation) TypeID(memoryGauge common.MemoryGauge, qualifiedIdentifier string) common.TypeID {
-	id := fmt.Sprintf("%s%s%s", flow.EVMLocationPrefix, locationDivider, qualifiedIdentifier)
-	common.UseMemory(memoryGauge, common.NewRawStringMemoryUsage(len(id)))
-
-	return common.TypeID(id)
-}
-
-func (l EVMLocation) QualifiedIdentifier(typeID common.TypeID) string {
-	pieces := strings.SplitN(string(typeID), locationDivider, 2)
-
-	if len(pieces) < 2 {
-		return ""
-	}
-
-	return pieces[1]
-}
-
-func (l EVMLocation) String() string {
-	return flow.EVMLocationPrefix
-}
-
-func (l EVMLocation) Description() string {
-	return flow.EVMLocationPrefix
-}
-
-func (l EVMLocation) ID() string {
-	return flow.EVMLocationPrefix
-}
-
-func (l EVMLocation) MarshalJSON() ([]byte, error) {
-	return json.Marshal(&struct {
-		Type string
-	}{
-		Type: "EVMLocation",
-	})
-}
-
-func init() {
-	common.RegisterTypeIDDecoder(
-		flow.EVMLocationPrefix,
-		func(_ common.MemoryGauge, typeID string) (common.Location, string, error) {
-			if typeID == "" {
-				return nil, "", fmt.Errorf("invalid EVM type location ID: missing type prefix")
-			}
-
-			parts := strings.SplitN(typeID, ".", 2)
-			prefix := parts[0]
-			if prefix != flow.EVMLocationPrefix {
-				return EVMLocation{}, "", fmt.Errorf("invalid EVM type location ID: invalid prefix")
-			}
-
-			var qualifiedIdentifier string
-			pieceCount := len(parts)
-			if pieceCount > 1 {
-				qualifiedIdentifier = parts[1]
-			}
-
-			return EVMLocation{}, qualifiedIdentifier, nil
-		},
-	)
-}
-
-// todo we might have to break this event into two (tx included /tx executed) if size becomes an issue
 
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 type TransactionExecutedPayload struct {
 	BlockHeight uint64
 	TxEncoded   []byte
@@ -174,20 +105,12 @@ var blockExecutedEventCadenceType = &cadence.EventType{
 	Location:            flowSdk.EVMLocation{},
 	QualifiedIdentifier: string(EventTypeBlockExecuted),
 	Fields: []cadence.Field{
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 		cadence.NewField("height", cadence.UInt64Type),
 		cadence.NewField("hash", cadence.StringType),
+		cadence.NewField("timestamp", cadence.UInt64Type),
 		cadence.NewField("totalSupply", cadence.IntType),
 		cadence.NewField("parentHash", cadence.StringType),
 		cadence.NewField("receiptRoot", cadence.StringType),
-=======
-		cadence.NewField("height", cadence.UInt64Type{}),
-		cadence.NewField("hash", cadence.StringType{}),
-		cadence.NewField("timestamp", cadence.UInt64Type{}),
-		cadence.NewField("totalSupply", cadence.IntType{}),
-		cadence.NewField("parentHash", cadence.StringType{}),
-		cadence.NewField("receiptRoot", cadence.StringType{}),
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 		cadence.NewField(
 			"transactionHashes",
 			cadence.NewVariableSizedArrayType(cadence.StringType),
diff --git a/fvm/fvm_test.go b/fvm/fvm_test.go
remerge CONFLICT (content): Merge conflict in fvm/fvm_test.go
index 55b5437822..89a8e52d59 100644
--- a/fvm/fvm_test.go
+++ b/fvm/fvm_test.go
@@ -2853,15 +2853,8 @@ func TestEVM(t *testing.T) {
 	}
 
 	t.Run("successful transaction", newVMTest().
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
-		withContextOptions(
-			fvm.WithEVMEnabled(true),
-			fvm.WithCadenceLogging(true),
-		).
-=======
 		withBootstrapProcedureOptions(fvm.WithSetupEVMEnabled(true)).
 		withContextOptions(ctxOpts...).
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 		run(func(
 			t *testing.T,
 			vm fvm.VM,
@@ -2916,15 +2909,8 @@ func TestEVM(t *testing.T) {
 
 	// this test makes sure the execution error is correctly handled and returned as a correct type
 	t.Run("execution reverted", newVMTest().
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
-		withContextOptions(
-			fvm.WithChain(flow.Emulator.Chain()),
-			fvm.WithEVMEnabled(true),
-		).
-=======
 		withBootstrapProcedureOptions(fvm.WithSetupEVMEnabled(true)).
 		withContextOptions(ctxOpts...).
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 		run(func(
 			t *testing.T,
 			vm fvm.VM,
@@ -2961,15 +2947,8 @@ func TestEVM(t *testing.T) {
 	// this test makes sure the EVM error is correctly returned as an error and has a correct type
 	// we have implemented a snapshot wrapper to return an error from the EVM
 	t.Run("internal evm error handling", newVMTest().
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
-		withContextOptions(
-			fvm.WithChain(flow.Emulator.Chain()),
-			fvm.WithEVMEnabled(true),
-		).
-=======
 		withBootstrapProcedureOptions(fvm.WithSetupEVMEnabled(true)).
 		withContextOptions(ctxOpts...).
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 		run(func(
 			t *testing.T,
 			vm fvm.VM,
@@ -3023,17 +3002,8 @@ func TestEVM(t *testing.T) {
 	)
 
 	t.Run("deploy contract code", newVMTest().
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
-		withContextOptions(
-			// default is testnet, but testnet has a special EVM storage contract location
-			// so we have to use emulator here so that the EVM storage contract is deployed
-			// to the 5th address
-			fvm.WithChain(flow.Emulator.Chain()),
-		).
-=======
 		withBootstrapProcedureOptions(fvm.WithSetupEVMEnabled(true)).
 		withContextOptions(ctxOpts...).
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 		run(func(
 			t *testing.T,
 			vm fvm.VM,
diff --git a/go.mod b/go.mod
remerge CONFLICT (content): Merge conflict in go.mod
index a0a841a0f5..e23ccddb30 100644
--- a/go.mod
+++ b/go.mod
@@ -54,17 +54,10 @@ require (
 	github.com/onflow/cadence v1.0.0-preview.21
 	github.com/onflow/crypto v0.25.1
 	github.com/onflow/flow v0.3.4
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450
 	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240416161444-1b20b4de9450
 	github.com/onflow/flow-go-sdk v1.0.0-preview.20
-	github.com/onflow/flow/protobuf/go/flow v0.4.0
-=======
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1
-	github.com/onflow/flow-go-sdk v0.44.0
 	github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
 	github.com/pierrec/lz4 v2.6.1+incompatible
 	github.com/pkg/errors v0.9.1
diff --git a/go.sum b/go.sum
remerge CONFLICT (content): Merge conflict in go.sum
index a78beb2e36..e29dccd26b 100644
--- a/go.sum
+++ b/go.sum
@@ -2504,7 +2504,6 @@ github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/flow v0.3.4 h1:FXUWVdYB90f/rjNcY0Owo30gL790tiYff9Pb/sycXYE=
 github.com/onflow/flow v0.3.4/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450 h1:uts5LlzDJFY4QuwdvvHBvE423LolC+SwhevalwiWdl4=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450/go.mod h1:8BfB7cPBsy5EDldnvdpsWA9P6zppMze12SW6eM4mwPE=
 github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240416161444-1b20b4de9450 h1:qx3qgxxbwpibY3dKnCAXSIPrfzrWENZSCCztqXrRgSQ=
@@ -2521,25 +2520,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240415194841-39036acfcfb5
 github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240415194841-39036acfcfb5 h1:yi3+QdygbkHFU+2vJMWyriO+BDYum2BqJtrVqfsnuQM=
 github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240415194841-39036acfcfb5/go.mod h1:p+2hRvtjLUR3MW1NsoJe5Gqgr2eeH49QB6+s6ze00w0=
 github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-github.com/onflow/flow/protobuf/go/flow v0.4.0 h1:5TGmPwRmnSt7aawgtPGF9ehoGHHir9Cy9LVoAiU9t/E=
-github.com/onflow/flow/protobuf/go/flow v0.4.0/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-=======
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
-github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0=
-github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU=
-github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74=
-github.com/onflow/flow-go-sdk v0.44.0 h1:gVRLcZ6LUNs/5mzHDx0mp4mEnBAWD62O51P4/nYm4rE=
-github.com/onflow/flow-go-sdk v0.44.0/go.mod h1:mm1Fi2hiMrexNMwRzTrAN2zwTvlP8iQ5CF2JSAgJR8U=
-github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ=
-github.com/onflow/flow-nft/lib/go/contracts v1.1.0 h1:rhUDeD27jhLwOqQKI/23008CYfnqXErrJvc4EFRP2a0=
-github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9jxdwoTuuhjK8WYWXTyLkIigZY=
-github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030 h1:I+aosSiJny88O4p3nPbCiUcp/UqN6AepvO6uj82bjH0=
 github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc=
 github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
 github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo=
diff --git a/insecure/go.mod b/insecure/go.mod
remerge CONFLICT (content): Merge conflict in insecure/go.mod
index b6f727b330..26d2e299f0 100644
--- a/insecure/go.mod
+++ b/insecure/go.mod
@@ -205,7 +205,6 @@ require (
 	github.com/multiformats/go-multistream v0.5.0 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 	github.com/onflow/atree v0.6.1-0.20240416233652-f4568c0c03df // indirect
 	github.com/onflow/cadence v1.0.0-preview.21 // indirect
 	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450 // indirect
@@ -215,17 +214,7 @@ require (
 	github.com/onflow/flow-go-sdk v1.0.0-preview.20 // indirect
 	github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240415194841-39036acfcfb5 // indirect
 	github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240415194841-39036acfcfb5 // indirect
-	github.com/onflow/flow/protobuf/go/flow v0.4.0 // indirect
-=======
-	github.com/onflow/atree v0.6.0 // indirect
-	github.com/onflow/cadence v0.42.10 // indirect
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 // indirect
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 // indirect
-	github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 // indirect
-	github.com/onflow/flow-go-sdk v0.46.0 // indirect
-	github.com/onflow/flow-nft/lib/go/contracts v1.1.0 // indirect
 	github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030 // indirect
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 	github.com/onflow/go-ethereum v1.13.4 // indirect
 	github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba // indirect
 	github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b // indirect
diff --git a/insecure/go.sum b/insecure/go.sum
remerge CONFLICT (content): Merge conflict in insecure/go.sum
index 70d6abb2b4..2b48f5cea8 100644
--- a/insecure/go.sum
+++ b/insecure/go.sum
@@ -2487,7 +2487,6 @@ github.com/onflow/cadence v1.0.0-preview.21/go.mod h1:3UHGl+T7JjK2S8P+FHOjWwBoTY
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450 h1:uts5LlzDJFY4QuwdvvHBvE423LolC+SwhevalwiWdl4=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450/go.mod h1:8BfB7cPBsy5EDldnvdpsWA9P6zppMze12SW6eM4mwPE=
 github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240416161444-1b20b4de9450 h1:qx3qgxxbwpibY3dKnCAXSIPrfzrWENZSCCztqXrRgSQ=
@@ -2504,25 +2503,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240415194841-39036acfcfb5
 github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240415194841-39036acfcfb5 h1:yi3+QdygbkHFU+2vJMWyriO+BDYum2BqJtrVqfsnuQM=
 github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240415194841-39036acfcfb5/go.mod h1:p+2hRvtjLUR3MW1NsoJe5Gqgr2eeH49QB6+s6ze00w0=
 github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-github.com/onflow/flow/protobuf/go/flow v0.4.0 h1:5TGmPwRmnSt7aawgtPGF9ehoGHHir9Cy9LVoAiU9t/E=
-github.com/onflow/flow/protobuf/go/flow v0.4.0/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-=======
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
-github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0=
-github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU=
-github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74=
-github.com/onflow/flow-go-sdk v0.46.0 h1:mrIQziCDe6Oi5HH/aPFvYluh1XUwO6lYpoXLWrBZc2s=
-github.com/onflow/flow-go-sdk v0.46.0/go.mod h1:azVWF0yHI8wT1erF0vuYGqQZybl6Frbc+0Zu3rIPeHc=
-github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ=
-github.com/onflow/flow-nft/lib/go/contracts v1.1.0 h1:rhUDeD27jhLwOqQKI/23008CYfnqXErrJvc4EFRP2a0=
-github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9jxdwoTuuhjK8WYWXTyLkIigZY=
-github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030 h1:I+aosSiJny88O4p3nPbCiUcp/UqN6AepvO6uj82bjH0=
 github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc=
 github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
 github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo=
diff --git a/integration/go.mod b/integration/go.mod
remerge CONFLICT (content): Merge conflict in integration/go.mod
index 581d7ff299..3e58ab4fc9 100644
--- a/integration/go.mod
+++ b/integration/go.mod
@@ -22,23 +22,13 @@ require (
 	github.com/libp2p/go-libp2p v0.32.2
 	github.com/onflow/cadence v1.0.0-preview.21
 	github.com/onflow/crypto v0.25.1
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450
 	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240416161444-1b20b4de9450
 	github.com/onflow/flow-emulator v1.0.0-preview.17
 	github.com/onflow/flow-go v0.34.0-crescendo-preview.9.0.20240409075958-ccbe91096438
 	github.com/onflow/flow-go-sdk v1.0.0-preview.20
 	github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000
-	github.com/onflow/flow/protobuf/go/flow v0.4.0
-=======
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1
-	github.com/onflow/flow-emulator v0.62.2-0.20240418140508-d969ff66d9cd
-	github.com/onflow/flow-go v0.33.2-0.20240412174857-015156b297b5
-	github.com/onflow/flow-go-sdk v0.46.2
-	github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000
 	github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 	github.com/onflow/go-ethereum v1.13.4
 	github.com/plus3it/gorecurcopy v0.0.1
 	github.com/prometheus/client_golang v1.18.0
diff --git a/integration/go.sum b/integration/go.sum
remerge CONFLICT (content): Merge conflict in integration/go.sum
index 28b6a3baac..3fc5f397c7 100644
--- a/integration/go.sum
+++ b/integration/go.sum
@@ -2564,7 +2564,6 @@ github.com/onflow/cadence v1.0.0-preview.21/go.mod h1:3UHGl+T7JjK2S8P+FHOjWwBoTY
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450 h1:uts5LlzDJFY4QuwdvvHBvE423LolC+SwhevalwiWdl4=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240416161444-1b20b4de9450/go.mod h1:8BfB7cPBsy5EDldnvdpsWA9P6zppMze12SW6eM4mwPE=
 github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240416161444-1b20b4de9450 h1:qx3qgxxbwpibY3dKnCAXSIPrfzrWENZSCCztqXrRgSQ=
@@ -2583,27 +2582,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240415194841-39036acfcfb5
 github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240415194841-39036acfcfb5 h1:yi3+QdygbkHFU+2vJMWyriO+BDYum2BqJtrVqfsnuQM=
 github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240415194841-39036acfcfb5/go.mod h1:p+2hRvtjLUR3MW1NsoJe5Gqgr2eeH49QB6+s6ze00w0=
 github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-github.com/onflow/flow/protobuf/go/flow v0.4.0 h1:5TGmPwRmnSt7aawgtPGF9ehoGHHir9Cy9LVoAiU9t/E=
-github.com/onflow/flow/protobuf/go/flow v0.4.0/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-=======
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
-github.com/onflow/flow-emulator v0.62.2-0.20240418140508-d969ff66d9cd h1:bR5IxvTK4HApiJt+OP+mLNKkVkr75piaLu8wDT6uKDA=
-github.com/onflow/flow-emulator v0.62.2-0.20240418140508-d969ff66d9cd/go.mod h1:ONxdb0U5kE7XK8B1ZAAo6JAzYRAtC6oh9I8WAfi9I+E=
-github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0=
-github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU=
-github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74=
-github.com/onflow/flow-go-sdk v0.46.2 h1:ypVGBeH9m5XpBOTU/CYVC0y/+z42e8mhUlq5aLiD24A=
-github.com/onflow/flow-go-sdk v0.46.2/go.mod h1:tfLjB9FZmwqtT5gaacjvpIhz7KCd67YPm6v+iqYAjEA=
-github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ=
-github.com/onflow/flow-nft/lib/go/contracts v1.1.0 h1:rhUDeD27jhLwOqQKI/23008CYfnqXErrJvc4EFRP2a0=
-github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9jxdwoTuuhjK8WYWXTyLkIigZY=
-github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030 h1:I+aosSiJny88O4p3nPbCiUcp/UqN6AepvO6uj82bjH0=
 github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc=
 github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
 github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo=
diff --git a/utils/unittest/service_events_fixtures.go b/utils/unittest/service_events_fixtures.go
remerge CONFLICT (content): Merge conflict in utils/unittest/service_events_fixtures.go
index f83379b37f..62065c3d77 100644
--- a/utils/unittest/service_events_fixtures.go
+++ b/utils/unittest/service_events_fixtures.go
@@ -705,79 +705,6 @@ func createVersionBeaconEvent() cadence.Event {
 	}).WithType(NewNodeVersionBeaconVersionBeaconEventType())
 }
 
-<<<<<<< 3c85102f04 (Merge pull request #5653 from onflow/bastian/filter-unreferenced-slabs-migration)
-func newFlowClusterQCVoteStructType() cadence.Type {
-
-	// A.01cf0e2f2f715450.FlowClusterQC.Vote
-
-	address, _ := common.HexToAddress("01cf0e2f2f715450")
-	location := common.NewAddressLocation(nil, address, "FlowClusterQC")
-
-	return &cadence.StructType{
-		Location:            location,
-		QualifiedIdentifier: "FlowClusterQC.Vote",
-		Fields: []cadence.Field{
-			{
-				Identifier: "nodeID",
-				Type:       cadence.StringType,
-			},
-			{
-				Identifier: "signature",
-				Type:       cadence.NewOptionalType(cadence.StringType),
-			},
-			{
-				Identifier: "message",
-				Type:       cadence.NewOptionalType(cadence.StringType),
-			},
-			{
-				Identifier: "clusterIndex",
-				Type:       cadence.UInt16Type,
-			},
-			{
-				Identifier: "weight",
-				Type:       cadence.UInt64Type,
-			},
-		},
-	}
-}
-
-func newFlowClusterQCClusterStructType() *cadence.StructType {
-
-	// A.01cf0e2f2f715450.FlowClusterQC.Cluster
-
-	address, _ := common.HexToAddress("01cf0e2f2f715450")
-	location := common.NewAddressLocation(nil, address, "FlowClusterQC")
-
-	return &cadence.StructType{
-		Location:            location,
-		QualifiedIdentifier: "FlowClusterQC.Cluster",
-		Fields: []cadence.Field{
-			{
-				Identifier: "index",
-				Type:       cadence.UInt16Type,
-			},
-			{
-				Identifier: "nodeWeights",
-				Type:       cadence.NewDictionaryType(cadence.StringType, cadence.UInt64Type),
-			},
-			{
-				Identifier: "totalWeight",
-				Type:       cadence.UInt64Type,
-			},
-			{
-				Identifier: "generatedVotes",
-				Type:       cadence.NewDictionaryType(cadence.StringType, newFlowClusterQCVoteStructType()),
-			},
-			{
-				Identifier: "uniqueVoteMessageTotalWeights",
-				Type:       cadence.NewDictionaryType(cadence.StringType, cadence.UInt64Type),
-			},
-		},
-	}
-}
-
-=======
->>>>>>> eff9395a09 (Merge pull request #5661 from onflow/leo/fix-traversal-error-handling)
 func newFlowIDTableStakingNodeInfoStructType() *cadence.StructType {
 
 	// A.01cf0e2f2f715450.FlowIDTableStaking.NodeInfo
@@ -1121,23 +1048,23 @@ func newFlowClusterQCVoteStructType() *cadence.StructType {
 		Fields: []cadence.Field{
 			{
 				Identifier: "nodeID",
-				Type:       cadence.StringType{},
+				Type:       cadence.StringType,
 			},
 			{
 				Identifier: "signature",
-				Type:       cadence.NewOptionalType(cadence.StringType{}),
+				Type:       cadence.NewOptionalType(cadence.StringType),
 			},
 			{
 				Identifier: "message",
-				Type:       cadence.NewOptionalType(cadence.StringType{}),
+				Type:       cadence.NewOptionalType(cadence.StringType),
 			},
 			{
 				Identifier: "clusterIndex",
-				Type:       cadence.UInt16Type{},
+				Type:       cadence.UInt16Type,
 			},
 			{
 				Identifier: "weight",
-				Type:       cadence.UInt64Type{},
+				Type:       cadence.UInt64Type,
 			},
 		},
 	}
@@ -1172,23 +1099,23 @@ func NewFlowClusterQCClusterStructType() *cadence.StructType {
 		Fields: []cadence.Field{
 			{
 				Identifier: "index",
-				Type:       cadence.UInt16Type{},
+				Type:       cadence.UInt16Type,
 			},
 			{
 				Identifier: "nodeWeights",
-				Type:       cadence.NewDictionaryType(cadence.StringType{}, cadence.UInt64Type{}),
+				Type:       cadence.NewDictionaryType(cadence.StringType, cadence.UInt64Type),
 			},
 			{
 				Identifier: "totalWeight",
-				Type:       cadence.UInt64Type{},
+				Type:       cadence.UInt64Type,
 			},
 			{
 				Identifier: "generatedVotes",
-				Type:       cadence.NewDictionaryType(cadence.StringType{}, newFlowClusterQCVoteStructType()),
+				Type:       cadence.NewDictionaryType(cadence.StringType, newFlowClusterQCVoteStructType()),
 			},
 			{
 				Identifier: "uniqueVoteMessageTotalWeights",
-				Type:       cadence.NewDictionaryType(cadence.StringType{}, cadence.UInt64Type{}),
+				Type:       cadence.NewDictionaryType(cadence.StringType, cadence.UInt64Type),
 			},
 		},
 	}

- update signatures - update usages

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

- add filter for valid protocol participant

- emit fatal log if identity is present in internal node info from disc but missing from snap shot identities list

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

- infer start view, staking phase end view, and epoch end view from curr epoch final view

Co-authored-by: Alexander Hentschel <alex.hentschel@flowfoundation.org>

…b.com:onflow/flow-go into khalil/6959-efm-recvery-epoch-data-generation

…statuses

…sult-in-sub-tx-statuses [Access] Added transaction result in SendAndSubscribeTransactionStatuses response

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

fix util docker build - port to master

Fix unsafeTraverse error handling

turbolent · 2024-04-24T00:13:29Z

@onflow/flow-cadence-execution Not really sure why the order of setupEVM in bootstrap is different

codecov-commenter · 2024-04-24T00:20:54Z

Codecov Report

Attention: Patch coverage is 2.19780% with 89 lines in your changes are missing coverage. Please review.

Project coverage is 53.09%. Comparing base (a3493b9) to head (26d76bf).
Report is 142 commits behind head on feature/stable-cadence.

Files	Patch %	Lines
utils/unittest/service_events_fixtures.go	0.00%	82 Missing ⚠️
admin/commands/storage/read_protocol_snapshot.go	0.00%	6 Missing ⚠️
state/fork/traversal.go	66.66%	1 Missing ⚠️

Additional details and impacted files

@@                    Coverage Diff                     @@
##           feature/stable-cadence    #5767      +/-   ##
==========================================================
- Coverage                   53.33%   53.09%   -0.24%     
==========================================================
  Files                         324      234      -90     
  Lines                       30045    22306    -7739     
==========================================================
- Hits                        16024    11843    -4181     
+ Misses                      12598     9428    -3170     
+ Partials                     1423     1035     -388

Flag	Coverage Δ
unittests	`53.09% <2.19%> (-0.24%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

janezpodhostnik · 2024-04-24T12:55:51Z

@onflow/flow-cadence-execution Not really sure why the order of setupEVM in bootstrap is different

One PR was not backported to master.
The stable-cadence branch is correct.

I will backport the missing PR.

…e-16

turbolent · 2024-04-25T01:59:04Z

@onflow/flow-cadence-execution @onflow/cadence PTAL

turbolent · 2024-04-25T18:14:20Z

@j1010001 could you please help with getting another review?

kc1116 and others added 30 commits March 22, 2024 00:38

move reusable util funcs to common package

311115f

- update signatures - update usages

generate tx args

7d09f47

add ingestion throttle

d0e70db

increase buffer size

d5aec19

remove throttle engine

0604cc9

lint

0469425

rename throttle

465a3d0

update throttle

669e087

add happy path tests

ffbd640

Update cmd/bootstrap/cmd/keys.go

45fcead

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

Update keys.go

18f7aec

move NotEjected filter to filter package

c82ffbc

- add filter for valid protocol participant

get subsets of internal collectors and partner collectors from snapshot

321da97

- emit fatal log if identity is present in internal node info from disc but missing from snap shot identities list

Update cmd/util/cmd/epochs/cmd/recover.go

9a4542d

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

Update cmd/util/cmd/epochs/cmd/recover.go

91d6599

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

Update cmd/util/cmd/epochs/cmd/recover.go

051629d

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

Update cmd/util/cmd/epochs/cmd/recover.go

1399e18

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

Update recover.go

2b9c152

epoch counter should be an input

3c8ee33

smart contract should generate random source with revertibleRandom

d9db0eb

Update cmd/util/cmd/epochs/cmd/recover.go

f48b5a7

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

Update cmd/util/cmd/epochs/cmd/recover.go

0cb7cae

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

add epoch-length and epoch-staking-phase-length

884fdbf

- infer start view, staking phase end view, and epoch end view from curr epoch final view

use for range loop

6aacb01

dkg group key should be the first key in the array

82c5803

Update cmd/util/cmd/common/clusters.go

1d67790

Co-authored-by: Alexander Hentschel <alex.hentschel@flowfoundation.org>

Merge branch 'khalil/6959-efm-recvery-epoch-data-generation' of githu…

1c86a58

…b.com:onflow/flow-go into khalil/6959-efm-recvery-epoch-data-generation

added tx result to subscription

e8c89f6

add godoc for ConstructRootQCsForClusters

8d6611f

add godoc for *PartnerInfo util funcs

263974e

Guitarheroua and others added 8 commits April 20, 2024 17:14

Merge branch 'master' into AndriiSlisarchuk/5566-tx-result-in-sub-tx-…

6a06688

…statuses

Merge pull request #5620 from The-K-R-O-K/AndriiSlisarchuk/5566-tx-re…

0983dbb

…sult-in-sub-tx-statuses [Access] Added transaction result in SendAndSubscribeTransactionStatuses response

port #5750

e53ae2c

fix traversal error handling

9b0c220

Update state/fork/traversal.go

4860e67

Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>

Merge pull request #5751 from onflow/jan/port-fix-util-docker-build

976e3ff

fix util docker build - port to master

Merge pull request #5661 from onflow/leo/fix-traversal-error-handling

eff9395

Fix unsafeTraverse error handling

Merge branch 'master' into bastian/sync-stable-cadence-16

26d76bf

turbolent self-assigned this Apr 24, 2024

turbolent requested review from zhangchiqing, ramtinms, janezpodhostnik and peterargue as code owners April 24, 2024 00:12

turbolent requested review from a team April 24, 2024 00:12

turbolent mentioned this pull request Apr 24, 2024

[EVM] Add bridging interface to EVM contract - stable cadence port #5716

Merged

turbolent added 5 commits April 24, 2024 10:18

adjust to Cadence API changes

70f9aab

adjust expected state commitments

e34d7b7

update Emulator

cbdad56

Merge branch 'feature/stable-cadence' into bastian/sync-stable-cadenc…

26e7366

…e-16

update state commitments

10421b8

fxamacker approved these changes Apr 25, 2024

View reviewed changes

ramtinms approved these changes Apr 25, 2024

View reviewed changes

turbolent merged commit 7c79289 into feature/stable-cadence Apr 25, 2024
55 checks passed

turbolent deleted the bastian/sync-stable-cadence-16 branch April 25, 2024 18:24

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Cadence 1.0 feature branch #5767

Update Cadence 1.0 feature branch #5767

turbolent commented Apr 24, 2024

turbolent commented Apr 24, 2024

codecov-commenter commented Apr 24, 2024

janezpodhostnik commented Apr 24, 2024 •

edited

Loading

turbolent commented Apr 25, 2024

turbolent commented Apr 25, 2024

Update Cadence 1.0 feature branch #5767

Update Cadence 1.0 feature branch #5767

Conversation

turbolent commented Apr 24, 2024

turbolent commented Apr 24, 2024

codecov-commenter commented Apr 24, 2024

Codecov Report

janezpodhostnik commented Apr 24, 2024 • edited Loading

turbolent commented Apr 25, 2024

turbolent commented Apr 25, 2024

janezpodhostnik commented Apr 24, 2024 •

edited

Loading