Sync feature/atree-register-inlining-v1.0 with master #3351
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
Make migration error stacktrace configurable
…at no migration is necessary
…igration-results Add/improve caching in static type and entitlements migration
…onfiguration Update flow-go related configuration
Port bug fixes
…ommit-for-migration Add Storage.NondeterministicCommit for faster migrations
Check dictionary keys when checking the ability for dereferencing
Use parent to determine whether an expression is target of an invocation
Add back transaction `execute` tests
Improve static validation of contract/transaction moves
…to supun/port-222
Wrap host-function typed member-values with a bound-function
Add invalidation for storage references
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:feature/atree-register-inlining-v1.0 commit ab00c49 Collapsed results for better readability
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
fxamacker
merged commit 72871ab
into
feature/atree-register-inlining-v1.0
7 of 9 checks passed
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.
Merge
masterintofeature/atree-register-inlining-v1.0Conflict Resolution
commit 986cb088969cda297f70c7713f662ef6820984bb Merge: ab00c4942 bb4542c46 Author: Faye Amacker <33205765+fxamacker@users.noreply.github.com> Date: Wed May 15 13:05:31 2024 -0500 Merge branch 'master' into fxamacker/sync-atree-register-inlining-v1.0 diff --git a/go.mod b/go.mod remerge CONFLICT (content): Merge conflict in go.mod index a59dbfdc0..0898c48e9 100644 --- a/go.mod +++ b/go.mod @@ -13,11 +13,7 @@ require ( github.com/kr/pretty v0.3.1 github.com/leanovate/gopter v0.2.9 github.com/logrusorgru/aurora/v4 v4.0.0 -<<<<<<< ab00c4942 (Merge pull request #3346 from onflow/fxamacker/bump-atree-inlining-version-for-cadence-v1.0) github.com/onflow/atree v0.8.0-rc.2 -======= - github.com/onflow/atree v0.7.0-rc.2 ->>>>>>> bb4542c46 (Merge pull request #3349 from onflow/release/v1.0.0-preview.27) github.com/rivo/uniseg v0.4.4 github.com/schollz/progressbar/v3 v3.13.1 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum remerge CONFLICT (content): Merge conflict in go.sum index db9244683..6e2283683 100644 --- a/go.sum +++ b/go.sum @@ -72,13 +72,8 @@ github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvr github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -<<<<<<< ab00c4942 (Merge pull request #3346 from onflow/fxamacker/bump-atree-inlining-version-for-cadence-v1.0) github.com/onflow/atree v0.8.0-rc.2 h1:7XYaOiiYJqLadzmyLyju2ztoqyTw/ikzcI0HI2LA+bI= github.com/onflow/atree v0.8.0-rc.2/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A= -======= -github.com/onflow/atree v0.7.0-rc.2 h1:mZmVrl/zPlfI44EjV3FdR2QwIqT8nz1sCONUBFcML/U= -github.com/onflow/atree v0.7.0-rc.2/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= ->>>>>>> bb4542c46 (Merge pull request #3349 from onflow/release/v1.0.0-preview.27) github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg= github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= diff --git a/runtime/stdlib/account.go b/runtime/stdlib/account.go remerge CONFLICT (content): Merge conflict in runtime/stdlib/account.go index 6b74434a6..546f00554 100644 --- a/runtime/stdlib/account.go +++ b/runtime/stdlib/account.go @@ -977,7 +977,6 @@ func newAccountInboxPublishFunction( locationRange, ) -<<<<<<< ab00c4942 (Merge pull request #3346 from onflow/fxamacker/bump-atree-inlining-version-for-cadence-v1.0) publishedValue := interpreter.NewPublishedValue(inter, recipientValue, value).Transfer( inter, locationRange, @@ -987,16 +986,6 @@ func newAccountInboxPublishFunction( nil, true, // New PublishedValue is standalone. ) -======= - publishedValue := interpreter.NewPublishedValue(inter, recipientValue, value).Transfer( - inter, - locationRange, - atree.Address(provider), - true, - nil, - nil, - ) ->>>>>>> bb4542c46 (Merge pull request #3349 from onflow/release/v1.0.0-preview.27) storageMapKey := interpreter.StringStorageMapKey(nameValue.Str) @@ -1059,7 +1048,6 @@ func newAccountInboxUnpublishFunction( }) } -<<<<<<< ab00c4942 (Merge pull request #3346 from onflow/fxamacker/bump-atree-inlining-version-for-cadence-v1.0) value := publishedValue.Value.Transfer( inter, locationRange, @@ -1069,16 +1057,6 @@ func newAccountInboxUnpublishFunction( nil, false, // publishedValue is an element in storage map because it is returned by ReadStored. ) -======= - value := publishedValue.Value.Transfer( - inter, - locationRange, - atree.Address{}, - true, - nil, - nil, - ) ->>>>>>> bb4542c46 (Merge pull request #3349 from onflow/release/v1.0.0-preview.27) inter.WriteStored( provider, @@ -1160,7 +1138,6 @@ func newAccountInboxClaimFunction( }) } -<<<<<<< ab00c4942 (Merge pull request #3346 from onflow/fxamacker/bump-atree-inlining-version-for-cadence-v1.0) value := publishedValue.Value.Transfer( inter, locationRange, @@ -1170,16 +1147,6 @@ func newAccountInboxClaimFunction( nil, false, // publishedValue is an element in storage map because it is returned by ReadStored. ) -======= - value := publishedValue.Value.Transfer( - inter, - locationRange, - atree.Address{}, - true, - nil, - nil, - ) ->>>>>>> bb4542c46 (Merge pull request #3349 from onflow/release/v1.0.0-preview.27) inter.WriteStored( providerAddress, @@ -3442,7 +3409,6 @@ func newAccountCapabilitiesPublishFunction( }) } -<<<<<<< ab00c4942 (Merge pull request #3346 from onflow/fxamacker/bump-atree-inlining-version-for-cadence-v1.0) capabilityValue, ok = capabilityValue.Transfer( inter, locationRange, @@ -3455,19 +3421,6 @@ func newAccountCapabilitiesPublishFunction( if !ok { panic(errors.NewUnreachableError()) } -======= - capabilityValue, ok = capabilityValue.Transfer( - inter, - locationRange, - atree.Address(accountAddress), - true, - nil, - nil, - ).(*interpreter.IDCapabilityValue) - if !ok { - panic(errors.NewUnreachableError()) - } ->>>>>>> bb4542c46 (Merge pull request #3349 from onflow/release/v1.0.0-preview.27) // Write new value @@ -3527,7 +3480,6 @@ func newAccountCapabilitiesUnpublishFunction( panic(errors.NewUnreachableError()) } -<<<<<<< ab00c4942 (Merge pull request #3346 from onflow/fxamacker/bump-atree-inlining-version-for-cadence-v1.0) capabilityValue, ok = capabilityValue.Transfer( inter, locationRange, @@ -3540,19 +3492,6 @@ func newAccountCapabilitiesUnpublishFunction( if !ok { panic(errors.NewUnreachableError()) } -======= - capabilityValue, ok = capabilityValue.Transfer( - inter, - locationRange, - atree.Address{}, - true, - nil, - nil, - ).(*interpreter.IDCapabilityValue) - if !ok { - panic(errors.NewUnreachableError()) - } ->>>>>>> bb4542c46 (Merge pull request #3349 from onflow/release/v1.0.0-preview.27) inter.WriteStored( address, diff --git a/version.go b/version.go remerge CONFLICT (content): Merge conflict in version.go index 1f86b0898..71c45741a 100644 --- a/version.go +++ b/version.go @@ -21,8 +21,4 @@ package cadence -<<<<<<< ab00c4942 (Merge pull request #3346 from onflow/fxamacker/bump-atree-inlining-version-for-cadence-v1.0) const Version = "v1.0.0-preview-atree-register-inlining.26" -======= -const Version = "v1.0.0-preview.27" ->>>>>>> bb4542c46 (Merge pull request #3349 from onflow/release/v1.0.0-preview.27)masterbranchFiles changedin the Github PR explorer