Skip to content

refactor(gas): adjust FUEL_DENOM_RATE from 1000 to 20 based on benchmarks #206

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

Closed
wants to merge 1 commit into from
Closed

refactor(gas): adjust FUEL_DENOM_RATE from 1000 to 20 based on benchmarks #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ convert_case = "0.8.0"
proc-macro2 = { version = "1.0", default-features = false }
quote = { version = "1.0" }
elliptic-curve = { version = "0.13.4", features = ["hazmat", "sec1", "ecdh"], default-features = false }
cfg-if = { version = "1.0.3", default-features = false }

# revm
revm = { git = "https://github.com/fluentlabs-xyz/revm-rwasm.git", branch = "v82-patched", default-features = false }
Expand Down
4 changes: 4 additions & 0 deletions bins/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ sha2 = "0.10"
[features]
default = []
std = ["fluentbase-build/std"]
fluent-testnet = [
"fluentbase-build/fluent-testnet",
"fluentbase-sdk/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/blake2f/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std", "revm-precompile/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
6 changes: 5 additions & 1 deletion contracts/bls12381/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ path = "lib.rs"

[features]
default = ["std"]
std = ["fluentbase-sdk/std", "revm-precompile/std"]
std = ["fluentbase-sdk/std", "revm-precompile/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/bn256/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/ecrecover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std", "revm-precompile/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/eip2935/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/evm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std", "fluentbase-evm/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/fairblock/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/identity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std", "revm-precompile/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/kzg/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std", "revm-precompile/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/modexp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std", "revm-precompile/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/multicall/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/nitro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ default = [
# "fluentbase-sdk/debug-print"
]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/oauth2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/ripemd160/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std", "revm-precompile/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/secp256r1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/sha256/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/svm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std", "fluentbase-svm/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
5 changes: 5 additions & 0 deletions contracts/universal-token/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet",
"fluentbase-universal-token/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ path = "lib.rs"
[features]
default = ["std"]
std = ["fluentbase-sdk/std"]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
4 changes: 4 additions & 0 deletions contracts/webauthn/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ std = [
"hex/std",
"revm-precompile/std",
]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-testing/fluent-testnet"
]
5 changes: 4 additions & 1 deletion crates/build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,7 @@ default = ["std"]
std = [
"fluentbase-sdk/std",
"rwasm/std",
]
]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet"
]
7 changes: 7 additions & 0 deletions crates/contracts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,10 @@ std = [
"serde_json/std",
]
generate-genesis = [] # this feature is doing nothing now (genesis is always generated), kept it for backward compatibility, and will remove it once ready
fluent-testnet = [
"fluentbase-evm/fluent-testnet",
"fluentbase-sdk/fluent-testnet",
"fluentbase-svm/fluent-testnet",
"fluentbase-universal-token/fluent-testnet"
]

6 changes: 6 additions & 0 deletions crates/contracts/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ fn main() {
"--color=always".to_string(),
"--no-default-features".to_string(),
];
#[cfg(feature = "fluent-testnet")]
{
args.push("--features".to_string());
args.push("fluent-testnet".to_string());
}

if !is_debug_profile {
args.push("--release".to_string());
}
Expand Down
6 changes: 5 additions & 1 deletion crates/crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@ std = [
"fluentbase-types/std",
"fluentbase-runtime/std",
"elliptic-curve/std",
]
]
fluent-testnet = [
"fluentbase-runtime?/fluent-testnet",
"fluentbase-types/fluent-testnet"
]
3 changes: 3 additions & 0 deletions crates/evm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ std = [
"revm-interpreter/std",
"revm-context/std",
]
fluent-testnet = [
"fluentbase-sdk/fluent-testnet"
]
4 changes: 4 additions & 0 deletions crates/genesis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,7 @@ std = [
"serde_json/std",
]
generate-genesis = [] # this feature is doing nothing now (genesis is always generated), kept it for backward compatibility, and will remove it once ready
fluent-testnet = [
"fluentbase-contracts/fluent-testnet",
"fluentbase-sdk/fluent-testnet"
]
5 changes: 5 additions & 0 deletions crates/revm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,8 @@ debug-print = [
# "rwasm/debug-print",
]
wasmtime = ["fluentbase-runtime/wasmtime", "rwasm/wasmtime"]
fluent-testnet = [
"fluentbase-runtime/fluent-testnet",
"fluentbase-sdk/fluent-testnet",
"fluentbase-evm/fluent-testnet"
]
3 changes: 3 additions & 0 deletions crates/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,6 @@ inter-process-lock = [
"dep:fs2",
]
global-executor = ["dep:core_affinity"]
fluent-testnet = [
"fluentbase-types/fluent-testnet"
]
3 changes: 3 additions & 0 deletions crates/sdk-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ proc-macro = true

[features]
default = []
fluent-testnet = [
"fluentbase-sdk/fluent-testnet"
]
7 changes: 6 additions & 1 deletion crates/sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,9 @@ std = [
"alloy-rlp/std",
]
debug-print = []
fast-panic = []
fast-panic = []
fluent-testnet = [
"fluentbase-crypto/fluent-testnet",
"fluentbase-types/fluent-testnet",
"fluentbase-sdk-derive/fluent-testnet"
]
3 changes: 3 additions & 0 deletions crates/svm-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ fluentbase-sdk = { workspace = true, default-features = false }
[features]
default = []
std = []
fluent-testnet = [
"fluentbase-sdk/fluent-testnet"
]
6 changes: 6 additions & 0 deletions crates/svm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,9 @@ debug-print = [
]
do-not-validate-elf-on-deploy = []
use-extended-debug-log = []
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-svm-common/fluent-testnet",
"fluentbase-testing/fluent-testnet",
"fluentbase-universal-token/fluent-testnet"
]
5 changes: 5 additions & 0 deletions crates/testing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@ debug-print = [
"revm/debug-print",
# "fluentbase-revm/debug-print",
]
fluent-testnet = [
"fluentbase-revm/fluent-testnet",
"fluentbase-runtime/fluent-testnet",
"fluentbase-sdk/fluent-testnet"
]
3 changes: 2 additions & 1 deletion crates/types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ std = [
"revm-precompile/std"
]
debug-print = []
fast-panic = []
fast-panic = []
fluent-testnet = []
5 changes: 4 additions & 1 deletion crates/types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ pub const CALL_DEPTH_ROOT: u32 = 0;
pub const DEVELOPER_PREVIEW_CHAIN_ID: u64 = 10993;

/// A relation between fuel and gas,
/// according to our benchmarks, average WebAssembly instruction is ~1000 faster than average EVM
/// according to our benchmarks, average WebAssembly instruction is ~20 times faster than average EVM
/// instruction.
///
/// The value can be changed in the future.
#[cfg(feature = "fluent-testnet")]
pub const FUEL_DENOM_RATE: u64 = 1000;
#[cfg(not(feature = "fluent-testnet"))]
pub const FUEL_DENOM_RATE: u64 = 20;

/// A max rWasm call stack limit
pub const CALL_STACK_LIMIT: u32 = 1024;
Expand Down
4 changes: 4 additions & 0 deletions crates/universal-token/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ default = [
]
std = []
debug-print = []
fluent-testnet = [
"fluentbase-sdk/fluent-testnet",
"fluentbase-svm-common/fluent-testnet"
]
Loading
Loading