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

Hard-cap the execution time of custom contract calls. #4226

Merged
gavofyork merged 3 commits into from
Nov 27, 2019
Merged

Hard-cap the execution time of custom contract calls. #4226

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e33bc87
Reject call requests that allocate too high gas limit.
tomusdrw Nov 26, 2019
402e5c8
Merge branch 'master' into td-hard-cap
tomusdrw Nov 27, 2019
9cd18cf
Lower to 5x
tomusdrw Nov 27, 2019
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
24 changes: 23 additions & 1 deletion frame/contracts/rpc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,16 @@ const RUNTIME_ERROR: i64 = 1;
const CONTRACT_DOESNT_EXIST: i64 = 2;
const CONTRACT_IS_A_TOMBSTONE: i64 = 3;

// A private newtype for converting `GetStorageError` into an RPC error.
/// A rough estimate of how much gas a decent hardware consumes per second,
/// using native execution.
/// This value is used to set the upper bound for maximal contract calls to
/// prevent blocking the RPC for too long.
///
/// Based on W3F research spreadsheet:
/// https://docs.google.com/spreadsheets/d/1h0RqncdqiWI4KgxO0z9JIpZEJESXjX_ZCK6LFX6veDo/view
Copy link
Contributor

@HCastano HCastano Nov 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have permissions to view this, so I'm guessing others won't either. Who do we talk to about making this public?

const GAS_PER_SECOND: u64 = 1_000_000_000;

/// A private newtype for converting `GetStorageError` into an RPC error.
struct GetStorageError(runtime_api::GetStorageError);
impl From<GetStorageError> for Error {
fn from(e: GetStorageError) -> Error {
Expand Down Expand Up @@ -148,6 +157,19 @@ where
data: None,
})?;

let max_gas_limit = 5 * GAS_PER_SECOND;
Copy link
Contributor

@HCastano HCastano Nov 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add the "interpretation" you put in the PR description as a comment here

if gas_limit > max_gas_limit {
return Err(Error {
code: ErrorCode::InvalidParams,
message: format!(
"Requested gas limit is greater than maximum allowed: {} > {}",
gas_limit,
max_gas_limit
),
data: None,
});
}

let exec_result = api
.call(&at, origin, dest, value, gas_limit, input_data.to_vec())
.map_err(|e| Error {
Expand Down