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

Remove dual authorizers for system transaction #4554

Merged
merged 2 commits into from Aug 8, 2023

Conversation

janezpodhostnik
Copy link
Contributor

@janezpodhostnik janezpodhostnik commented Jul 12, 2023

closes: #4291

PR #4298 added another authorizer to the system transaction so that the Heartbeat resources could be moved from the epoch account to the service account. Which was done here: onflow/service-account#243

Now that that is done, the epoch account does not need to participate in the service transaction anymore.

@janezpodhostnik janezpodhostnik added the Execution Cadence Execution Team label Jul 12, 2023
@janezpodhostnik janezpodhostnik self-assigned this Jul 12, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jul 12, 2023

Codecov Report

Merging #4554 (0b561f5) into master (2528190) will decrease coverage by 4.38%.
Report is 482 commits behind head on master.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #4554      +/-   ##
==========================================
- Coverage   56.25%   51.87%   -4.38%     
==========================================
  Files         653      635      -18     
  Lines       64699    59418    -5281     
==========================================
- Hits        36396    30826    -5570     
- Misses      25362    26136     +774     
+ Partials     2941     2456     -485     
Flag Coverage Δ
unittests 51.87% <0.00%> (-4.38%) ⬇️

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

Files Changed Coverage Δ
cmd/scaffold.go 14.83% <0.00%> (+0.06%) ⬆️
module/metrics/herocache.go 0.00% <0.00%> (ø)
module/metrics/network.go 0.00% <0.00%> (ø)
module/metrics/noop.go 0.00% <0.00%> (ø)
utils/unittest/unittest.go 9.05% <0.00%> (+1.45%) ⬆️

... and 384 files with indirect coverage changes

@github-actions
Copy link
Contributor

FVM Benchstat comparison

This branch with compared with the base branch onflow:master commit 36c7855

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
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/reference_tx-249.8ms ± 5%47.6ms ± 5%~(p=0.065 n=6+6)
RuntimeTransaction/convert_int_to_string-253.6ms ±17%50.4ms ± 5%~(p=0.710 n=7+7)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-253.1ms ± 7%52.3ms ± 4%~(p=0.534 n=7+6)
RuntimeTransaction/get_signer_address-251.0ms ± 9%49.8ms ± 3%~(p=0.945 n=7+6)
RuntimeTransaction/get_public_account-252.9ms ± 4%55.1ms ±14%~(p=0.710 n=7+7)
RuntimeTransaction/get_account_and_get_balance-2385ms ± 3%379ms ± 6%~(p=0.383 n=7+7)
RuntimeTransaction/get_account_and_get_available_balance-2378ms ± 1%378ms ± 6%~(p=0.755 n=5+7)
RuntimeTransaction/get_account_and_get_storage_used-255.5ms ± 5%55.4ms ± 4%~(p=1.000 n=7+7)
RuntimeTransaction/get_account_and_get_storage_capacity-2343ms ± 2%336ms ± 3%~(p=0.101 n=6+7)
RuntimeTransaction/get_signer_vault-259.6ms ± 9%57.3ms ± 5%~(p=0.318 n=7+7)
RuntimeTransaction/get_signer_receiver-274.3ms ± 9%73.4ms ± 6%~(p=0.620 n=7+7)
RuntimeTransaction/transfer_tokens-2284ms ± 4%285ms ± 3%~(p=0.620 n=7+7)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-259.0ms ± 7%58.3ms ± 6%~(p=0.710 n=7+7)
RuntimeTransaction/load_and_save_long_string_on_signers_address-2119ms ± 6%116ms ± 4%~(p=0.259 n=7+7)
RuntimeTransaction/create_new_account-21.03s ± 4%1.04s ± 6%~(p=1.000 n=7+7)
RuntimeTransaction/call_empty_contract_function-253.2ms ± 3%52.0ms ± 7%~(p=0.165 n=7+7)
RuntimeTransaction/emit_event-270.6ms ± 3%70.8ms ± 4%~(p=0.945 n=7+6)
RuntimeTransaction/borrow_array_from_storage-2184ms ± 6%185ms ± 5%~(p=0.456 n=7+7)
RuntimeNFTBatchTransfer-2162ms ± 5%159ms ± 1%~(p=0.530 n=7+5)
pkg:github.com/onflow/flow-go/engine/execution/computation goos:linux goarch:amd64
ComputeBlock/16/cols/128/txes/1/max-concurrency-26.25s ± 1%6.30s ± 2%~(p=0.534 n=7+6)
ComputeBlock/16/cols/128/txes/2/max-concurrency-26.60s ± 2%6.56s ± 3%~(p=0.534 n=7+6)
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/copy_array_from_storage-2191ms ± 2%187ms ± 1%−2.00%(p=0.005 n=7+6)
 
computationdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/reference_tx-2202 ± 0%202 ± 0%~(all equal)
RuntimeTransaction/convert_int_to_string-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-2502 ± 0%502 ± 0%~(all equal)
RuntimeTransaction/get_signer_address-2302 ± 0%302 ± 0%~(all equal)
RuntimeTransaction/get_public_account-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_balance-21.00k ± 0%1.00k ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_available_balance-23.10k ± 0%3.10k ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_storage_used-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_storage_capacity-21.70k ± 0%1.70k ± 0%~(all equal)
RuntimeTransaction/get_signer_vault-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/get_signer_receiver-2602 ± 0%602 ± 0%~(all equal)
RuntimeTransaction/transfer_tokens-23.50k ± 0%3.50k ± 0%~(all equal)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-2602 ± 0%602 ± 0%~(all equal)
RuntimeTransaction/load_and_save_long_string_on_signers_address-2602 ± 0%602 ± 0%~(all equal)
RuntimeTransaction/create_new_account-2202 ± 0%202 ± 0%~(all equal)
RuntimeTransaction/call_empty_contract_function-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/emit_event-2602 ± 0%602 ± 0%~(all equal)
RuntimeTransaction/borrow_array_from_storage-22.60k ± 0%2.60k ± 0%~(all equal)
RuntimeTransaction/copy_array_from_storage-22.60k ± 0%2.60k ± 0%~(all equal)
 
interactionsdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/reference_tx-238.2k ± 0%38.2k ± 0%~(p=0.225 n=5+7)
RuntimeTransaction/convert_int_to_string-238.2k ± 0%38.2k ± 0%~(p=0.888 n=7+7)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-238.2k ± 0%38.2k ± 0%~(p=0.727 n=7+7)
RuntimeTransaction/get_signer_address-238.2k ± 0%38.2k ± 0%~(p=0.781 n=7+7)
RuntimeTransaction/get_public_account-238.2k ± 0%38.2k ± 0%~(p=0.980 n=7+7)
RuntimeTransaction/get_account_and_get_balance-246.4k ± 0%46.4k ± 0%~(p=0.253 n=7+6)
RuntimeTransaction/get_account_and_get_available_balance-238.1k ± 0%38.1k ± 0%~(p=0.331 n=7+7)
RuntimeTransaction/get_account_and_get_storage_used-238.2k ± 0%38.2k ± 0%~(p=0.576 n=7+7)
RuntimeTransaction/get_account_and_get_storage_capacity-238.1k ± 0%38.1k ± 0%~(p=0.603 n=7+7)
RuntimeTransaction/get_signer_vault-238.2k ± 0%38.2k ± 0%~(p=0.929 n=7+7)
RuntimeTransaction/get_signer_receiver-238.2k ± 0%38.2k ± 0%~(p=0.883 n=7+7)
RuntimeTransaction/transfer_tokens-238.1k ± 0%38.1k ± 0%~(p=0.106 n=6+7)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-238.3k ± 0%38.3k ± 0%~(p=0.181 n=7+7)
RuntimeTransaction/load_and_save_long_string_on_signers_address-242.1k ± 0%42.1k ± 0%~(p=0.784 n=7+7)
RuntimeTransaction/create_new_account-284.6k ± 0%84.6k ± 0%~(p=0.685 n=7+6)
RuntimeTransaction/call_empty_contract_function-238.4k ± 0%38.4k ± 0%~(p=0.314 n=7+7)
RuntimeTransaction/emit_event-238.4k ± 0%38.4k ± 0%~(p=0.781 n=7+7)
RuntimeTransaction/borrow_array_from_storage-243.4k ± 0%43.4k ± 0%~(p=0.848 n=5+7)
RuntimeTransaction/copy_array_from_storage-243.4k ± 0%43.4k ± 0%~(p=0.502 n=7+7)
 
