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.

Sign up for GitHub

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

Jump to bottom

Sync stable cadence branch with master #2899

Merged
merged 40 commits into from
Oct 26, 2023
Merged

Sync stable cadence branch with master #2899

merged 40 commits into from
Oct 26, 2023

Conversation

SupunS
Copy link
Member

@SupunS SupunS commented Oct 25, 2023

Description

Conflict resolution: https://gist.github.com/SupunS/cd4fadd7413545dfb5bf44359c504a97

  • Targeted PR against master branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work
  • Code follows the standards mentioned here
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

turbolent and others added 30 commits October 5, 2023 12:38
@turbolent
allow native functions to have type parameters
05e3c08
@nialexsan
mjs build for cadence-parser
82c5e4b
@nialexsan
bump version
5cb52ff
@nialexsan
Merge branch 'master' into nialexsan/mjs-build
38078f5
@turbolent
Merge pull request #2851 from onflow/nialexsan/mjs-build
735a071
@m-Peter
Allow specifying a mapping with human-friendly aliases for locations …
38640c0 
…in coverage reports

Having AddressLocation or StringLocation in coverage reports, is not usable
when trying to use these reports with standard tools, such as LCOV.
@turbolent
Merge pull request #2850 from onflow/bastian/allow-native-generic-fun…
e69d6bb 
…ctions
@m-Peter
Handle identifier locations and make some fields non-exported
4871d50
@m-Peter
Remove crAlias relic type and update JSON tags for CoverageReport
6b9d9f2
@turbolent
do not inject native PublicKey functionality during construction
be4a169
@turbolent
inject composite value functions
f1d0e88
@turbolent
allow setting composite value functions handler for type ID in enviro…
6bcf816 
…nment
@turbolent
lint
faf6612
@turbolent
pass composite value to composite value handler
f9990cb
@turbolent
pass location range to composite value functions handler
87df1ad
@SupunS
Add computation metering to array function
9dcb88b
@SupunS
Meter on each iteration
a07342f
@SupunS
Merge pull request #2880 from onflow/supun/computation-metering
c16b00f 
Add computation metering to the new stdlib functions
@turbolent
allow different base activations per location in checker and interpreter
46bef9c
@SupunS
Use ComputationKindLoop for internal array-value iterations
c9ef8e3
@SupunS
Merge pull request #2891 from onflow/supun/computation-metering
076c7e2 
Use `ComputationKindLoop` for internal array-value iterations
@turbolent
assert location of error
32c5afe
@turbolent
improve naming, add comments
1354191
@turbolent
store default base activations in separate fields
e44edd7
@turbolent
Merge pull request #2859 from m-Peter/coverage-report-source-file-map…
2f573e2 
…pings
@turbolent
lint
d6f80e0
@turbolent
Merge pull request #2887 from onflow/bastian/per-location-base-activa…
6947cfa 
…tions
@turbolent
fix version number
31d873d
@turbolent
v0.42.1
8f371bc
@turbolent
Merge pull request #2893 from onflow/release/v0.42.1
465f137 
Merge `release/v0.42.1` to `master`
@SupunS SupunS self-assigned this Oct 25, 2023
@turbolent
Copy link
Member

Look good, thank you!

Re: conflict resolution:

@github-actions
Copy link

github-actions bot commented Oct 25, 2023 •
edited
Loading

Cadence Benchstat comparison

This branch with compared with the base branch onflow:feature/stable-cadence commit 01a42f3
The command for i in {1..N}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done was used.
Bench tests were run a total of 7 times on each branch.

Collapsed results for better readability

