Merge master to Stable Cadence feature branch #2593
Merged
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
This function will call the emulator's Blockchain.ReloadBlockchain method, under the hood.
Add tests for test framework blockchain
- AnyStructAttachmentType - AnyResourceAttachmentType
…hmentType-and-AnyResourceAttachmentType-in-CCF Support 2 new attachment types in CCF codec
Improve linting
Improve export and encoding
turbolent
requested review from
SupunS,
dsainati1 and
joshuahannan
as code owners
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:feature/stable-cadence commit 6fd0e01 Collapsed results for better readability
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Codecov Report
@@ Coverage Diff @@
## feature/stable-cadence #2593 +/- ##
==========================================================
- Coverage 78.84% 78.81% -0.03%
==========================================================
Files 340 337 -3
Lines 80309 78668 -1641
==========================================================
- Hits 63321 62004 -1317
+ Misses 14689 14377 -312
+ Partials 2299 2287 -12
Flags with carried forward coverage won't be shown. Click here to find out more.
|
SupunS
reviewed
Jun 21, 2023
SupunS
approved these changes
Jun 21, 2023
6 tasks
|
96ebaf5 is there now, looks like GitHub was having issues again |
dsainati1
approved these changes
Jun 22, 2023
|
Updated the PR description with diffs of all three conflict resolutions as well as the two additional commits to adjust tests |
SupunS
approved these changes
Jun 22, 2023
dsainati1
approved these changes
Jun 22, 2023
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
Additional adjustments (only tests) in d0bffa8 and dda2353
Conflict resolution 1:
commit fadb1f6ed22b2eb82a2e1f46f2395ae7ba93c417 Merge: a0862a6b5 1311ef1ed Author: Bastian Müller <bastian@axiomzen.co> Date: Wed Jun 21 12:26:03 2023 -0700 Merge branch 'master' into bastian/sync-stable-cadence-2 diff --git a/encoding/json/decode.go b/encoding/json/decode.go remerge CONFLICT (content): Merge conflict in encoding/json/decode.go index e8f0ca008..ab3c2ee07 100644 --- a/encoding/json/decode.go +++ b/encoding/json/decode.go @@ -135,11 +135,8 @@ const ( typeParametersKey = "typeParameters" returnKey = "return" typeBoundKey = "typeBound" -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) purityKey = "purity" -======= functionTypeKey = "functionType" ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) ) func (d *Decoder) decodeJSON(v any) cadence.Value { @@ -980,7 +977,6 @@ func (d *Decoder) decodeFieldType(valueJSON any, results typeDecodingResults) ca ) } -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) func (d *Decoder) decodePurity(purity any) cadence.FunctionPurity { functionPurity := toString(purity) if functionPurity == "view" { @@ -990,14 +986,10 @@ func (d *Decoder) decodePurity(purity any) cadence.FunctionPurity { } func (d *Decoder) decodeFunctionType(typeParametersValue, parametersValue, returnValue any, purity any, results typeDecodingResults) cadence.Type { - typeParameters := d.decodeTypeParameters(toSlice(typeParametersValue), results) -======= -func (d *Decoder) decodeFunctionType(typeParametersValue, parametersValue, returnValue any, results typeDecodingResults) cadence.Type { var typeParameters []cadence.TypeParameter if typeParametersValue != nil { typeParameters = d.decodeTypeParameters(toSlice(typeParametersValue), results) } ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) parameters := d.decodeParameters(toSlice(parametersValue), results) returnType := d.decodeType(returnValue, results) functionPurity := d.decodePurity(purity) diff --git a/encoding/json/encoding_test.go b/encoding/json/encoding_test.go remerge CONFLICT (content): Merge conflict in encoding/json/encoding_test.go index e6ce72286..da5b0b304 100644 --- a/encoding/json/encoding_test.go +++ b/encoding/json/encoding_test.go @@ -2462,11 +2462,8 @@ func TestEncodeType(t *testing.T) { "value": { "staticType": { "kind": "Function", -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) "purity": "", -======= "typeID": "(<T>(String):Int)", ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) "return": { "kind": "Int" }, @@ -2495,7 +2492,6 @@ func TestEncodeType(t *testing.T) { }) -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) t.Run("with view static function", func(t *testing.T) { testEncodeAndDecode( @@ -2521,7 +2517,10 @@ func TestEncodeType(t *testing.T) { ]} } }`, -======= + ) + + }) + t.Run("with static function, without type parameters (decode only)", func(t *testing.T) { testDecode( @@ -2558,12 +2557,9 @@ func TestEncodeType(t *testing.T) { ReturnType: cadence.IntType{}, }, }, ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) ) - }) -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) t.Run("with implicit purity", func(t *testing.T) { encodedValue := `{"type":"Type","value":{"staticType": @@ -2592,8 +2588,6 @@ func TestEncodeType(t *testing.T) { require.Equal(t, value, decodedValue) }) -======= ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) t.Run("with static Capability<Int>", func(t *testing.T) { testEncodeAndDecode( diff --git a/runtime/account_test.go b/runtime/account_test.go remerge CONFLICT (content): Merge conflict in runtime/account_test.go index 638af2871..5fd6db73a 100644 --- a/runtime/account_test.go +++ b/runtime/account_test.go @@ -39,134 +39,6 @@ import ( . "github.com/onflow/cadence/runtime/tests/utils" ) -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) -======= -func TestRuntimeTransaction_AddPublicKey(t *testing.T) { - - t.Parallel() - - rt := newTestInterpreterRuntime() - - keyA := cadence.NewArray([]cadence.Value{ - cadence.NewUInt8(1), - cadence.NewUInt8(2), - cadence.NewUInt8(3), - }) - - keyB := cadence.NewArray([]cadence.Value{ - cadence.NewUInt8(4), - cadence.NewUInt8(5), - cadence.NewUInt8(6), - }) - - keys := cadence.NewArray([]cadence.Value{ - keyA, - keyB, - }) - - var tests = []struct { - name string - code string - args []cadence.Value - expected [][]byte - keyCount int - }{ - { - name: "Single key", - code: ` - transaction(keyA: [UInt8]) { - prepare(signer: AuthAccount) { - let acct = AuthAccount(payer: signer) - acct.addPublicKey(keyA) - } - } - `, - keyCount: 1, - args: []cadence.Value{keyA}, - expected: [][]byte{{1, 2, 3}}, - }, - { - name: "Multiple keys", - code: ` - transaction(keys: [[UInt8]]) { - prepare(signer: AuthAccount) { - let acct = AuthAccount(payer: signer) - for key in keys { - acct.addPublicKey(key) - } - } - } - `, - keyCount: 2, - args: []cadence.Value{keys}, - expected: [][]byte{{1, 2, 3}, {4, 5, 6}}, - }, - } - - nextTransactionLocation := newTransactionLocationGenerator() - - for _, tt := range tests { - - var events []cadence.Event - var keys [][]byte - - runtimeInterface := &testRuntimeInterface{ - storage: newTestLedger(nil, nil), - getSigningAccounts: func() ([]Address, error) { - return []Address{{42}}, nil - }, - createAccount: func(payer Address) (address Address, err error) { - return Address{42}, nil - }, - addEncodedAccountKey: func(address Address, publicKey []byte) error { - keys = append(keys, publicKey) - return nil - }, - emitEvent: func(event cadence.Event) error { - events = append(events, event) - return nil - }, - decodeArgument: func(b []byte, t cadence.Type) (value cadence.Value, err error) { - return json.Decode(nil, b) - }, - } - - t.Run(tt.name, func(t *testing.T) { - - args := make([][]byte, len(tt.args)) - for i, arg := range tt.args { - var err error - args[i], err = json.Encode(arg) - if err != nil { - panic(fmt.Errorf("broken test: invalid argument: %w", err)) - } - } - - err := rt.ExecuteTransaction( - Script{ - Source: []byte(tt.code), - Arguments: args, - }, - Context{ - Interface: runtimeInterface, - Location: nextTransactionLocation(), - }, - ) - require.NoError(t, err) - assert.Len(t, events, tt.keyCount+1) - assert.Len(t, keys, tt.keyCount) - assert.Equal(t, tt.expected, keys) - - assert.EqualValues(t, stdlib.AccountCreatedEventType.ID(), events[0].Type().ID()) - - for _, event := range events[1:] { - assert.EqualValues(t, stdlib.AccountKeyAddedFromByteArrayEventType.ID(), event.Type().ID()) - } - }) - } -} - ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) func TestRuntimeAccountKeyConstructor(t *testing.T) { t.Parallel() diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go remerge CONFLICT (content): Merge conflict in runtime/runtime_test.go index c068f2fa5..b06d8bb6a 100644 --- a/runtime/runtime_test.go +++ b/runtime/runtime_test.go @@ -2788,24 +2788,15 @@ func TestRuntimeScriptReturnSpecial(t *testing.T) { } `, expected: cadence.Function{ -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) - FunctionType: &cadence.FunctionType{ - Purity: sema.FunctionPurityView, - Parameters: []cadence.Parameter{ - { - Label: sema.ArgumentLabelNotRequired, - Identifier: "message", - Type: cadence.StringType{}, -======= FunctionType: cadence.TypeWithCachedTypeID( &cadence.FunctionType{ + Purity: sema.FunctionPurityView, Parameters: []cadence.Parameter{ { Label: sema.ArgumentLabelNotRequired, Identifier: "message", Type: cadence.StringType{}, }, ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) }, ReturnType: cadence.NeverType{}, }, diff --git a/runtime/sema/type.go b/runtime/sema/type.go remerge CONFLICT (content): Merge conflict in runtime/sema/type.go index 796890f48..e3b08a0a7 100644 --- a/runtime/sema/type.go +++ b/runtime/sema/type.go @@ -1578,15 +1578,15 @@ var ( WithTag(Word128TypeTag). WithIntRange(Word128TypeMinIntBig, Word128TypeMaxIntBig) -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) Word128TypeAnnotation = NewTypeAnnotation(Word128Type) -======= + // Word256Type represents the 256-bit unsigned integer type `Word256` // which does NOT check for overflow and underflow Word256Type = NewNumericType(Word256TypeName). WithTag(Word256TypeTag). WithIntRange(Word256TypeMinIntBig, Word256TypeMaxIntBig) ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) + + Word256TypeAnnotation = NewTypeAnnotation(Word256Type) // FixedPointType represents the super-type of all fixed-point types FixedPointType = NewNumericType(FixedPointTypeName). diff --git a/runtime/stdlib/account.go b/runtime/stdlib/account.go remerge CONFLICT (content): Merge conflict in runtime/stdlib/account.go index 1393a5148..c1dfce2c0 100644 --- a/runtime/stdlib/account.go +++ b/runtime/stdlib/account.go @@ -457,120 +457,6 @@ func newStorageCapacityGetFunction( } } -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) -======= -type AccountEncodedKeyAdditionHandler interface { - EventEmitter - // AddEncodedAccountKey appends an encoded key to an account. - AddEncodedAccountKey(address common.Address, key []byte) error -} - -func newAddPublicKeyFunction( - gauge common.MemoryGauge, - handler AccountEncodedKeyAdditionHandler, - addressValue interpreter.AddressValue, -) *interpreter.HostFunctionValue { - - // Converted addresses can be cached and don't have to be recomputed on each function invocation - address := addressValue.ToAddress() - - return interpreter.NewHostFunctionValue( - gauge, - sema.AuthAccountTypeAddPublicKeyFunctionType, - func(invocation interpreter.Invocation) interpreter.Value { - publicKeyValue, ok := invocation.Arguments[0].(*interpreter.ArrayValue) - if !ok { - panic(errors.NewUnreachableError()) - } - - locationRange := invocation.LocationRange - - inter := invocation.Interpreter - - publicKey, err := interpreter.ByteArrayValueToByteSlice(inter, publicKeyValue, locationRange) - if err != nil { - panic("addPublicKey requires the first argument to be a byte array") - } - - errors.WrapPanic(func() { - err = handler.AddEncodedAccountKey(address, publicKey) - }) - if err != nil { - panic(err) - } - - handler.EmitEvent( - inter, - AccountKeyAddedFromByteArrayEventType, - []interpreter.Value{ - addressValue, - publicKeyValue, - }, - locationRange, - ) - - return interpreter.Void - }, - ) -} - -type AccountEncodedKeyRevocationHandler interface { - EventEmitter - // RevokeEncodedAccountKey removes a key from an account by index, add returns the encoded key. - RevokeEncodedAccountKey(address common.Address, index int) ([]byte, error) -} - -func newRemovePublicKeyFunction( - gauge common.MemoryGauge, - handler AccountEncodedKeyRevocationHandler, - addressValue interpreter.AddressValue, -) *interpreter.HostFunctionValue { - - // Converted addresses can be cached and don't have to be recomputed on each function invocation - address := addressValue.ToAddress() - - return interpreter.NewHostFunctionValue( - gauge, - sema.AuthAccountTypeRemovePublicKeyFunctionType, - func(invocation interpreter.Invocation) interpreter.Value { - index, ok := invocation.Arguments[0].(interpreter.IntValue) - if !ok { - panic(errors.NewUnreachableError()) - } - - var publicKey []byte - var err error - errors.WrapPanic(func() { - publicKey, err = handler.RevokeEncodedAccountKey(address, index.ToInt(invocation.LocationRange)) - }) - if err != nil { - panic(err) - } - - inter := invocation.Interpreter - locationRange := invocation.LocationRange - - publicKeyValue := interpreter.ByteSliceToByteArrayValue( - inter, - publicKey, - ) - - handler.EmitEvent( - inter, - AccountKeyRemovedFromByteArrayEventType, - []interpreter.Value{ - addressValue, - publicKeyValue, - }, - locationRange, - ) - - return interpreter.Void - }, - ) -} - ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) type AccountKeyAdditionHandler interface { EventEmitter PublicKeyValidator diff --git a/runtime/stdlib/flow.go b/runtime/stdlib/flow.go remerge CONFLICT (content): Merge conflict in runtime/stdlib/flow.go index 1a7330c12..d4d5b9ede 100644 --- a/runtime/stdlib/flow.go +++ b/runtime/stdlib/flow.go @@ -190,19 +190,6 @@ var AccountEventCodeHashParameter = sema.Parameter{ TypeAnnotation: HashTypeAnnotation, } -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) -var AccountEventPublicKeyParameter = sema.Parameter{ - Identifier: "publicKey", - TypeAnnotation: sema.ByteArrayTypeAnnotation, -======= -var AccountEventPublicKeyParameterAsByteArrayType = sema.Parameter{ - Identifier: "publicKey", - TypeAnnotation: sema.NewTypeAnnotation( - sema.ByteArrayType, - ), ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) -} - var AccountEventPublicKeyParameterAsCompositeType = sema.Parameter{ Identifier: "publicKey", TypeAnnotation: sema.NewTypeAnnotation( @@ -227,24 +214,12 @@ var AccountCreatedEventType = newFlowEventType( AccountEventAddressParameter, ) -var AccountKeyAddedFromByteArrayEventType = newFlowEventType( - "AccountKeyAdded", - AccountEventAddressParameter, - AccountEventPublicKeyParameterAsByteArrayType, -) - var AccountKeyAddedFromPublicKeyEventType = newFlowEventType( "AccountKeyAdded", AccountEventAddressParameter, AccountEventPublicKeyParameterAsCompositeType, ) -var AccountKeyRemovedFromByteArrayEventType = newFlowEventType( - "AccountKeyRemoved", - AccountEventAddressParameter, - AccountEventPublicKeyParameterAsByteArrayType, -) - var AccountKeyRemovedFromPublicKeyIndexEventType = newFlowEventType( "AccountKeyRemoved", AccountEventAddressParameter, diff --git a/runtime/stdlib/flow_test.go b/runtime/stdlib/flow_test.go index bbc6ea26f..e57c8737d 100644 --- a/runtime/stdlib/flow_test.go +++ b/runtime/stdlib/flow_test.go @@ -37,9 +37,7 @@ func TestFlowEventTypeIDs(t *testing.T) { for _, ty := range []sema.Type{ AccountCreatedEventType, - AccountKeyAddedFromByteArrayEventType, AccountKeyAddedFromPublicKeyEventType, - AccountKeyRemovedFromByteArrayEventType, AccountKeyRemovedFromPublicKeyIndexEventType, AccountContractAddedEventType, AccountContractUpdatedEventType, diff --git a/runtime/tests/interpreter/reference_test.go b/runtime/tests/interpreter/reference_test.go remerge CONFLICT (content): Merge conflict in runtime/tests/interpreter/reference_test.go index b4c8abbe7..94664f970 100644 --- a/runtime/tests/interpreter/reference_test.go +++ b/runtime/tests/interpreter/reference_test.go @@ -540,7 +540,6 @@ func TestInterpretReferenceExpressionOfOptional(t *testing.T) { }) } -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) func TestInterpretResourceReferenceInvalidationOnMove(t *testing.T) { t.Parallel() @@ -630,18 +629,10 @@ func TestInterpretResourceReferenceInvalidationOnMove(t *testing.T) { }) t.Run("account to stack", func(t *testing.T) { -======= -func TestInterpretReferenceTrackingOnInvocation(t *testing.T) { - - t.Parallel() - - t.Run("simple resource", func(t *testing.T) { ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) t.Parallel() inter := parseCheckAndInterpret(t, ` -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) resource R { pub(set) var id: Int @@ -1244,7 +1235,20 @@ func TestInterpretResourceReferenceInvalidationOnDestroy(t *testing.T) { _, err := inter.Invoke("test") RequireError(t, err) require.ErrorAs(t, err, &interpreter.DestroyedResourceError{}) -======= + + }) +} + +func TestInterpretReferenceTrackingOnInvocation(t *testing.T) { + + t.Parallel() + + t.Run("simple resource", func(t *testing.T) { + + t.Parallel() + + inter := parseCheckAndInterpret(t, + ` pub resource Foo { pub let id: UInt8 @@ -1274,6 +1278,5 @@ func TestInterpretResourceReferenceInvalidationOnDestroy(t *testing.T) { _, err := inter.Invoke("main") require.NoError(t, err) ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) }) } diff --git a/values_test.go b/values_test.go remerge CONFLICT (content): Merge conflict in values_test.go index 31d24528a..d8a218222 100644 --- a/values_test.go +++ b/values_test.go @@ -601,22 +601,13 @@ func TestNumberValue_ToBigEndianBytes(t *testing.T) { uint128MaxValue: {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}, }, "UInt256": { -<<<<<<< a0862a6b5 (Merge pull request #2513 from onflow/bastian/sync-stable-cadence) NewUInt256(0): {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, NewUInt256(42): {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42}, NewUInt256(127): {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127}, NewUInt256(128): {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128}, NewUInt256(200): {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 200}, - UInt256{sema.UInt256TypeMaxIntBig}: {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}, -======= - NewUInt256(0): {0}, - NewUInt256(42): {42}, - NewUInt256(127): {127}, - NewUInt256(128): {128}, - NewUInt256(200): {200}, uint256LargeValueTestCase: {127, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}, uint256MaxValue: {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}, ->>>>>>> 1311ef1ed (Merge pull request #2591 from onflow/release/v0.39.12) }, // Word* "Word8": {Conflict resolution 2:
commit 96ebaf5dd3de2b8e9549473ec88e16dc0f9ba102 Merge: e17ca20d1 115c6c411 Author: Bastian Müller <bastian@axiomzen.co> Date: Wed Jun 21 17:13:13 2023 -0700 Merge branch 'feature/stable-cadence' into bastian/sync-stable-cadence-2 diff --git a/runtime/interpreter/sharedstate.go b/runtime/interpreter/sharedstate.go remerge CONFLICT (content): Merge conflict in runtime/interpreter/sharedstate.go index 5db4ce05a..c7529d615 100644 --- a/runtime/interpreter/sharedstate.go +++ b/runtime/interpreter/sharedstate.go @@ -43,12 +43,9 @@ type SharedState struct { storageMutatedDuringIteration bool CapabilityControllerIterations map[AddressPath]int MutationDuringCapabilityControllerIteration bool -<<<<<<< e17ca20d1 (bring back test) containerValueIteration map[atree.StorageID]struct{} destroyedResources map[atree.StorageID]struct{} -======= currentEntitlementMappedValue Authorization ->>>>>>> 115c6c411 (Merge pull request #2594 from onflow/sainati/merge-entitlements) } func NewSharedState(config *Config) *SharedState { diff --git a/runtime/interpreter/value.go b/runtime/interpreter/value.go remerge CONFLICT (content): Merge conflict in runtime/interpreter/value.go index 4d3f93832..340d5f9eb 100644 --- a/runtime/interpreter/value.go +++ b/runtime/interpreter/value.go @@ -15356,21 +15356,7 @@ func (v *CompositeValue) Destroy(interpreter *Interpreter, locationRange Locatio }() } -<<<<<<< e17ca20d1 (bring back test) storageID := v.StorageID() -======= - // if this type has attachments, destroy all of them before invoking the destructor - v.forEachAttachment(interpreter, locationRange, func(attachment *CompositeValue) { - // an attachment's destructor may make reference to `base`, so we must set the base value - // for the attachment before invoking its destructor. For other functions, this happens - // automatically when the attachment is accessed with the access expression `v[A]`, which - // is a necessary pre-requisite for calling any members of the attachment. However, in - // the case of a destructor, this is called implicitly, and thus must have its `base` - // set manually - attachment.setBaseValue(interpreter, v, attachmentBaseAuthorization(interpreter, attachment)) - attachment.Destroy(interpreter, locationRange) - }) ->>>>>>> 115c6c411 (Merge pull request #2594 from onflow/sainati/merge-entitlements) interpreter.withResourceDestruction( storageID, @@ -15384,7 +15370,7 @@ func (v *CompositeValue) Destroy(interpreter *Interpreter, locationRange Locatio // is a necessary pre-requisite for calling any members of the attachment. However, in // the case of a destructor, this is called implicitly, and thus must have its `base` // set manually - attachment.setBaseValue(interpreter, v) + attachment.setBaseValue(interpreter, v, attachmentBaseAuthorization(interpreter, attachment)) attachment.Destroy(interpreter, locationRange) }) @@ -15395,26 +15381,7 @@ func (v *CompositeValue) Destroy(interpreter *Interpreter, locationRange Locatio v.Destructor = interpreter.SharedState.typeCodes.CompositeCodes[v.TypeID()].DestructorFunction } -<<<<<<< e17ca20d1 (bring back test) destructor := v.Destructor -======= - if destructor != nil { - var base *EphemeralReferenceValue - var self MemberAccessibleValue = v - if v.Kind == common.CompositeKindAttachment { - base, self = attachmentBaseAndSelfValues(interpreter, locationRange, v) - } - invocation := NewInvocation( - interpreter, - &self, - base, - nil, - nil, - nil, - nil, - locationRange, - ) ->>>>>>> 115c6c411 (Merge pull request #2594 from onflow/sainati/merge-entitlements) if destructor != nil { var base *EphemeralReferenceValue @@ -15429,6 +15396,7 @@ func (v *CompositeValue) Destroy(interpreter *Interpreter, locationRange Locatio nil, nil, nil, + nil, locationRange, ) diff --git a/types.go b/types.go remerge CONFLICT (content): Merge conflict in types.go index b022e67a6..6fb0e1a74 100644 --- a/types.go +++ b/types.go @@ -20,11 +20,8 @@ package cadence import ( "fmt" -<<<<<<< e17ca20d1 (bring back test) "reflect" -======= "strings" ->>>>>>> 115c6c411 (Merge pull request #2594 from onflow/sainati/merge-entitlements) "sync" "github.com/onflow/cadence/runtime/common"Conflict resolution 3:
commit 5bded4bad2e408a5bcc9bd156c698aa60babb954 Merge: 96ebaf5dd 6fd0e0153 Author: Bastian Müller <bastian@axiomzen.co> Date: Thu Jun 22 09:47:50 2023 -0700 Merge branch 'feature/stable-cadence' into bastian/sync-stable-cadence-2 diff --git a/runtime/sema/authaccount.cdc b/runtime/sema/authaccount.cdc index 9bfbadfbb..e987a4094 100644 --- a/runtime/sema/authaccount.cdc +++ b/runtime/sema/authaccount.cdc @@ -103,7 +103,7 @@ access(all) struct AuthAccount { /// The given type must not necessarily be exactly the same as the type of the borrowed object. /// /// The path must be a storage path, i.e., only the domain `storage` is allowed. - pub fun check<T: Any>(from: StoragePath): Bool + access(all) fun check<T: Any>(from: StoragePath): Bool /// **DEPRECATED**: Instead, use `capabilities.storage.issue`, and `capabilities.publish` if the path is public. /// diff --git a/runtime/sema/authaccount.gen.go b/runtime/sema/authaccount.gen.go remerge CONFLICT (content): Merge conflict in runtime/sema/authaccount.gen.go index 22b9c60a1..2106e5b45 100644 --- a/runtime/sema/authaccount.gen.go +++ b/runtime/sema/authaccount.gen.go @@ -1951,18 +1951,14 @@ func init() { ), NewUnmeteredFunctionMember( AuthAccountType, -<<<<<<< 96ebaf5dd (Merge branch 'feature/stable-cadence' into bastian/sync-stable-cadence-2) - ast.AccessPublic, + ast.AccessAll, AuthAccountTypeCheckFunctionName, AuthAccountTypeCheckFunctionType, AuthAccountTypeCheckFunctionDocString, ), NewUnmeteredFunctionMember( AuthAccountType, - ast.AccessPublic, -======= ast.AccessAll, ->>>>>>> 6fd0e0153 (Merge pull request #2540 from onflow/sainati/remove-pub-priv) AuthAccountTypeLinkFunctionName, AuthAccountTypeLinkFunctionType, AuthAccountTypeLinkFunctionDocString, diff --git a/runtime/stdlib/contracts/test.cdc b/runtime/stdlib/contracts/test.cdc remerge CONFLICT (content): Merge conflict in runtime/stdlib/contracts/test.cdc index 3390aa682..25392726b 100644 --- a/runtime/stdlib/contracts/test.cdc +++ b/runtime/stdlib/contracts/test.cdc @@ -98,33 +98,33 @@ access(all) contract Test { /// Returns all the logs from the blockchain, up to the calling point. /// - pub fun logs(): [String] { + access(all) fun logs(): [String] { return self.backend.logs() } /// Returns the service account of the blockchain. Can be used to sign /// transactions with this account. /// - pub fun serviceAccount(): Account { + access(all) fun serviceAccount(): Account { return self.backend.serviceAccount() } /// Returns all events emitted from the blockchain. /// - pub fun events(): [AnyStruct] { + access(all) fun events(): [AnyStruct] { return self.backend.events(nil) } /// Returns all events emitted from the blockchain, /// filtered by type. /// - pub fun eventsOfType(_ type: Type): [AnyStruct] { + access(all) fun eventsOfType(_ type: Type): [AnyStruct] { return self.backend.events(type) } /// Resets the state of the blockchain. /// - pub fun reset() { + access(all) fun reset() { self.backend.reset() } } @@ -289,29 +289,25 @@ access(all) contract Test { /// Set the configuration to be used by the blockchain. /// Overrides any existing configuration. /// -<<<<<<< 96ebaf5dd (Merge branch 'feature/stable-cadence' into bastian/sync-stable-cadence-2) - pub fun useConfiguration(_ configuration: Configuration) + access(all) fun useConfiguration(_ configuration: Configuration) /// Returns all the logs from the blockchain, up to the calling point. /// - pub fun logs(): [String] + access(all) fun logs(): [String] /// Returns the service account of the blockchain. Can be used to sign /// transactions with this account. /// - pub fun serviceAccount(): Account + access(all) fun serviceAccount(): Account /// Returns all events emitted from the blockchain, optionally filtered /// by type. /// - pub fun events(_ type: Type?): [AnyStruct] + access(all) fun events(_ type: Type?): [AnyStruct] /// Resets the state of the blockchain. /// - pub fun reset() -======= - access(all) fun useConfiguration(_ configuration: Configuration) ->>>>>>> 6fd0e0153 (Merge pull request #2540 from onflow/sainati/remove-pub-priv) + access(all) fun reset() } /// Returns a new matcher that negates the test of the given matcher.masterfeature/stable-cadencebranchFiles changedin the Github PR explorer