Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync feature/stable-cadence branch with master #4655

Merged
merged 339 commits into from
Aug 29, 2023

Conversation

SupunS
Copy link
Member

@SupunS SupunS commented Aug 25, 2023

$subject. No conflicts. feature/stable-cadence is a clean fork from master.

yhassanzadeh13 and others added 30 commits June 6, 2023 16:23
Co-authored-by: Misha <misha.rybalov@dapperlabs.com>
Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com>
yhassanzadeh13 and others added 5 commits August 23, 2023 13:32
Co-authored-by: Misha <misha.rybalov@dapperlabs.com>
[Networking] Refinement of message scope; encapsulating the publish logic in the libp2p node
@github-actions
Copy link
Contributor

github-actions bot commented Aug 25, 2023

FVM Benchstat comparison

This branch with compared with the base branch onflow:feature/stable-cadence commit cc67154

The command (for i in {1..7}; do go test ./fvm ./engine/execution/computation --bench . --tags relic -shuffle=on --benchmem --run ^$; done) was used.

Collapsed results for better readability

old.txtnew.txt
time/opdelta
ComputeBlock/16/cols/128/txes/1/max-concurrency-25.57s ± 0%5.59s ± 0%~(p=1.000 n=1+1)
ComputeBlock/16/cols/128/txes/2/max-concurrency-25.83s ± 0%5.82s ± 0%~(p=1.000 n=1+1)
 
us/txdelta
ComputeBlock/16/cols/128/txes/1/max-concurrency-22.72k ± 0%2.73k ± 0%~(p=1.000 n=1+1)
ComputeBlock/16/cols/128/txes/2/max-concurrency-22.85k ± 0%2.84k ± 0%~(p=1.000 n=1+1)
 
alloc/opdelta
ComputeBlock/16/cols/128/txes/1/max-concurrency-21.66GB ± 0%1.67GB ± 0%~(p=1.000 n=1+1)
ComputeBlock/16/cols/128/txes/2/max-concurrency-21.71GB ± 0%1.71GB ± 0%~(p=1.000 n=1+1)
 
allocs/opdelta
ComputeBlock/16/cols/128/txes/1/max-concurrency-221.9M ± 0%21.9M ± 0%~(p=1.000 n=1+1)
ComputeBlock/16/cols/128/txes/2/max-concurrency-222.6M ± 0%22.6M ± 0%~(p=1.000 n=1+1)
 

@codecov-commenter
Copy link

codecov-commenter commented Aug 25, 2023

Codecov Report

Merging #4655 (a8f28b9) into feature/stable-cadence (cc67154) will increase coverage by 0.01%.
The diff coverage is 38.34%.

@@                    Coverage Diff                     @@
##           feature/stable-cadence    #4655      +/-   ##
==========================================================
+ Coverage                   54.67%   54.69%   +0.01%     
==========================================================
  Files                         917      917              
  Lines                       85507    85633     +126     
==========================================================
+ Hits                        46751    46836      +85     
- Misses                      35165    35204      +39     
- Partials                     3591     3593       +2     
Flag Coverage Δ
unittests 54.69% <38.34%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
cmd/execution_builder.go 0.00% <0.00%> (ø)
cmd/execution_config.go 0.00% <0.00%> (ø)
cmd/scaffold.go 14.82% <0.00%> (-0.02%) ⬇️
engine/execution/state/state.go 33.82% <0.00%> (-1.57%) ⬇️
model/flow/chunk.go 32.14% <0.00%> (ø)
network/p2p/p2pbuilder/libp2pNodeBuilder.go 0.00% <ø> (ø)
utils/unittest/fixtures.go 0.00% <0.00%> (ø)
network/p2p/middleware/middleware.go 1.82% <5.26%> (+0.11%) ⬆️
network/p2p/p2pnode/libp2pNode.go 56.76% <10.52%> (-5.78%) ⬇️
network/p2p/test/fixtures.go 30.27% <25.92%> (-0.02%) ⬇️
... and 4 more

... and 9 files with indirect coverage changes

@SupunS SupunS closed this Aug 25, 2023
@SupunS SupunS reopened this Aug 25, 2023
@SupunS SupunS requested a review from janezpodhostnik August 25, 2023 19:36
@SupunS
Copy link
Member Author

SupunS commented Aug 28, 2023

Here also, BFT test is failing. Not sure why. This feature/stable-cadence is a snapshot of master branch and has no new changes.

Seems flaky, it's passing now

bors bot added a commit that referenced this pull request Aug 28, 2023
4567: Update to Cadence v0.39.13-stable-cadence r=SupunS a=SupunS

Feature branch for stable cadence updates to integrate the new token standards, core contracts, and other features of stable cadence

Depends on #4655

Co-authored-by: Yahya <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh@ieee.org>
Co-authored-by: Yahya Hassanzadeh <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Supun Setunga <supun.setunga@gmail.com>
Co-authored-by: Misha <misha@gomisha.com>
Co-authored-by: Kay-Zee <kan@axiomzen.co>
Co-authored-by: Josh Hannan <hannanjoshua19@gmail.com>
Co-authored-by: Kan Zhang <kan@axiomzen.co>
Co-authored-by: Misha <misha.rybalov@dapperlabs.com>
@SupunS
Copy link
Member Author

SupunS commented Aug 28, 2023

bors merge

bors bot added a commit that referenced this pull request Aug 28, 2023
4655: Sync `feature/stable-cadence` branch with `master` r=SupunS a=SupunS

$subject. No conflicts. `feature/stable-cadence` is a clean fork from `master`.

Co-authored-by: Yahya <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh@ieee.org>
Co-authored-by: Yahya Hassanzadeh <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Misha <misha.rybalov@dapperlabs.com>
Co-authored-by: Misha <misha@gomisha.com>
Co-authored-by: Kay-Zee <kan@axiomzen.co>
Co-authored-by: Kan Zhang <kan@axiomzen.co>
@bors
Copy link
Contributor

bors bot commented Aug 28, 2023

Timed out.

@SupunS
Copy link
Member Author

SupunS commented Aug 28, 2023

bors retry

bors bot added a commit that referenced this pull request Aug 28, 2023
4655: Sync `feature/stable-cadence` branch with `master` r=SupunS a=SupunS

$subject. No conflicts. `feature/stable-cadence` is a clean fork from `master`.

Co-authored-by: Yahya <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh@ieee.org>
Co-authored-by: Yahya Hassanzadeh <yhassanzadeh13@ku.edu.tr>
Co-authored-by: Misha <misha.rybalov@dapperlabs.com>
Co-authored-by: Misha <misha@gomisha.com>
Co-authored-by: Kay-Zee <kan@axiomzen.co>
Co-authored-by: Kan Zhang <kan@axiomzen.co>
@bors
Copy link
Contributor

bors bot commented Aug 28, 2023

@turbolent turbolent merged commit c422431 into feature/stable-cadence Aug 29, 2023
@turbolent turbolent deleted the supun/sync-stable-cadence branch August 29, 2023 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.