Update atree inlining cadence v1.0 #6187
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
Co-authored-by: Bastian Müller <bastian@turbolent.com>
Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>
Co-authored-by: Bastian Müller <bastian@turbolent.com> Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>
…r execution data tracker, added godocs
[Flow EVM] capturing extra precompiled calls outcome as part of results and tx executed events
Currently, reports.ReportWriter outputs messages to a JSON array, which can cause JSON parsers like jq to crash on large reports. This commit adds support for JSONL format, so each JSON object can be parsed independently (rather than requiring every object in the array to be parsed). While at it, modify the diff-states command to use JSONL format.
[Access] Reduce logging for script executions
[EVM] Extend random source size
…ata-pruning [Access] Test Execution Data db pruning functionality on Access/Observer nodes
…o-report Add support for JSONL report format as alternative to JSON array report
Link checkpoint on bootstrapping
…0-preview.36 Update to Cadence v1.0.0-preview.36
turbolent
requested review from
peterargue,
ramtinms,
janezpodhostnik and
AlexHentschel
as code owners
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feature/atree-inlining-cadence-v1.0 #6187 +/- ##
=======================================================================
- Coverage 41.64% 41.62% -0.03%
=======================================================================
Files 1974 1975 +1
Lines 139562 139817 +255
=======================================================================
+ Hits 58125 58202 +77
- Misses 75411 75580 +169
- Partials 6026 6035 +9
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
SupunS
approved these changes
Jul 8, 2024
fxamacker
approved these changes
Jul 9, 2024
turbolent
merged commit 37a0b1a
into
feature/atree-inlining-cadence-v1.0
55 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-inlining-cadence-v1.0Conflict resolution
commit 0d27d254bc4fda2347cd5b2e50650ea76fcd04f6 Merge: e3b8f923c3 7be15fb08c Author: Bastian Müller <bastian@turbolent.com> Date: Mon Jul 8 13:56:45 2024 -0700 Merge branch 'master' into bastian/update-atree-inlining-cadence-v1.0-12 diff --git a/engine/execution/state/bootstrap/bootstrap_test.go b/engine/execution/state/bootstrap/bootstrap_test.go remerge CONFLICT (content): Merge conflict in engine/execution/state/bootstrap/bootstrap_test.go index a5ee93bfa3..d08736f177 100644 --- a/engine/execution/state/bootstrap/bootstrap_test.go +++ b/engine/execution/state/bootstrap/bootstrap_test.go @@ -53,11 +53,7 @@ func TestBootstrapLedger(t *testing.T) { } func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) { -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) - expectedStateCommitmentBytes, _ := hex.DecodeString("e5d0faf3ed14699b348fc3d25c00511d395a10f2c5b45c94efba238d6db543e8") -======= - expectedStateCommitmentBytes, _ := hex.DecodeString("3c67d8e4d76dd71357deff581c44b849904f25317a7f3c4e87717abf1fc0827d") ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) + expectedStateCommitmentBytes, _ := hex.DecodeString("ca3ac993ba32154b6b642f86b93f080d442b6cf99bf0a1f2c227cd45a29b5f0d") expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes) require.NoError(t, err) diff --git a/go.mod b/go.mod remerge CONFLICT (content): Merge conflict in go.mod index d4517b5580..b2f5fa451d 100644 --- a/go.mod +++ b/go.mod @@ -46,13 +46,8 @@ require ( github.com/multiformats/go-multiaddr v0.12.2 github.com/multiformats/go-multiaddr-dns v0.3.1 github.com/multiformats/go-multihash v0.2.3 -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) github.com/onflow/atree v0.8.0-rc.3 - github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35 -======= - github.com/onflow/atree v0.7.0-rc.2 - github.com/onflow/cadence v1.0.0-preview.36 ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) + github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 github.com/onflow/crypto v0.25.1 github.com/onflow/flow v0.3.4 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0 diff --git a/go.sum b/go.sum remerge CONFLICT (content): Merge conflict in go.sum index 2f4746e145..c1d3afa21f 100644 --- a/go.sum +++ b/go.sum @@ -2171,13 +2171,8 @@ github.com/onflow/atree v0.8.0-rc.3/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0 github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n//cBBgCg+vJSiIxTHYUklZ84= github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80= github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8= -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) -github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35 h1:rhvIwA5wKX5LrMpXa7bscVfjCbG92RZ6eFZqLVaBNKg= -github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o= -======= -github.com/onflow/cadence v1.0.0-preview.36 h1:mbxqoYSYiVX2Uo+Plrkmu29ezrShohlN+4Ltw0cfJxU= -github.com/onflow/cadence v1.0.0-preview.36/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0= ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) +github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 h1:/aj7ciF9itu0GYTfrxU5wmonJ2eGx4yhpwFx+CmUeIM= +github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o= 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= diff --git a/insecure/go.mod b/insecure/go.mod remerge CONFLICT (content): Merge conflict in insecure/go.mod index 7e9816d180..43c3559c1b 100644 --- a/insecure/go.mod +++ b/insecure/go.mod @@ -198,13 +198,8 @@ 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 -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) github.com/onflow/atree v0.8.0-rc.3 // indirect - github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35 // indirect -======= - github.com/onflow/atree v0.7.0-rc.2 // indirect - github.com/onflow/cadence v1.0.0-preview.36 // indirect ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) + github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 // indirect github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0 // indirect github.com/onflow/flow-core-contracts/lib/go/templates v1.3.0 // indirect github.com/onflow/flow-ft/lib/go/contracts v1.0.0 // indirect diff --git a/insecure/go.sum b/insecure/go.sum remerge CONFLICT (content): Merge conflict in insecure/go.sum index d98a2e26f0..f9ce422c42 100644 --- a/insecure/go.sum +++ b/insecure/go.sum @@ -2160,13 +2160,8 @@ github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs github.com/onflow/atree v0.8.0-rc.3 h1:BHVkJLrBHhHo7ET8gkuS1+lyQGNekYYOyoICGK3RFNM= github.com/onflow/atree v0.8.0-rc.3/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A= github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8= -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) -github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35 h1:rhvIwA5wKX5LrMpXa7bscVfjCbG92RZ6eFZqLVaBNKg= -github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o= -======= -github.com/onflow/cadence v1.0.0-preview.36 h1:mbxqoYSYiVX2Uo+Plrkmu29ezrShohlN+4Ltw0cfJxU= -github.com/onflow/cadence v1.0.0-preview.36/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0= ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) +github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 h1:/aj7ciF9itu0GYTfrxU5wmonJ2eGx4yhpwFx+CmUeIM= +github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o= 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= diff --git a/integration/go.mod b/integration/go.mod remerge CONFLICT (content): Merge conflict in integration/go.mod index a29d018923..9318156439 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -19,11 +19,7 @@ require ( github.com/ipfs/go-datastore v0.6.0 github.com/ipfs/go-ds-badger2 v0.1.3 github.com/libp2p/go-libp2p v0.32.2 -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) - github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35 -======= - github.com/onflow/cadence v1.0.0-preview.36 ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) + github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 github.com/onflow/crypto v0.25.1 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.0 diff --git a/integration/go.sum b/integration/go.sum remerge CONFLICT (content): Merge conflict in integration/go.sum index b44107887e..0ceb9dbec5 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -2150,13 +2150,8 @@ github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs github.com/onflow/atree v0.8.0-rc.3 h1:BHVkJLrBHhHo7ET8gkuS1+lyQGNekYYOyoICGK3RFNM= github.com/onflow/atree v0.8.0-rc.3/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A= github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8= -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) -github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35 h1:rhvIwA5wKX5LrMpXa7bscVfjCbG92RZ6eFZqLVaBNKg= -github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.35/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o= -======= -github.com/onflow/cadence v1.0.0-preview.36 h1:mbxqoYSYiVX2Uo+Plrkmu29ezrShohlN+4Ltw0cfJxU= -github.com/onflow/cadence v1.0.0-preview.36/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0= ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) +github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 h1:/aj7ciF9itu0GYTfrxU5wmonJ2eGx4yhpwFx+CmUeIM= +github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o= 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= diff --git a/utils/unittest/execution_state.go b/utils/unittest/execution_state.go remerge CONFLICT (content): Merge conflict in utils/unittest/execution_state.go index 8ed5f20ec7..61b62b462b 100644 --- a/utils/unittest/execution_state.go +++ b/utils/unittest/execution_state.go @@ -23,11 +23,7 @@ const ServiceAccountPrivateKeySignAlgo = crypto.ECDSAP256 const ServiceAccountPrivateKeyHashAlgo = hash.SHA2_256 // Pre-calculated state commitment with root account with the above private key -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) -const GenesisStateCommitmentHex = "afc757166efa0c8ad18a6badce73f6c690b523cbf89179b2dcc08d5a6346b9be" -======= -const GenesisStateCommitmentHex = "415fbee237d355fea5d03c738dfe49273c74231adf8359b409eb077995251076" ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) +const GenesisStateCommitmentHex = "0e2ca4889421f81592111544517a12148ed7aca820c976be39222e6baa1ef3ae" var GenesisStateCommitment flow.StateCommitment @@ -91,18 +87,10 @@ func genesisCommitHexByChainID(chainID flow.ChainID) string { return GenesisStateCommitmentHex } if chainID == flow.Testnet { -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) - return "e70ce1a4d2841632bc021c3c49d1221f4202e9bcba4a68910fcbb812a8aecb18" -======= - return "6c686cd6d0dfc46e91c3bdb83716845aa989d1c369cea3b9171321a536e06c8a" ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) + return "02726c5b0d34fb96604af54d2d9589cfdbf81a3da8590f07bd8d7a9275a488bb" } if chainID == flow.Sandboxnet { return "e1c08b17f9e5896f03fe28dd37ca396c19b26628161506924fbf785834646ea1" } -<<<<<<< e3b8f923c3 (Merge pull request #6155 from onflow/bastian/update-atree-inlining-cadence-v1.0-11) - return "d41828e6ac47b1921502e30a453d20f4c6cd650fa227af933ffc9cfc92ef5e74" -======= - return "e9667aad5542cd097d26278a77af059fd8d3d29da9a27ac7e2237887ec43dfc9" ->>>>>>> 7be15fb08c (Merge pull request #6186 from onflow/auto-update-onflow-cadence-v1.0.0-preview.36) + return "053b6ff0e17a5dc362473fe589bc9571c2185e5da748310714b174fa11b3203a" }