old.txtnew.txt
time/opdelta
DecodeBatchEventsCCF-2213ms ± 0%209ms ± 0%~(p=1.000 n=1+1)
DecodeBatchEventsJSON-2594ms ± 0%612ms ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowFees.FeesDeducted-24.66µs ± 0%4.49µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowFees.TokensWithdrawn-23.34µs ± 0%3.33µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-24.54µs ± 0%4.44µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-25.01µs ± 0%5.11µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowIDTableStaking.NewWeeklyPayout-23.50µs ± 0%3.46µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowIDTableStaking.RewardsPaid-24.10µs ± 0%4.01µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowToken.TokensDeposited-24.14µs ± 0%4.08µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowToken.TokensDeposited_with_nil_receiver-23.93µs ± 0%4.09µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowToken.TokensMinted-23.29µs ± 0%3.35µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowToken.TokensWithdrawn-24.05µs ± 0%4.09µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowFees.FeesDeducted-223.7µs ± 0%15.1µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowFees.TokensWithdrawn-28.53µs ± 0%8.47µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-213.1µs ± 0%13.4µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-219.1µs ± 0%19.4µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowIDTableStaking.NewWeeklyPayout-29.40µs ± 0%8.86µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowIDTableStaking.RewardsPaid-211.2µs ± 0%11.2µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowToken.TokensDeposited-211.9µs ± 0%12.2µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowToken.TokensDeposited_with_nil_receiver-211.1µs ± 0%11.0µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowToken.TokensMinted-28.79µs ± 0%8.58µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowToken.TokensWithdrawn-212.1µs ± 0%11.9µs ± 0%~(p=1.000 n=1+1)
EncodeBatchEventsCCF-2211ms ± 0%136ms ± 0%~(p=1.000 n=1+1)
EncodeBatchEventsJSON-2216ms ± 0%173ms ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowFees.FeesDeducted-23.07µs ± 0%4.47µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowFees.TokensWithdrawn-22.29µs ± 0%3.42µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-22.91µs ± 0%4.68µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-23.36µs ± 0%4.82µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowIDTableStaking.NewWeeklyPayout-22.42µs ± 0%4.27µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowIDTableStaking.RewardsPaid-22.62µs ± 0%4.22µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowToken.TokensDeposited-22.74µs ± 0%2.70µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowToken.TokensDeposited_with_nil_receiver-22.81µs ± 0%4.03µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowToken.TokensMinted-22.59µs ± 0%2.50µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowToken.TokensWithdrawn-22.73µs ± 0%2.68µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowFees.FeesDeducted-24.02µs ± 0%4.13µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowFees.TokensWithdrawn-22.24µs ± 0%2.36µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-23.65µs ± 0%3.71µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-25.16µs ± 0%5.17µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowIDTableStaking.NewWeeklyPayout-22.39µs ± 0%2.36µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowIDTableStaking.RewardsPaid-23.05µs ± 0%3.15µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowToken.TokensDeposited-23.51µs ± 0%3.55µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowToken.TokensDeposited_with_nil_receiver-22.79µs ± 0%2.83µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowToken.TokensMinted-22.32µs ± 0%2.35µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowToken.TokensWithdrawn-23.51µs ± 0%3.53µs ± 0%~(p=1.000 n=1+1)
ExportType/composite_type-2570ns ± 0%527ns ± 0%~(p=1.000 n=1+1)
ExportType/simple_type-2117ns ± 0%116ns ± 0%~(p=1.000 n=1+1)
InterpretRecursionFib-22.92ms ± 0%2.97ms ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_interpreter-21.61µs ± 0%1.60µs ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_sub-interpreter-2813ns ± 0%798ns ± 0%~(p=1.000 n=1+1)
ParseArray-29.91ms ± 0%9.81ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-214.8ms ± 0%17.1ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-21.56ms ± 0%1.60ms ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-2242µs ± 0%259µs ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-2198µs ± 0%199µs ± 0%~(p=1.000 n=1+1)
ParseInfix-28.52µs ± 0%8.65µs ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-22.80ns ± 0%2.84ns ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/Three_levels-2153ns ± 0%158ns ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-25.92µs ± 0%5.96µs ± 0%~(p=1.000 n=1+1)
SuperTypeInference/arrays-2454ns ± 0%450ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/composites-2185ns ± 0%180ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/integers-2199ns ± 0%190ns ± 0%~(p=1.000 n=1+1)
ValueIsSubtypeOfSemaType-2115ns ± 0%120ns ± 0%~(p=1.000 n=1+1)
 