alloc/opdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/borrow_array_from_storage-270.1MB ± 1%72.0MB ± 3%+2.65%(p=0.038 n=7+7)
RuntimeTransaction/copy_array_from_storage-282.2MB ± 3%84.2MB ± 2%+2.42%(p=0.035 n=7+6)
RuntimeTransaction/reference_tx-236.5MB ± 3%35.8MB ± 5%~(p=0.165 n=7+7)
RuntimeTransaction/convert_int_to_string-236.5MB ± 5%36.6MB ± 2%~(p=0.945 n=7+6)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-236.6MB ± 5%37.0MB ± 4%~(p=0.535 n=7+7)
RuntimeTransaction/get_signer_address-236.4MB ± 2%36.6MB ± 5%~(p=0.805 n=7+7)
RuntimeTransaction/get_public_account-237.6MB ± 2%36.9MB ± 2%~(p=0.073 n=7+6)
RuntimeTransaction/get_account_and_get_balance-2122MB ± 4%123MB ± 0%~(p=0.876 n=7+5)
RuntimeTransaction/get_account_and_get_storage_used-237.7MB ± 3%37.7MB ± 3%~(p=1.000 n=7+7)
RuntimeTransaction/get_account_and_get_storage_capacity-2106MB ± 3%107MB ± 1%~(p=0.805 n=7+7)
RuntimeTransaction/get_signer_receiver-241.7MB ± 9%41.9MB ± 7%~(p=0.805 n=7+7)
RuntimeTransaction/transfer_tokens-282.7MB ± 3%81.7MB ± 1%~(p=0.445 n=7+6)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-236.8MB ± 1%37.2MB ± 5%~(p=0.876 n=5+7)
RuntimeTransaction/load_and_save_long_string_on_signers_address-254.3MB ± 2%54.9MB ± 5%~(p=0.710 n=7+7)
RuntimeTransaction/create_new_account-2183MB ± 3%185MB ± 4%~(p=0.456 n=7+7)
RuntimeTransaction/call_empty_contract_function-236.8MB ± 5%37.1MB ± 4%~(p=0.535 n=7+7)
RuntimeTransaction/emit_event-241.0MB ± 5%42.1MB ± 7%~(p=0.165 n=7+7)
RuntimeNFTBatchTransfer-255.1MB ± 4%54.5MB ± 5%~(p=0.456 n=7+7)
pkg:github.com/onflow/flow-go/engine/execution/computation goos:linux goarch:amd64
ComputeBlock/16/cols/128/txes/1/max-concurrency-21.24GB ± 1%1.24GB ± 1%~(p=0.535 n=7+7)
ComputeBlock/16/cols/128/txes/2/max-concurrency-21.29GB ± 1%1.29GB ± 1%~(p=0.945 n=6+7)
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/get_account_and_get_available_balance-2110MB ± 2%109MB ± 0%−0.74%(p=0.018 n=7+5)
RuntimeTransaction/get_signer_vault-238.6MB ± 6%37.2MB ± 3%−3.65%(p=0.038 n=7+7)
 
