Sync Stable Cadence #2796
Merged
Sync Stable Cadence #2796
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…parator, add test case
…ual creation of string memory usage
Add notes for 2023-09-12 meeting
Merge `release/v0.41.0` to `master`
Co-authored-by: Bastian Müller <bastian@turbolent.com>
Introduce `String.join` function
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:feature/stable-cadence commit 238db58 Collapsed results for better readability
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
dsainati1
approved these changes
Sep 19, 2023
SupunS
approved these changes
Sep 19, 2023
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## feature/stable-cadence #2796 +/- ##
==========================================================
+ Coverage 79.67% 79.73% +0.05%
==========================================================
Files 342 342
Lines 80688 80778 +90
==========================================================
+ Hits 64288 64407 +119
+ Misses 14095 14063 -32
- Partials 2305 2308 +3
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Resolving conflicts mainly involved:
TestRuntimeInvalidWrappedPrivateCapabilityto Cap ConsAlso, added the
viewmodifier to the newString.joinfunction. (re: #2466)Conflict resolution
commit 8859243f1a8646ed0415a69569331e19e6f8f6ca Merge: 238db584c 833562efb Author: Bastian Müller <bastian@turbolent.com> Date: Tue Sep 19 13:15:38 2023 -0700 Merge branch 'master' into bastian/sync-stable-cadence-7 diff --git a/runtime/ast/expression_test.go b/runtime/ast/expression_test.go index c490586b3..0d4263e0d 100644 --- a/runtime/ast/expression_test.go +++ b/runtime/ast/expression_test.go @@ -4763,6 +4763,7 @@ func TestFunctionExpression_Doc(t *testing.T) { prettier.Text("()"), }, }, + prettier.Text(" "), prettier.Text("{}"), } diff --git a/runtime/interpreter/interpreter.go b/runtime/interpreter/interpreter.go index 55be367a3..e297a8d80 100644 --- a/runtime/interpreter/interpreter.go +++ b/runtime/interpreter/interpreter.go @@ -5074,8 +5074,10 @@ func (interpreter *Interpreter) invalidateReferencedResources(value Value, destr switch value := value.(type) { case *CompositeValue: - value.ForEachLoadedField(interpreter, func(_ string, fieldValue Value) { + value.ForEachLoadedField(interpreter, func(_ string, fieldValue Value) (resume bool) { interpreter.invalidateReferencedResources(fieldValue, destroyed) + // continue iteration + return true }) storageID = value.StorageID() case *DictionaryValue: diff --git a/runtime/interpreter/value.go b/runtime/interpreter/value.go remerge CONFLICT (content): Merge conflict in runtime/interpreter/value.go index b8b3df93e..b80d96da8 100644 --- a/runtime/interpreter/value.go +++ b/runtime/interpreter/value.go @@ -17438,31 +17438,29 @@ func (v *CompositeValue) GetOwner() common.Address { // ForEachField iterates over all field-name field-value pairs of the composite value. // It does NOT iterate over computed fields and functions! -<<<<<<< 238db584c (Merge pull request #2778 from onflow/bastian/capability-exists) -func (v *CompositeValue) ForEachField(gauge common.MemoryGauge, f func(fieldName string, fieldValue Value)) { +func (v *CompositeValue) ForEachField( + gauge common.MemoryGauge, + f func(fieldName string, fieldValue Value) (resume bool), +) { v.forEachField(gauge, v.dictionary.Iterate, f) } -func (v *CompositeValue) ForEachLoadedField(gauge common.MemoryGauge, f func(fieldName string, fieldValue Value)) { +// ForEachLoadedField iterates over all LOADED field-name field-value pairs of the composite value. +// It does NOT iterate over computed fields and functions! +func (v *CompositeValue) ForEachLoadedField( + gauge common.MemoryGauge, + f func(fieldName string, fieldValue Value) (resume bool), +) { v.forEachField(gauge, v.dictionary.IterateLoadedValues, f) } func (v *CompositeValue) forEachField( gauge common.MemoryGauge, atreeIterate func(fn atree.MapEntryIterationFunc) error, - f func(fieldName string, fieldValue Value), -) { - err := atreeIterate(func(key atree.Value, value atree.Value) (resume bool, err error) { - f( -======= -func (v *CompositeValue) ForEachField( - gauge common.MemoryGauge, f func(fieldName string, fieldValue Value) (resume bool), ) { - - err := v.dictionary.Iterate(func(key atree.Value, value atree.Value) (resume bool, err error) { + err := atreeIterate(func(key atree.Value, value atree.Value) (resume bool, err error) { resume = f( ->>>>>>> 833562efb (Merge pull request #2795 from onflow/release/v0.41.1) string(key.(StringAtreeValue)), MustConvertStoredValue(gauge, value), ) diff --git a/runtime/program_params_validation_test.go b/runtime/program_params_validation_test.go index 49fd41b0f..988b2a210 100644 --- a/runtime/program_params_validation_test.go +++ b/runtime/program_params_validation_test.go @@ -1143,9 +1143,14 @@ func TestRuntimeTransactionParameterTypeValidation(t *testing.T) { Address: common.MustBytesToAddress([]byte{0x1}), Name: "C", }: []byte(` - pub contract C { - pub struct S { - pub let cap: Capability + access(all) + contract C { + + access(all) + struct S { + + access(all) + let cap: Capability init(cap: Capability) { self.cap = cap @@ -1163,13 +1168,10 @@ func TestRuntimeTransactionParameterTypeValidation(t *testing.T) { address := common.MustBytesToAddress([]byte{0x1}) - path, err := cadence.NewPath(common.PathDomainPrivate, "foo") - require.NoError(t, err) - - capability := cadence.NewPathCapability( + capability := cadence.NewCapability( + 1, cadence.Address(address), - path, - cadence.NewReferenceType(false, cadence.AuthAccountType{}), + cadence.NewReferenceType(cadence.UnauthorizedAccess, cadence.AccountType), ) arg := cadence.Struct{ @@ -1191,7 +1193,7 @@ func TestRuntimeTransactionParameterTypeValidation(t *testing.T) { }, } - err = executeTransaction(t, script, contracts, arg) + err := executeTransaction(t, script, contracts, arg) expectRuntimeError(t, err, &ArgumentNotImportableError{}) }) @@ -1204,23 +1206,20 @@ func TestRuntimeTransactionParameterTypeValidation(t *testing.T) { address := common.MustBytesToAddress([]byte{0x1}) - path, err := cadence.NewPath(common.PathDomainPrivate, "foo") - require.NoError(t, err) - - capability := cadence.NewPathCapability( + capability := cadence.NewCapability( + 1, cadence.Address(address), - path, - cadence.NewReferenceType(false, cadence.AuthAccountType{}), + cadence.NewReferenceType(cadence.UnauthorizedAccess, cadence.AccountType), ) arg := cadence.Array{ - ArrayType: cadence.NewVariableSizedArrayType(cadence.AnyStructType{}), + ArrayType: cadence.NewVariableSizedArrayType(cadence.AnyStructType), Values: []cadence.Value{ capability, }, } - err = executeTransaction(t, script, nil, arg) + err := executeTransaction(t, script, nil, arg) expectRuntimeError(t, err, &ArgumentNotImportableError{}) }) @@ -1233,18 +1232,15 @@ func TestRuntimeTransactionParameterTypeValidation(t *testing.T) { address := common.MustBytesToAddress([]byte{0x1}) - path, err := cadence.NewPath(common.PathDomainPrivate, "foo") - require.NoError(t, err) - - capability := cadence.NewPathCapability( + capability := cadence.NewCapability( + 1, cadence.Address(address), - path, - cadence.NewReferenceType(false, cadence.AuthAccountType{}), + cadence.NewReferenceType(cadence.UnauthorizedAccess, cadence.AccountType), ) arg := cadence.NewOptional(capability) - err = executeTransaction(t, script, nil, arg) + err := executeTransaction(t, script, nil, arg) expectRuntimeError(t, err, &ArgumentNotImportableError{}) }) @@ -1257,13 +1253,10 @@ func TestRuntimeTransactionParameterTypeValidation(t *testing.T) { address := common.MustBytesToAddress([]byte{0x1}) - path, err := cadence.NewPath(common.PathDomainPrivate, "foo") - require.NoError(t, err) - - capability := cadence.NewPathCapability( + capability := cadence.NewCapability( + 1, cadence.Address(address), - path, - cadence.NewReferenceType(false, cadence.AuthAccountType{}), + cadence.NewReferenceType(cadence.UnauthorizedAccess, cadence.AccountType), ) arg := cadence.NewDictionary([]cadence.KeyValuePair{ @@ -1273,7 +1266,7 @@ func TestRuntimeTransactionParameterTypeValidation(t *testing.T) { }, }) - err = executeTransaction(t, script, nil, arg) + err := executeTransaction(t, script, nil, arg) expectRuntimeError(t, err, &ArgumentNotImportableError{}) }) diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go remerge CONFLICT (content): Merge conflict in runtime/runtime_test.go index ee56f61e6..766add29b 100644 --- a/runtime/runtime_test.go +++ b/runtime/runtime_test.go @@ -9316,7 +9316,6 @@ func TestRuntimeWrappedErrorHandling(t *testing.T) { assertRuntimeErrorIsUserError(t, err) } -<<<<<<< 238db584c (Merge pull request #2778 from onflow/bastian/capability-exists) func BenchmarkRuntimeResourceTracking(b *testing.B) { runtime := newTestInterpreterRuntime() @@ -9614,31 +9613,26 @@ func TestRuntimeEventEmission(t *testing.T) { ) }) -======= +} + func TestRuntimeInvalidWrappedPrivateCapability(t *testing.T) { t.Parallel() runtime := newTestInterpreterRuntime() runtime.defaultConfig.AtreeValidationEnabled = false - runtime.defaultConfig.AccountLinkingEnabled = true address := common.MustBytesToAddress([]byte{0x1}) - linkTx := []byte(` - #allowAccountLinking + helperContract := []byte(` + access(all) + contract Foo { - transaction { - prepare(acct: AuthAccount) { - acct.linkAccount(/private/foo) - } - } - `) + access(all) + struct Thing { - helperContract := []byte(` - pub contract Foo { - pub struct Thing { - pub let cap: Capability + access(all) + let cap: Capability init(cap: Capability) { self.cap = cap @@ -9650,10 +9644,11 @@ func TestRuntimeInvalidWrappedPrivateCapability(t *testing.T) { getCapScript := []byte(` import Foo from 0x1 - pub fun main(addr: Address): AnyStruct { - let acct = getAuthAccount(addr) - let authCap = acct.getCapability<&AuthAccount>(/private/foo) - return Foo.Thing(cap: authCap) + access(all) + fun main(addr: Address): AnyStruct { + let acct = getAuthAccount<auth(Capabilities) &Account>(addr) + let cap = acct.capabilities.account.issue<auth(Storage) &Account>() + return Foo.Thing(cap: cap) } `) @@ -9661,8 +9656,9 @@ func TestRuntimeInvalidWrappedPrivateCapability(t *testing.T) { import Foo from 0x1 transaction(thing: Foo.Thing) { - prepare(_: AuthAccount) { - thing.cap.borrow<&AuthAccount>()!.save("Hello, World", to: /storage/attack) + prepare(_: &Account) { + thing.cap.borrow<auth(Storage) &Account>()! + .storage.save("Hello, World", to: /storage/attack) } } `) @@ -9700,22 +9696,9 @@ func TestRuntimeInvalidWrappedPrivateCapability(t *testing.T) { nextTransactionLocation := newTransactionLocationGenerator() nextScriptLocation := newScriptLocationGenerator() - // Deploy - - err := runtime.ExecuteTransaction( - Script{ - Source: linkTx, - }, - Context{ - Interface: runtimeInterface, - Location: nextTransactionLocation(), - }, - ) - require.NoError(t, err) - // Deploy helper contract - err = runtime.ExecuteTransaction( + err := runtime.ExecuteTransaction( Script{ Source: deploy, }, @@ -9760,5 +9743,4 @@ func TestRuntimeInvalidWrappedPrivateCapability(t *testing.T) { var argumentNotImportableErr *ArgumentNotImportableError require.ErrorAs(t, err, &argumentNotImportableErr) ->>>>>>> 833562efb (Merge pull request #2795 from onflow/release/v0.41.1) } diff --git a/runtime/sema/string_type.go b/runtime/sema/string_type.go remerge CONFLICT (content): Merge conflict in runtime/sema/string_type.go index 37cb87b25..b4fa76259 100644 --- a/runtime/sema/string_type.go +++ b/runtime/sema/string_type.go @@ -315,20 +315,15 @@ var StringTypeFromCharactersFunctionType = NewSimpleFunctionType( }), }, }, -<<<<<<< 238db584c (Merge pull request #2778 from onflow/bastian/capability-exists) StringTypeAnnotation, ) -======= - ReturnTypeAnnotation: NewTypeAnnotation( - StringType, - ), -} -var StringTypeJoinFunctionType = &FunctionType{ - Parameters: []Parameter{ +var StringTypeJoinFunctionType = NewSimpleFunctionType( + FunctionPurityView, + []Parameter{ { Label: ArgumentLabelNotRequired, - Identifier: "strs", + Identifier: "strings", TypeAnnotation: NewTypeAnnotation(&VariableSizedType{ Type: StringType, }), @@ -338,6 +333,5 @@ var StringTypeJoinFunctionType = &FunctionType{ TypeAnnotation: NewTypeAnnotation(StringType), }, }, - ReturnTypeAnnotation: NewTypeAnnotation(StringType), -} ->>>>>>> 833562efb (Merge pull request #2795 from onflow/release/v0.41.1) + StringTypeAnnotation, +)masterbranchFiles changedin the Github PR explorer