alloc/opdelta
DecodeBatchEventsCCF-266.1MB ± 0%66.1MB ± 0%~(p=1.000 n=1+1)
DecodeBatchEventsJSON-2244MB ± 0%244MB ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowFees.FeesDeducted-21.39kB ± 0%1.39kB ± 0%~(all equal)
DecodeCCF/FlowFees.TokensWithdrawn-21.20kB ± 0%1.20kB ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-21.47kB ± 0%1.47kB ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-21.48kB ± 0%1.48kB ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.NewWeeklyPayout-21.25kB ± 0%1.25kB ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.RewardsPaid-21.37kB ± 0%1.37kB ± 0%~(all equal)
DecodeCCF/FlowToken.TokensDeposited-21.31kB ± 0%1.31kB ± 0%~(all equal)
DecodeCCF/FlowToken.TokensDeposited_with_nil_receiver-21.30kB ± 0%1.30kB ± 0%~(all equal)
DecodeCCF/FlowToken.TokensMinted-21.20kB ± 0%1.20kB ± 0%~(all equal)
DecodeCCF/FlowToken.TokensWithdrawn-21.32kB ± 0%1.32kB ± 0%~(all equal)
DecodeJSON/FlowFees.FeesDeducted-26.00kB ± 0%6.00kB ± 0%~(all equal)
DecodeJSON/FlowFees.TokensWithdrawn-23.60kB ± 0%3.60kB ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-25.43kB ± 0%5.43kB ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-27.35kB ± 0%7.35kB ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.NewWeeklyPayout-23.64kB ± 0%3.64kB ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.RewardsPaid-24.54kB ± 0%4.54kB ± 0%~(all equal)
DecodeJSON/FlowToken.TokensDeposited-24.88kB ± 0%4.88kB ± 0%~(all equal)
DecodeJSON/FlowToken.TokensDeposited_with_nil_receiver-24.46kB ± 0%4.46kB ± 0%~(all equal)
DecodeJSON/FlowToken.TokensMinted-23.60kB ± 0%3.60kB ± 0%~(all equal)
DecodeJSON/FlowToken.TokensWithdrawn-24.88kB ± 0%4.88kB ± 0%~(all equal)
EncodeBatchEventsCCF-262.4MB ± 0%62.4MB ± 0%~(p=1.000 n=1+1)
EncodeBatchEventsJSON-239.1MB ± 0%39.1MB ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowFees.FeesDeducted-21.22kB ± 0%1.22kB ± 0%~(all equal)
EncodeCCF/FlowFees.TokensWithdrawn-21.17kB ± 0%1.17kB ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-21.44kB ± 0%1.44kB ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-21.41kB ± 0%1.41kB ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.NewWeeklyPayout-21.34kB ± 0%1.34kB ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.RewardsPaid-21.42kB ± 0%1.42kB ± 0%~(all equal)
EncodeCCF/FlowToken.TokensDeposited-21.22kB ± 0%1.22kB ± 0%~(all equal)
EncodeCCF/FlowToken.TokensDeposited_with_nil_receiver-21.20kB ± 0%1.20kB ± 0%~(all equal)
EncodeCCF/FlowToken.TokensMinted-21.17kB ± 0%1.17kB ± 0%~(all equal)
EncodeCCF/FlowToken.TokensWithdrawn-21.22kB ± 0%1.22kB ± 0%~(all equal)
EncodeJSON/FlowFees.FeesDeducted-2864B ± 0%864B ± 0%~(all equal)
EncodeJSON/FlowFees.TokensWithdrawn-2504B ± 0%504B ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-2888B ± 0%888B ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-21.08kB ± 0%1.08kB ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.NewWeeklyPayout-2552B ± 0%552B ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.RewardsPaid-2752B ± 0%752B ± 0%~(all equal)
EncodeJSON/FlowToken.TokensDeposited-2776B ± 0%776B ± 0%~(all equal)
EncodeJSON/FlowToken.TokensDeposited_with_nil_receiver-2640B ± 0%640B ± 0%~(all equal)
EncodeJSON/FlowToken.TokensMinted-2512B ± 0%512B ± 0%~(all equal)
EncodeJSON/FlowToken.TokensWithdrawn-2768B ± 0%768B ± 0%~(all equal)
ExportType/composite_type-2120B ± 0%120B ± 0%~(all equal)
ExportType/simple_type-20.00B 0.00B ~(all equal)
InterpretRecursionFib-21.00MB ± 0%1.00MB ± 0%~(all equal)
NewInterpreter/new_interpreter-2928B ± 0%928B ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-2200B ± 0%200B ± 0%~(all equal)
ParseArray-22.74MB ± 0%2.65MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-24.09MB ± 0%4.31MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-2214kB ± 0%214kB ± 0%~(all equal)
ParseFungibleToken/With_memory_metering-229.7kB ± 0%29.7kB ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-229.7kB ± 0%29.7kB ± 0%~(all equal)
ParseInfix-21.91kB ± 0%1.91kB ± 0%~(all equal)
QualifiedIdentifierCreation/One_level-20.00B 0.00B ~(all equal)
QualifiedIdentifierCreation/Three_levels-264.0B ± 0%64.0B ± 0%~(all equal)
RuntimeScriptNoop-23.21kB ± 0%3.21kB ± 0%~(all equal)
SuperTypeInference/arrays-296.0B ± 0%96.0B ± 0%~(all equal)
SuperTypeInference/composites-20.00B 0.00B ~(all equal)
SuperTypeInference/integers-20.00B 0.00B ~(all equal)
ValueIsSubtypeOfSemaType-248.0B ± 0%48.0B ± 0%~(all equal)
 
