Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Integrate pallet_contracts gas with the weight system #5712

Merged
gnunicorn merged 8 commits into from
Apr 24, 2020
Merged

Integrate pallet_contracts gas with the weight system #5712

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ce3163
Integrate pallet_contracts gas with the weight system
athei Apr 14, 2020
3f5b8a1
Rescale the schedule to new gas definitaion (=1 weight)
athei Apr 21, 2020
32226e5
Increase supplied gas_limit in tests
athei Apr 22, 2020
014d7d8
Apply style suggestions from code review
athei Apr 22, 2020
71a82f3
Fix possible overflow in fn refund
athei Apr 22, 2020
39ef81d
Remove gas metering from fn put_code()
athei Apr 22, 2020
6b9aa7f
Typo fix
athei Apr 22, 2020
27ad6b9
Improve comment on WASM_INSTRUCTION_COST
athei Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rescale the schedule to new gas definitaion (=1 weight)
  • Loading branch information
@athei
athei committed Apr 22, 2020
commit 3f5b8a1784af51d73d117c1495abe312a37266ba
31 changes: 17 additions & 14 deletions frame/contracts/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,24 +936,27 @@ pub struct Schedule {
pub max_subject_len: u32,
}

// This is 500 (2 instruction per nano second on 2GHZ) * 1000x slowdown through wasmi
const WASM_INSTRUCTION_COST: Gas = 500_000;

impl Default for Schedule {
fn default() -> Schedule {
Schedule {
version: 0,
put_code_per_byte_cost: 1,
grow_mem_cost: 1,
regular_op_cost: 1,
return_data_per_byte_cost: 1,
event_data_per_byte_cost: 1,
event_per_topic_cost: 1,
event_base_cost: 1,
call_base_cost: 135,
dispatch_base_cost: 135,
instantiate_base_cost: 175,
sandbox_data_read_cost: 1,
sandbox_data_write_cost: 1,
transfer_cost: 100,
instantiate_cost: 200,
put_code_per_byte_cost: WASM_INSTRUCTION_COST,
grow_mem_cost: WASM_INSTRUCTION_COST,
regular_op_cost: WASM_INSTRUCTION_COST,
return_data_per_byte_cost: WASM_INSTRUCTION_COST,
event_data_per_byte_cost: WASM_INSTRUCTION_COST,
event_per_topic_cost: WASM_INSTRUCTION_COST,
event_base_cost: WASM_INSTRUCTION_COST,
call_base_cost: 135 * WASM_INSTRUCTION_COST,
dispatch_base_cost: 135 * WASM_INSTRUCTION_COST,
instantiate_base_cost: 175 * WASM_INSTRUCTION_COST,
sandbox_data_read_cost: WASM_INSTRUCTION_COST,
sandbox_data_write_cost: WASM_INSTRUCTION_COST,
transfer_cost: 100 * WASM_INSTRUCTION_COST,
instantiate_cost: 200 * WASM_INSTRUCTION_COST,
max_event_topics: 4,
max_stack_height: 64 * 1024,
max_memory_pages: 16,
Expand Down