diff --git a/apps/src/lib/cli.rs b/apps/src/lib/cli.rs index d5a142da1a5..53c1ba1a72e 100644 --- a/apps/src/lib/cli.rs +++ b/apps/src/lib/cli.rs @@ -1627,7 +1627,7 @@ pub mod args { const FEE_AMOUNT: ArgDefault = arg_default("fee-amount", DefaultFn(|| token::Amount::from(0))); const GAS_LIMIT: ArgDefault = - arg_default("gas-limit", DefaultFn(|| GasLimit::from(10))); //FIXME: fix this default value + arg_default("gas-limit", DefaultFn(|| GasLimit::from(10))); const FEE_TOKEN: ArgDefaultFromCtx = arg_default_from_ctx("fee-token", DefaultFn(|| "NAM".into())); const GENESIS_PATH: Arg = arg("genesis-path"); diff --git a/apps/src/lib/config/genesis.rs b/apps/src/lib/config/genesis.rs index 86654952a94..6fa4ca89f5f 100644 --- a/apps/src/lib/config/genesis.rs +++ b/apps/src/lib/config/genesis.rs @@ -942,7 +942,7 @@ pub fn genesis() -> Genesis { }, max_expected_time_per_block: namada::types::time::DurationSecs(30), max_proposal_bytes: Default::default(), - max_block_gas: 100_000_000, //FIXME: adjust this value + max_block_gas: 100_000_000, vp_whitelist: vec![], tx_whitelist: vec![], implicit_vp_code_path: vp_implicit_path.into(), diff --git a/core/src/ledger/gas.rs b/core/src/ledger/gas.rs index f4414651b41..11e6365c9d8 100644 --- a/core/src/ledger/gas.rs +++ b/core/src/ledger/gas.rs @@ -22,7 +22,7 @@ const PARALLEL_GAS_DIVIDER: u64 = 10; /// The minimum gas cost for accessing the storage pub const MIN_STORAGE_GAS: u64 = 1; /// The gas cost for verifying the signature of a transaction -pub const VERIFY_TX_SIG_GAS_COST: u64 = 1_000; +pub const VERIFY_TX_SIG_GAS_COST: u64 = 10; /// The gas cost for validating wasm vp code pub const WASM_VALIDATION_GAS_PER_BYTE: u64 = 1; /// The cost for writing a byte to storage diff --git a/genesis/dev.toml b/genesis/dev.toml index 6973aae34a8..fb6c5eaaf0b 100644 --- a/genesis/dev.toml +++ b/genesis/dev.toml @@ -148,7 +148,7 @@ max_expected_time_per_block = 30 epochs_per_year = 525_600 # Max payload size, in bytes, for a tx batch proposal. max_proposal_bytes = 22020096 -# Max amount of gas per block FIXME: adjust value +# Max amount of gas per block max_block_gas = 1000000 # Proof of stake parameters. diff --git a/genesis/e2e-tests-single-node.toml b/genesis/e2e-tests-single-node.toml index 57654f0406f..5d91ed15210 100644 --- a/genesis/e2e-tests-single-node.toml +++ b/genesis/e2e-tests-single-node.toml @@ -155,7 +155,7 @@ min_num_of_blocks = 4 max_expected_time_per_block = 30 # Max payload size, in bytes, for a tx batch proposal. max_proposal_bytes = 22020096 -# Max amount of gas per block FIXME: adjust value +# Max amount of gas per block max_block_gas = 1000000000 # Gas table gas_table = {} diff --git a/tests/src/e2e/ibc_tests.rs b/tests/src/e2e/ibc_tests.rs index d5d77a733d4..6f7dc084da1 100644 --- a/tests/src/e2e/ibc_tests.rs +++ b/tests/src/e2e/ibc_tests.rs @@ -778,7 +778,7 @@ fn transfer_received_token( "--fee-amount", "0", "--gas-limit", - "20", + "100", "--fee-token", NAM, "--ledger-address", @@ -1069,7 +1069,7 @@ fn submit_ibc_tx( "--fee-amount", "0", "--gas-limit", - "20", + "100", "--fee-token", NAM, "--ledger-address", @@ -1115,7 +1115,7 @@ fn transfer( "--port-id", &port_id, "--gas-limit", - "20", + "100", "--ledger-address", &rpc, ]; diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs index 8dc83edcc10..0d858b610ad 100644 --- a/tests/src/e2e/ledger_tests.rs +++ b/tests/src/e2e/ledger_tests.rs @@ -111,7 +111,7 @@ fn test_node_connectivity_and_consensus() -> Result<()> { "--amount", "10.1", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -308,7 +308,7 @@ fn ledger_txs_and_queries() -> Result<()> { "--amount", "10.1", "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -324,7 +324,7 @@ fn ledger_txs_and_queries() -> Result<()> { "--amount", "10.1", "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -337,7 +337,7 @@ fn ledger_txs_and_queries() -> Result<()> { "--code-path", &vp_user, "--gas-limit", - "30", + "100", "--ledger-address", &validator_one_rpc, ], @@ -351,7 +351,7 @@ fn ledger_txs_and_queries() -> Result<()> { "--data-path", "README.md", "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc ], @@ -368,7 +368,7 @@ fn ledger_txs_and_queries() -> Result<()> { "--alias", "Test-Account", "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -388,7 +388,7 @@ fn ledger_txs_and_queries() -> Result<()> { "--signer", ALBERT, "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -527,7 +527,7 @@ fn masp_txs_and_queries() -> Result<()> { "--amount", "10", "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -546,7 +546,7 @@ fn masp_txs_and_queries() -> Result<()> { "--amount", "15", "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -565,7 +565,7 @@ fn masp_txs_and_queries() -> Result<()> { "--amount", "20", "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -586,7 +586,7 @@ fn masp_txs_and_queries() -> Result<()> { "--signer", ALBERT, "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -607,7 +607,7 @@ fn masp_txs_and_queries() -> Result<()> { "--signer", ALBERT, "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -628,7 +628,7 @@ fn masp_txs_and_queries() -> Result<()> { "--signer", ALBERT, "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -649,7 +649,7 @@ fn masp_txs_and_queries() -> Result<()> { "--signer", ALBERT, "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -670,7 +670,7 @@ fn masp_txs_and_queries() -> Result<()> { "--signer", ALBERT, "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -728,7 +728,7 @@ fn masp_txs_and_queries() -> Result<()> { "--signer", BERTHA, "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ], @@ -1692,7 +1692,7 @@ fn invalid_transactions() -> Result<()> { "--signing-key", &daewon_lower, "--gas-limit", - "2", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -1743,7 +1743,7 @@ fn invalid_transactions() -> Result<()> { "--amount", "1_000_000.1", "--gas-limit", - "1", + "100", // Force to ignore client check that fails on the balance check of the // source address "--force", @@ -1817,7 +1817,7 @@ fn pos_bonds() -> Result<()> { "--amount", "100", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -1836,7 +1836,7 @@ fn pos_bonds() -> Result<()> { "--amount", "200", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -1852,7 +1852,7 @@ fn pos_bonds() -> Result<()> { "--amount", "51", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -1871,7 +1871,7 @@ fn pos_bonds() -> Result<()> { "--amount", "32", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -1918,7 +1918,7 @@ fn pos_bonds() -> Result<()> { "--validator", "validator-0", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -1935,7 +1935,7 @@ fn pos_bonds() -> Result<()> { "--source", BERTHA, "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2001,7 +2001,7 @@ fn pos_init_validator() -> Result<()> { BERTHA, "--unsafe-dont-encrypt", "--gas-limit", - "20", + "100", "--commission-rate", "0.05", "--max-commission-rate-change", @@ -2026,7 +2026,7 @@ fn pos_init_validator() -> Result<()> { "--amount", "0.5", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2043,7 +2043,7 @@ fn pos_init_validator() -> Result<()> { "--amount", "1000.5", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2063,7 +2063,7 @@ fn pos_init_validator() -> Result<()> { "--amount", "10999.5", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2079,7 +2079,7 @@ fn pos_init_validator() -> Result<()> { "--amount", "10000", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2149,7 +2149,7 @@ fn ledger_many_txs_in_a_block() -> Result<()> { "--amount", "1.01", "--gas-limit", - "20", + "100", "--ledger-address", ]); @@ -2247,7 +2247,7 @@ fn proposal_submission() -> Result<()> { "--amount", "900", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2267,7 +2267,7 @@ fn proposal_submission() -> Result<()> { "--data-path", valid_proposal_json_path.to_str().unwrap(), "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2375,7 +2375,7 @@ fn proposal_submission() -> Result<()> { "--data-path", invalid_proposal_json_path.to_str().unwrap(), "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2437,7 +2437,7 @@ fn proposal_submission() -> Result<()> { "--signer", "validator-0", "--gas-limit", - "1", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2463,7 +2463,7 @@ fn proposal_submission() -> Result<()> { "--signer", BERTHA, "--gas-limit", - "1", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2485,7 +2485,7 @@ fn proposal_submission() -> Result<()> { "--signer", ALBERT, "--gas-limit", - "1", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -2603,7 +2603,7 @@ fn proposal_offline() -> Result<()> { "--amount", "900", "--gas-limit", - "1", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -3054,7 +3054,7 @@ fn test_genesis_validators() -> Result<()> { "--amount", "10.1", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; @@ -3226,7 +3226,7 @@ fn double_signing_gets_slashed() -> Result<()> { "--amount", "10.1", "--gas-limit", - "20", + "100", "--ledger-address", &validator_one_rpc, ]; diff --git a/tests/src/e2e/multitoken_tests/helpers.rs b/tests/src/e2e/multitoken_tests/helpers.rs index 6832c02fccb..de0d4390bde 100644 --- a/tests/src/e2e/multitoken_tests/helpers.rs +++ b/tests/src/e2e/multitoken_tests/helpers.rs @@ -49,7 +49,7 @@ pub fn init_multitoken_vp(test: &Test, rpc_addr: &str) -> Result { "--fee-amount", "0", "--gas-limit", - "20", + "100", "--fee-token", NAM, "--ledger-address", @@ -154,7 +154,7 @@ pub fn attempt_red_tokens_transfer( "--amount", &amount, "--gas-limit", - "20", + "100", "--ledger-address", rpc_addr, ]; diff --git a/wasm/gas.json b/wasm/gas.json index d6b28b34564..7ab4018276c 100644 --- a/wasm/gas.json +++ b/wasm/gas.json @@ -1,20 +1,20 @@ { - "tx_bond.wasm": 1, - "tx_change_validator_commission.wasm": 1, - "tx_ibc.wasm": 1, - "tx_init_account.wasm": 1, - "tx_init_proposal.wasm": 1, - "tx_init_validator.wasm": 1, - "tx_reveal_pk.wasm": 1, - "tx_transfer.wasm": 1, - "tx_unbond.wasm": 1, - "tx_update_vp.wasm": 1, - "tx_vote_proposal.wasm": 1, - "tx_withdraw.wasm": 1, - "vp_implicit.wasm": 1, - "vp_masp.wasm": 1, + "tx_bond.wasm": 160, + "tx_change_validator_commission.wasm": 220, + "tx_ibc.wasm": 1240, + "tx_init_account.wasm": 230, + "tx_init_proposal.wasm": 40, + "tx_init_validator.wasm": 730, + "tx_reveal_pk.wasm": 170, + "tx_transfer.wasm": 110, + "tx_unbond.wasm": 430, + "tx_update_vp.wasm": 140, + "tx_vote_proposal.wasm": 120, + "tx_withdraw.wasm": 260, + "vp_implicit.wasm": 40, + "vp_masp.wasm": 8030, "vp_testnet_faucet.wasm": 0, - "vp_token.wasm": 1, - "vp_user.wasm": 1, - "vp_validator.wasm": 1 + "vp_token.wasm": 30, + "vp_user.wasm": 60, + "vp_validator.wasm": 50 } \ No newline at end of file