Skip to content

[core] add gas arg to ext_gas_price #461

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

Merged
ascjones merged 11 commits into from
Jul 2, 2020
Merged

[core] add gas arg to ext_gas_price #461

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ff57bb1
add gas argument
ascjones Jun 25, 2020
3f829b1
Add gas parameter to ext_gas_price
ascjones Jun 25, 2020
f9d56d1
Fix up gas_price offchain api
ascjones Jun 26, 2020
9b5c99c
Fix up env_access api
ascjones Jun 26, 2020
6a88353
Emulate gas price calculation
ascjones Jun 30, 2020
c1c22b4
Make clippy happy
ascjones Jun 30, 2020
39ede31
Merge branch 'master' into aj-gas-price
ascjones Jun 30, 2020
787aa15
Use Saturating impl for emulating gas price calculation offchain
ascjones Jun 30, 2020
d216d11
Fmt
ascjones Jun 30, 2020
a6668b7
Add offchain gas_price test
ascjones Jul 2, 2020
d8a7e98
Make clippy happy
ascjones Jul 2, 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
Fix up env_access api
  • Loading branch information
@ascjones
ascjones committed Jun 26, 2020
commit 9b5c99cc857468c87aa2574d8b96d8742feacb5c
2 changes: 1 addition & 1 deletion core/src/env/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ where
})
}

/// Returns the price for the specified amount of weight.
/// Returns the price for the specified amount of gas.
///
/// # Errors
///
Expand Down
2 changes: 1 addition & 1 deletion core/src/env/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ pub trait TypedEnv: Env {
/// For more details visit: [`ink_core::env::transferred_balance`]
fn transferred_balance<T: EnvTypes>(&mut self) -> Result<T::Balance>;

/// Returns the price for the specified amount of weight.
/// Returns the price for the specified amount of gas.
///
/// # Note
///
Expand Down
6 changes: 3 additions & 3 deletions lang/src/env_access.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ where
env::transferred_balance::<T>().expect("couldn't decode transferred balance")
}

/// Returns the current price for gas.
/// Returns the price for the specified amount of gas.
///
/// # Note
///
/// For more details visit: [`ink_core::env::gas_price`]
pub fn gas_price(self) -> T::Balance {
env::gas_price::<T>().expect("couldn't decode gas price")
pub fn gas_price(self, gas: u64) -> T::Balance {
env::gas_price::<T>(gas).expect("couldn't decode gas price")
}

/// Returns the amount of gas left for the contract execution.
Expand Down