allocs/opdelta
DecodeBatchEventsCCF-21.48M ± 0%1.48M ± 0%~(p=1.000 n=1+1)
DecodeBatchEventsJSON-24.70M ± 0%4.70M ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowFees.FeesDeducted-230.0 ± 0%30.0 ± 0%~(all equal)
DecodeCCF/FlowFees.TokensWithdrawn-226.0 ± 0%26.0 ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-230.0 ± 0%30.0 ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-232.0 ± 0%32.0 ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.NewWeeklyPayout-226.0 ± 0%26.0 ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.RewardsPaid-229.0 ± 0%29.0 ± 0%~(all equal)
DecodeCCF/FlowToken.TokensDeposited-231.0 ± 0%31.0 ± 0%~(all equal)
DecodeCCF/FlowToken.TokensDeposited_with_nil_receiver-229.0 ± 0%29.0 ± 0%~(all equal)
DecodeCCF/FlowToken.TokensMinted-226.0 ± 0%26.0 ± 0%~(all equal)
DecodeCCF/FlowToken.TokensWithdrawn-231.0 ± 0%31.0 ± 0%~(all equal)
DecodeJSON/FlowFees.FeesDeducted-2126 ± 0%126 ± 0%~(all equal)
DecodeJSON/FlowFees.TokensWithdrawn-271.0 ± 0%71.0 ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-2102 ± 0%102 ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-2159 ± 0%159 ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.NewWeeklyPayout-270.0 ± 0%70.0 ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.RewardsPaid-287.0 ± 0%87.0 ± 0%~(all equal)
DecodeJSON/FlowToken.TokensDeposited-295.0 ± 0%95.0 ± 0%~(all equal)
DecodeJSON/FlowToken.TokensDeposited_with_nil_receiver-286.0 ± 0%86.0 ± 0%~(all equal)
DecodeJSON/FlowToken.TokensMinted-271.0 ± 0%71.0 ± 0%~(all equal)
DecodeJSON/FlowToken.TokensWithdrawn-295.0 ± 0%95.0 ± 0%~(all equal)
EncodeBatchEventsCCF-2950k ± 0%950k ± 0%~(p=1.000 n=1+1)
EncodeBatchEventsJSON-2853k ± 0%853k ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowFees.FeesDeducted-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowFees.TokensWithdrawn-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.NewWeeklyPayout-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.RewardsPaid-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowToken.TokensDeposited-220.0 ± 0%20.0 ± 0%~(all equal)
EncodeCCF/FlowToken.TokensDeposited_with_nil_receiver-220.0 ± 0%20.0 ± 0%~(all equal)
EncodeCCF/FlowToken.TokensMinted-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowToken.TokensWithdrawn-220.0 ± 0%20.0 ± 0%~(all equal)
EncodeJSON/FlowFees.FeesDeducted-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeJSON/FlowFees.TokensWithdrawn-212.0 ± 0%12.0 ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-216.0 ± 0%16.0 ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-225.0 ± 0%25.0 ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.NewWeeklyPayout-212.0 ± 0%12.0 ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.RewardsPaid-215.0 ± 0%15.0 ± 0%~(all equal)
EncodeJSON/FlowToken.TokensDeposited-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeJSON/FlowToken.TokensDeposited_with_nil_receiver-214.0 ± 0%14.0 ± 0%~(all equal)
EncodeJSON/FlowToken.TokensMinted-213.0 ± 0%13.0 ± 0%~(all equal)
EncodeJSON/FlowToken.TokensWithdrawn-218.0 ± 0%18.0 ± 0%~(all equal)
ExportType/composite_type-23.00 ± 0%3.00 ± 0%~(all equal)
ExportType/simple_type-20.00 0.00 ~(all equal)
InterpretRecursionFib-218.9k ± 0%18.9k ± 0%~(all equal)
NewInterpreter/new_interpreter-215.0 ± 0%15.0 ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-24.00 ± 0%4.00 ± 0%~(all equal)
ParseArray-259.6k ± 0%59.6k ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-289.4k ± 0%89.4k ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-263.0 ± 0%63.0 ± 0%~(all equal)
ParseFungibleToken/With_memory_metering-2778 ± 0%778 ± 0%~(all equal)
ParseFungibleToken/Without_memory_metering-2778 ± 0%778 ± 0%~(all equal)
ParseInfix-248.0 ± 0%48.0 ± 0%~(all equal)
QualifiedIdentifierCreation/One_level-20.00 0.00 ~(all equal)
QualifiedIdentifierCreation/Three_levels-22.00 ± 0%2.00 ± 0%~(all equal)
RuntimeScriptNoop-251.0 ± 0%51.0 ± 0%~(all equal)
SuperTypeInference/arrays-23.00 ± 0%3.00 ± 0%~(all equal)
SuperTypeInference/composites-20.00 0.00 ~(all equal)
SuperTypeInference/integers-20.00 0.00 ~(all equal)
ValueIsSubtypeOfSemaType-21.00 ± 0%1.00 ± 0%~(all equal)
 

