cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13695 from ethereum/evmc-refund

Browse Source 
test: Support tracking gas refunds
This commit is contained in:
Alex Beregszaszi 2022-11-10 23:08:38 +01:00 committed by GitHub
commit 310a58dd31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 117 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/ExecutionFramework.cpp
View File

@ -192,14 +192,21 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
if (_isCreation)
m_contractAddress = EVMHost::convertFromEVMC(result.create_address);
m_gasUsed = InitialGas - result.gas_left;
unsigned const refundRatio = (m_evmVersion >= langutil::EVMVersion::london() ? 5 : 2);
auto const totalGasUsed = InitialGas - result.gas_left;
auto const gasRefund = min(u256(result.gas_refund), totalGasUsed / refundRatio);
m_gasUsed = totalGasUsed - gasRefund;
m_transactionSuccessful = (result.status_code == EVMC_SUCCESS);
if (m_showMessages)
{
cout << " out: " << util::toHex(m_output) << endl;
cout << " result: " << static_cast<size_t>(result.status_code) << endl;
cout << " gas used: " << m_gasUsed.str() << endl;
cout << " out: " << util::toHex(m_output) << endl;
cout << " result: " << static_cast<size_t>(result.status_code) << endl;
cout << " gas used: " << m_gasUsed.str() << endl;
cout << " gas used (without refund): " << totalGasUsed.str() << endl;
cout << " gas refund (total): " << result.gas_refund << endl;
cout << " gas refund (bound): " << gasRefund.str() << endl;
}
}

0
test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol → test/libsolidity/semanticTests/array/array_2d_assignment.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_2d_new.sol → test/libsolidity/semanticTests/array/array_2d_new.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol → test/libsolidity/semanticTests/array/array_3d_assignment.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_3d_new.sol → test/libsolidity/semanticTests/array/array_3d_new.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_function_pointers.sol → test/libsolidity/semanticTests/array/array_function_pointers.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol → test/libsolidity/semanticTests/array/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol → test/libsolidity/semanticTests/array/array_memory_allocation/array_array_static.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol → test/libsolidity/semanticTests/array/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol → test/libsolidity/semanticTests/array/array_memory_allocation/array_static_zeroed_memory_index_access.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol → test/libsolidity/semanticTests/array/array_memory_allocation/array_zeroed_memory_index_access.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol → test/libsolidity/semanticTests/array/array_memory_as_parameter.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_memory_create.sol → test/libsolidity/semanticTests/array/array_memory_create.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol → test/libsolidity/semanticTests/array/array_memory_index_access.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol → test/libsolidity/semanticTests/array/array_push_return_reference.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol → test/libsolidity/semanticTests/array/array_push_with_arg.sol
View File

24
test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol → test/libsolidity/semanticTests/array/array_storage_index_access.sol
View File