allocs/opdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/create_new_account-22.36M ± 0%2.36M ± 0%~(p=0.966 n=7+7)
pkg:github.com/onflow/flow-go/engine/execution/computation goos:linux goarch:amd64
ComputeBlock/16/cols/128/txes/1/max-concurrency-217.8M ± 0%17.8M ± 0%~(p=0.805 n=7+7)
ComputeBlock/16/cols/128/txes/2/max-concurrency-218.4M ± 0%18.4M ± 0%~(p=0.535 n=7+7)
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/get_account_and_get_available_balance-21.29M ± 0%1.29M ± 0%−0.01%(p=0.015 n=7+7)
RuntimeTransaction/get_account_and_get_balance-21.33M ± 0%1.33M ± 0%−0.01%(p=0.003 n=7+5)
RuntimeTransaction/get_account_and_get_storage_capacity-21.16M ± 0%1.16M ± 0%−0.01%(p=0.002 n=7+7)
RuntimeTransaction/transfer_tokens-2863k ± 0%862k ± 0%−0.02%(p=0.003 n=5+7)
RuntimeTransaction/borrow_array_from_storage-2372k ± 0%372k ± 0%−0.03%(p=0.001 n=7+7)
RuntimeTransaction/copy_array_from_storage-2304k ± 0%304k ± 0%−0.03%(p=0.001 n=7+7)
RuntimeTransaction/get_signer_receiver-2223k ± 0%223k ± 0%−0.05%(p=0.001 n=7+7)
RuntimeTransaction/emit_event-2151k ± 0%151k ± 0%−0.07%(p=0.001 n=7+7)
RuntimeTransaction/load_and_save_long_string_on_signers_address-2226k ± 0%226k ± 0%−0.07%(p=0.001 n=7+7)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-2143k ± 0%143k ± 0%−0.09%(p=0.001 n=7+6)
RuntimeTransaction/get_signer_vault-2137k ± 0%137k ± 0%−0.09%(p=0.001 n=7+7)
RuntimeTransaction/get_account_and_get_storage_used-2132k ± 0%132k ± 0%−0.10%(p=0.001 n=7+6)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-2116k ± 0%116k ± 0%−0.11%(p=0.001 n=7+7)
RuntimeTransaction/get_public_account-2121k ± 0%121k ± 0%−0.11%(p=0.001 n=6+7)
RuntimeTransaction/convert_int_to_string-2105k ± 0%104k ± 0%−0.12%(p=0.001 n=7+7)
RuntimeTransaction/call_empty_contract_function-2110k ± 0%110k ± 0%−0.12%(p=0.001 n=7+7)
RuntimeTransaction/get_signer_address-296.6k ± 0%96.4k ± 0%−0.14%(p=0.001 n=7+7)
RuntimeTransaction/reference_tx-292.4k ± 0%92.2k ± 0%−0.15%(p=0.001 n=7+7)
RuntimeNFTBatchTransfer-2279k ± 0%278k ± 0%−0.32%(p=0.003 n=5+7)
 
us/txdelta
pkg:github.com/onflow/flow-go/engine/execution/computation goos:linux goarch:amd64
ComputeBlock/16/cols/128/txes/1/max-concurrency-23.05k ± 1%3.08k ± 2%~(p=0.423 n=7+6)
ComputeBlock/16/cols/128/txes/2/max-concurrency-23.22k ± 2%3.20k ± 3%~(p=0.534 n=7+6)
 

fvm/blueprints/system.go Show resolved Hide resolved
@janezpodhostnik
Copy link
Contributor Author

bors merge

@bors bors bot merged commit 2bc0a96 into master Aug 8, 2023
33 of 35 checks passed
@bors bors bot deleted the janez/revert-dual-authorizers-for-system-tx branch August 8, 2023 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Execution Cadence Execution Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add aditional authorizer for the service transaction
4 participants