@SupunS SupunS force-pushed the supun/sync-stable-cadence-master branch from fb1ef3f to 3e084c4 Compare October 25, 2023 18:03
@SupunS
Copy link
Member Author

SupunS commented Oct 25, 2023

Re: conflict resolution:

https://gist.github.com/SupunS/cd4fadd7413545dfb5bf44359c504a97#file-sync-stable-cadence-master-2023-10-25-diff-L69-L78: Is this not needed anymore?

It is still there right above it: https://gist.github.com/SupunS/cd4fadd7413545dfb5bf44359c504a97#file-sync-stable-cadence-master-2023-10-25-diff-L61-L63
The diff is not every intuitive there

@codecov
Copy link

codecov bot commented Oct 25, 2023 •
edited
Loading

Codecov Report

Attention: 21 lines in your changes are missing coverage. Please review.

Comparison is base (01a42f3) 79.99% compared to head (3e084c4) 80.02%.

❗ Current head 3e084c4 differs from pull request most recent head 7d1317d. Consider uploading reports for the commit 7d1317d to get more accurate results

Additional details and impacted files 
@@                    Coverage Diff                     @@
##           feature/stable-cadence    #2899      +/-   ##
==========================================================
+ Coverage                   79.99%   80.02%   +0.03%     
==========================================================
  Files                         344      344              
  Lines                       81406    81625     +219     
==========================================================
+ Hits                        65118    65323     +205     
- Misses                      13980    13991      +11     
- Partials                     2308     2311       +3
Flag Coverage Δ
unittests 80.02% <94.76%> (+0.03%) ⬆️

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

Files Coverage Δ
runtime/coverage.go 94.13% <100.00%> (+0.32%) ⬆️
runtime/interpreter/interpreter.go 88.49% <100.00%> (+0.18%) ⬆️
runtime/interpreter/value_publickey.go 100.00% <100.00%> (ø)
runtime/interpreter/value_string.go 90.90% <100.00%> (+0.24%) ⬆️
runtime/sema/check_composite_declaration.go 95.97% <100.00%> (+<0.01%) ⬆️
runtime/sema/check_function.go 99.50% <100.00%> (+0.01%) ⬆️
runtime/sema/errors.go 91.78% <100.00%> (+0.01%) ⬆️
runtime/stdlib/account.go 89.69% <ø> (-0.05%) ⬇️
runtime/stdlib/bls.go 84.07% <ø> (-0.28%) ⬇️
runtime/stdlib/builtin.go 100.00% <100.00%> (ø)
... and 10 more

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SupunS SupunS force-pushed the supun/sync-stable-cadence-master branch from 5c23a96 to de23ddf Compare October 25, 2023 18:25
@SupunS SupunS force-pushed the supun/sync-stable-cadence-master branch from de23ddf to 7d1317d Compare October 25, 2023 18:30
@SupunS SupunS marked this pull request as ready for review October 25, 2023 18:53
@SupunS SupunS requested a review from dsainati1 as a code owner October 25, 2023 18:53
@SupunS SupunS requested a review from turbolent October 25, 2023 18:53
@turbolent
Copy link
Member

@SupunS Haha, yeah! Thanks for the clarification 👍

@turbolent turbolent merged commit b9edc95 into feature/stable-cadence Oct 26, 2023
@turbolent turbolent deleted the supun/sync-stable-cadence-master branch October 26, 2023 05:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turbolent turbolent turbolent approved these changes

@dsainati1 dsainati1 dsainati1 approved these changes

Assignees

@SupunS SupunS

Labels
Technical Debt
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@SupunS @turbolent @dsainati1 @nialexsan @m-Peter