@ -20,9 +20,9 @@ contract C {
// gas legacy: 3071683
// gas legacyOptimized: 3014415
// test_indices(uint256): 5 ->
// gas irOptimized: 722510
// gas legacy: 719151
// gas legacyOptimized: 716139
// gas irOptimized: 578008
// gas legacy: 575321
// gas legacyOptimized: 572912
// test_indices(uint256): 10 ->
// gas irOptimized: 158347
// gas legacy: 162657
@ -40,14 +40,14 @@ contract C {
// gas legacy: 18602799
// gas legacyOptimized: 18179744
// test_indices(uint256): 129 ->
// gas irOptimized: 5197778
// gas legacy: 5212013
// gas legacyOptimized: 5157889
// gas irOptimized: 4158223
// gas legacy: 4169611
// gas legacyOptimized: 4126312
// test_indices(uint256): 128 ->
// gas irOptimized: 416732
// gas legacy: 470568
// gas legacyOptimized: 423768
// gas irOptimized: 411932
// gas legacy: 465768
// gas legacyOptimized: 418968
// test_indices(uint256): 1 ->
// gas irOptimized: 726962
// gas legacy: 721789
// gas legacyOptimized: 720209
// gas irOptimized: 581570
// gas legacy: 577432
// gas legacyOptimized: 576168

0
test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol → test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
View File

24
test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol → test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
View File

@ -52,18 +52,18 @@ contract C {
// ----
// test_zeroed_indicies(uint256): 1 ->
// test_zeroed_indicies(uint256): 5 ->
// gas irOptimized: 165044
// gas legacy: 166201
// gas legacyOptimized: 163439
// gas irOptimized: 132036
// gas legacy: 132961
// gas legacyOptimized: 130752
// test_zeroed_indicies(uint256): 10 ->
// gas irOptimized: 282617
// gas legacy: 285088
// gas legacyOptimized: 280012
// gas irOptimized: 226094
// gas legacy: 228071
// gas legacyOptimized: 224010
// test_zeroed_indicies(uint256): 15 ->
// gas irOptimized: 405332
// gas legacy: 409138
// gas legacyOptimized: 401827
// gas irOptimized: 324266
// gas legacy: 327311
// gas legacyOptimized: 321462
// test_zeroed_indicies(uint256): 0xFF ->
// gas irOptimized: 6403282
// gas legacy: 6466233
// gas legacyOptimized: 6333077
// gas irOptimized: 5122626
// gas legacy: 5172987
// gas legacyOptimized: 5066462

0
test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol → test/libsolidity/semanticTests/array/array_storage_length_access.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol → test/libsolidity/semanticTests/array/array_storage_pop_zero_length.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol → test/libsolidity/semanticTests/array/array_storage_push_empty.sol
View File

0
test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol → test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
View File

12
test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol → test/libsolidity/semanticTests/array/array_storage_push_pop.sol
View File

@ -17,11 +17,11 @@ contract C {
// gas legacy: 105722
// gas legacyOptimized: 103508
// set_get_length(uint256): 0xFF -> 0
// gas irOptimized: 841772
// gas legacy: 830227
// gas legacyOptimized: 806158
// gas irOptimized: 821872
// gas legacy: 810327
// gas legacyOptimized: 786258
// set_get_length(uint256): 0xFFF -> 0
// gas irOptimized: 12860984
// gas legacy: 12668959
// gas legacyOptimized: 12287770
// gas irOptimized: 12841084
// gas legacy: 12649059
// gas legacyOptimized: 12267870
// set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #

4
test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
View File

@ -46,8 +46,8 @@ contract c {
// storageEmpty -> 0
// test_long() -> 67
// gas irOptimized: 89148
// gas legacy: 108639
// gas legacyOptimized: 106093
// gas legacy: 105839
// gas legacyOptimized: 103293
// storageEmpty -> 0
// test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
// gas legacy: 61930

6
test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
View File

@ -17,6 +17,6 @@ contract c {
}
// ----
// test() -> 0
// gas irOptimized: 157188
// gas legacy: 188576
// gas legacyOptimized: 183333
// gas irOptimized: 125751
// gas legacy: 150861
// gas legacyOptimized: 146667

6
test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
View File

@ -46,6 +46,6 @@ contract C {
}
// ----
// f() -> true
// gas irOptimized: 146756
// gas legacy: 155961
// gas legacyOptimized: 153588
// gas irOptimized: 117405
// gas legacy: 124769
// gas legacyOptimized: 122871

6
test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
View File

@ -13,6 +13,6 @@ contract C {
}
// ----
// f() -> 0
// gas irOptimized: 134365
// gas legacy: 135313
// gas legacyOptimized: 134548
// gas irOptimized: 107492
// gas legacy: 108251
// gas legacyOptimized: 107639

12
test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
View File

@ -35,12 +35,12 @@ contract c {
}
// ----
// test() -> 0x02000202
// gas irOptimized: 4649835
// gas legacy: 4578446
// gas legacyOptimized: 4548309
// gas irOptimized: 4550335
// gas legacy: 4478946
// gas legacyOptimized: 4448809
// storageEmpty -> 1
// clear() -> 0, 0
// gas irOptimized: 4517023
// gas legacy: 4450548
// gas legacyOptimized: 4422289
// gas irOptimized: 4477223
// gas legacy: 4410748
// gas legacyOptimized: 4382489
// storageEmpty -> 1

6
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
View File

@ -17,6 +17,6 @@ contract c {
}
// ----
// test() -> 5, 4
// gas irOptimized: 224973
// gas legacy: 233801
// gas legacyOptimized: 232816
// gas irOptimized: 205073
// gas legacy: 213901
// gas legacyOptimized: 212916

6
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
View File

@ -23,6 +23,6 @@ contract c {
// compileToEwasm: also
// ----
// test() -> 3, 4
// gas irOptimized: 189516
// gas legacy: 215253
// gas legacyOptimized: 212341
// gas irOptimized: 169616
// gas legacy: 175453
// gas legacyOptimized: 172541

6
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
View File

@ -18,6 +18,6 @@ contract c {
// ----
// test() -> 5, 4
// gas irOptimized: 272893
// gas legacy: 270834
// gas legacyOptimized: 269960
// gas irOptimized: 252993
// gas legacy: 250934
// gas legacyOptimized: 250060

6
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
View File

@ -17,6 +17,6 @@ contract c {
// compileToEwasm: also
// ----
// test() -> 8, 0
// gas irOptimized: 236079
// gas legacy: 234695
// gas legacyOptimized: 234103
// gas irOptimized: 196279
// gas legacy: 194895
// gas legacyOptimized: 194303

6
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
View File

@ -17,7 +17,7 @@ contract c {
}
// ----
// test() -> 4, 5
// gas irOptimized: 238623
// gas legacy: 238736
// gas legacyOptimized: 237159
// gas irOptimized: 190899
// gas legacy: 190989
// gas legacyOptimized: 189728
// storageEmpty -> 1

6
test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
View File

@ -19,6 +19,6 @@ contract c {
// compileToEwasm: also
// ----
// test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
// gas irOptimized: 124640
// gas legacy: 187414
// gas legacyOptimized: 165659
// gas irOptimized: 104740
// gas legacy: 167514
// gas legacyOptimized: 145759

6
test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
View File

@ -21,6 +21,6 @@ contract c {
// compileToEwasm: also
// ----
// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
// gas irOptimized: 293486
// gas legacy: 303626
// gas legacyOptimized: 301945
// gas irOptimized: 273586
// gas legacy: 283726
// gas legacyOptimized: 282045

6
test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
View File

@ -21,6 +21,6 @@ contract c {
// compileToEwasm: also
// ----
// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
// gas irOptimized: 273093
// gas legacy: 276360
// gas legacyOptimized: 275411
// gas irOptimized: 233293
// gas legacy: 236560
// gas legacyOptimized: 235611

6
test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
View File

@ -44,6 +44,6 @@ contract Test {
// test1() -> 3
// test2() -> 6
// test3() -> 24
// gas irOptimized: 155660
// gas legacy: 156683
// gas legacyOptimized: 155793
// gas irOptimized: 141260
// gas legacy: 142283
// gas legacyOptimized: 141393

6
test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
View File

@ -39,8 +39,8 @@ contract C {
// gas legacy: 181047
// gas legacyOptimized: 180029
// g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
// gas irOptimized: 121097
// gas legacy: 124201
// gas legacyOptimized: 121353
// gas irOptimized: 106697
// gas legacy: 109801
// gas legacyOptimized: 106953
// h() -> 0x40, 0x60, 0x00, 0x00
// storageEmpty -> 1

6
test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
View File

@ -46,6 +46,6 @@ contract C {
}
// ----
// f() -> 0xff
// gas irOptimized: 179284
// gas legacy: 191974
// gas legacyOptimized: 183456
// gas irOptimized: 143428
// gas legacy: 153580
// gas legacyOptimized: 146765

6
test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
View File

@ -51,6 +51,6 @@ contract C {
// gas legacyOptimized: 117021
// test2() -> 0x20, 0x14, "[b called][a called]"
// test3() -> 0x20, 0x14, "[b called][a called]"
// gas irOptimized: 106056
// gas legacy: 105614
// gas legacyOptimized: 104506
// gas irOptimized: 103256
// gas legacy: 102814
// gas legacyOptimized: 101706

6
test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
View File

@ -23,7 +23,7 @@ contract c {
}
// ----
// test() -> 1, 2, 3
// gas irOptimized: 2285747
// gas legacy: 2279034
// gas legacyOptimized: 2267444
// gas irOptimized: 1828598
// gas legacy: 1823228
// gas legacyOptimized: 1813956
// storageEmpty -> 1

6
test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
View File

@ -18,7 +18,7 @@ contract c {
}
// ----
// test() -> 38, 28, 18
// gas irOptimized: 185650
// gas legacy: 189492
// gas legacyOptimized: 178318
// gas irOptimized: 148520
// gas legacy: 151594
// gas legacyOptimized: 142655
// storageEmpty -> 1

6
test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
View File

@ -18,7 +18,7 @@ contract c {
}
// ----
// test() -> 20, 10
// gas irOptimized: 157570
// gas legacy: 159279
// gas legacyOptimized: 152937
// gas irOptimized: 126056
// gas legacy: 127424
// gas legacyOptimized: 122350
// storageEmpty -> 1

4
test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
View File

@ -10,6 +10,6 @@ contract c {
// ----
// test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
// gas irOptimized: 109301
// gas legacy: 126702
// gas irOptimized: 109310
// gas legacy: 101362
// gas legacyOptimized: 123422

6
test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
View File

@ -16,7 +16,7 @@ contract c {
}
// ----
// test() -> true
// gas irOptimized: 175619
// gas legacy: 224093
// gas legacyOptimized: 205152
// gas irOptimized: 140496
// gas legacy: 179275
// gas legacyOptimized: 164122
// storageEmpty -> 1

6
test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
View File

@ -15,7 +15,7 @@ contract c {
}
// ----
// test() ->
// gas irOptimized: 142528
// gas legacy: 164430
// gas legacyOptimized: 158513
// gas irOptimized: 114023
// gas legacy: 131544
// gas legacyOptimized: 126811
// storageEmpty -> 1

0
test/libsolidity/semanticTests/viaYul/calldata_array_access.sol → test/libsolidity/semanticTests/calldata/calldata_array_access.sol
View File

0
test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol → test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
View File

0
test/libsolidity/semanticTests/viaYul/calldata_array_length.sol → test/libsolidity/semanticTests/calldata/calldata_array_length.sol
View File

0
test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol → test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
View File

0
test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol → test/libsolidity/semanticTests/calldata/calldata_bytes_array_bounds.sol
View File

12
test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
View File

@ -42,10 +42,10 @@ contract C {
}
// ----
// f() ->
// gas irOptimized: 141557
// gas legacy: 142032
// gas legacyOptimized: 141400
// gas irOptimized: 113246
// gas legacy: 113626
// gas legacyOptimized: 113120
// g() ->
// gas irOptimized: 148272
// gas legacy: 148507
// gas legacyOptimized: 147740
// gas irOptimized: 118618
// gas legacy: 118806
// gas legacyOptimized: 118192