Update atree inlining v1.0 feature branch #3301
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
Update update tool config
Bump atree version in master branch
Add runtime check for transaction value moves
…LoadedBrokenReferences
…oken-references
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:feature/atree-register-inlining-v1.0 commit e29e0f3 Collapsed results for better readability
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
SupunS
approved these changes
May 1, 2024
dsainati1
approved these changes
May 1, 2024
turbolent
merged commit 09bb39a
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.
Description
Conflict resolution
commit 88681eda059e9c9dcb96e772c0914de9331c734a Merge: e29e0f380 111954535 Author: Bastian Müller <bastian@turbolent.com> Date: Tue Apr 30 12:07:13 2024 -0700 Merge branch 'master' into bastian/update-atree-register-inlining-v1.0-2 diff --git a/go.mod b/go.mod remerge CONFLICT (content): Merge conflict in go.mod index ec4d8250b..fbfad771c 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 -<<<<<<< e29e0f380 (Merge pull request #3295 from onflow/fxamacker/bump-atree-version-in-atree-register-inlining-v1.0) github.com/onflow/atree v0.6.1-0.20240429171214-e4400b25dfa9 -======= - github.com/onflow/atree v0.6.1-0.20240429171449-cb486ceb1f9c ->>>>>>> 111954535 (go mod tidy) 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 915563284..be06ade17 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= -<<<<<<< e29e0f380 (Merge pull request #3295 from onflow/fxamacker/bump-atree-version-in-atree-register-inlining-v1.0) github.com/onflow/atree v0.6.1-0.20240429171214-e4400b25dfa9 h1:lS/47Nt8qRIEC+V8QPobTAWnudK982u/wJboucugndg= github.com/onflow/atree v0.6.1-0.20240429171214-e4400b25dfa9/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A= -======= -github.com/onflow/atree v0.6.1-0.20240429171449-cb486ceb1f9c h1:Ol+qFATYiS7LfwQQKBjfLJ8z6VwzZehVrYH1JI2ssUU= -github.com/onflow/atree v0.6.1-0.20240429171449-cb486ceb1f9c/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= ->>>>>>> 111954535 (go mod tidy) 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/migrations/migration_test.go b/migrations/migration_test.go index d89041d7d..0665f4eec 100644 --- a/migrations/migration_test.go +++ b/migrations/migration_test.go @@ -2722,10 +2722,10 @@ func TestFixLoadedBrokenReferences(t *testing.T) { // Convert the owner/key to a storage ID. - var storageIndex atree.StorageIndex - copy(storageIndex[:], key[1:]) + var slabIndex atree.SlabIndex + copy(slabIndex[:], key[1:]) - storageID := atree.NewStorageID(atree.Address(owner), storageIndex) + storageID := atree.NewSlabID(atree.Address(owner), slabIndex) // Retrieve the slab. _, _, err = storage.Retrieve(storageID) diff --git a/tools/storage-explorer/go.mod b/tools/storage-explorer/go.mod remerge CONFLICT (content): Merge conflict in tools/storage-explorer/go.mod index 39e92acf5..9da1febc3 100644 --- a/tools/storage-explorer/go.mod +++ b/tools/storage-explorer/go.mod @@ -4,11 +4,7 @@ go 1.20 require ( github.com/gorilla/mux v1.8.1 -<<<<<<< e29e0f380 (Merge pull request #3295 from onflow/fxamacker/bump-atree-version-in-atree-register-inlining-v1.0) - github.com/onflow/atree v0.6.1-0.20240417191405-e11f55fa33a3 -======= - github.com/onflow/atree v0.6.1-0.20240429171449-cb486ceb1f9c ->>>>>>> 111954535 (go mod tidy) + github.com/onflow/atree v0.6.1-0.20240429171214-e4400b25dfa9 github.com/onflow/cadence v1.0.0-M8 github.com/onflow/flow-go v0.34.0-crescendo-preview.5.0.20240229164931-a67398875618 github.com/rs/zerolog v1.32.0 diff --git a/tools/storage-explorer/go.sum b/tools/storage-explorer/go.sum remerge CONFLICT (content): Merge conflict in tools/storage-explorer/go.sum index fafaa228d..124422d51 100644 --- a/tools/storage-explorer/go.sum +++ b/tools/storage-explorer/go.sum @@ -1775,13 +1775,8 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= -<<<<<<< e29e0f380 (Merge pull request #3295 from onflow/fxamacker/bump-atree-version-in-atree-register-inlining-v1.0) -github.com/onflow/atree v0.6.1-0.20240417191405-e11f55fa33a3 h1:K8LKxRn1rRdDXLCvYlDNdlQyB28b+fx2doYiIaNGnQU= -github.com/onflow/atree v0.6.1-0.20240417191405-e11f55fa33a3/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A= -======= -github.com/onflow/atree v0.6.1-0.20240429171449-cb486ceb1f9c h1:Ol+qFATYiS7LfwQQKBjfLJ8z6VwzZehVrYH1JI2ssUU= -github.com/onflow/atree v0.6.1-0.20240429171449-cb486ceb1f9c/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= ->>>>>>> 111954535 (go mod tidy) +github.com/onflow/atree v0.6.1-0.20240429171214-e4400b25dfa9 h1:lS/47Nt8qRIEC+V8QPobTAWnudK982u/wJboucugndg= +github.com/onflow/atree v0.6.1-0.20240429171214-e4400b25dfa9/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A= 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/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240227190927-0e6ce7e3222b h1:oXHQft30sElpK7G3xWB5tEizI2G+S4p64iVh0LtX4E0=masterbranchFiles changedin the Github PR explorer