Whitelist gas accounting

.changelog/unreleased/1242-whitelist-gas-accounting.md

@@ -0,0 +1,3 @@
+- Implemented a first gas metering system based on the
+  runtime cost of whitelisted transactions and VPs.
+  ([#1242](https://github.com/anoma/namada/pull/1242))

Cargo.toml

@@ -3,6 +3,7 @@ resolver = "2"
 
 members = [
   "apps",
+  "benches",
   "core",
   "proof_of_stake",
   "shared",

Makefile

@@ -17,7 +17,7 @@ wasm_templates := wasm/tx_template wasm/vp_template
 audit-ignores += RUSTSEC-2021-0076
 
 build:
-	$(cargo) build
+	$(cargo) build --workspace --exclude namada_benchmarks
 
 build-test:
 	$(cargo) +$(nightly) build --tests -Z unstable-options
@@ -36,7 +36,8 @@ package: build-release
 
 check-wasm = $(cargo) check --target wasm32-unknown-unknown --manifest-path $(wasm)/Cargo.toml
 check:
-	$(cargo) check && \
+	$(cargo) check --workspace --exclude namada_benchmarks && \
+	$(cargo) +$(nightly) check --benches -Z unstable-options && \
 	make -C $(wasms) check && \
 	make -C $(wasms_for_tests) check && \
 	$(foreach wasm,$(wasm_templates),$(check-wasm) && ) true
@@ -45,6 +46,7 @@ check-abcipp:
 	$(cargo) +$(nightly) check \
 		--workspace \
 		--exclude namada_tests \
+		--exclude namada_benchmarks \
 		--all-targets \
 		--no-default-features \
 		--features "abcipp ibc-mocks-abcipp testing" \
@@ -213,6 +215,9 @@ watch:
 clean:
 	$(cargo) clean
 
+bench:
+	$(cargo) +$(nightly) bench -Z unstable-options
+
 build-doc:
 	$(cargo) doc --no-deps
 
@@ -266,4 +271,4 @@ test-miri:
 	MIRIFLAGS="-Zmiri-disable-isolation" $(cargo) +$(nightly) miri test
 
 
-.PHONY : build check build-release clippy install run-ledger run-gossip reset-ledger test test-debug fmt watch clean build-doc doc build-wasm-scripts-docker debug-wasm-scripts-docker build-wasm-scripts debug-wasm-scripts clean-wasm-scripts dev-deps test-miri test-unit test-unit-abcipp clippy-abcipp
+.PHONY : build check build-release clippy install run-ledger run-gossip reset-ledger test test-debug fmt watch clean build-doc doc build-wasm-scripts-docker debug-wasm-scripts-docker build-wasm-scripts debug-wasm-scripts clean-wasm-scripts dev-deps test-miri test-unit test-unit-abcipp clippy-abcipp bench

apps/src/lib/cli.rs

@@ -1702,12 +1702,12 @@ pub mod args {
     const EXPIRATION_OPT: ArgOpt<DateTimeUtc> = arg_opt("expiration");
     const FORCE: ArgFlag = flag("force");
     const DONT_PREFETCH_WASM: ArgFlag = flag("dont-prefetch-wasm");
-    const GAS_AMOUNT: ArgDefault<token::Amount> =
-        arg_default("gas-amount", DefaultFn(|| token::Amount::from(0)));
-    const GAS_LIMIT: ArgDefault<token::Amount> =
-        arg_default("gas-limit", DefaultFn(|| token::Amount::from(0)));
-    const GAS_TOKEN: ArgDefaultFromCtx<WalletAddress> =
-        arg_default_from_ctx("gas-token", DefaultFn(|| "NAM".into()));
+    const FEE_AMOUNT: ArgDefault<token::Amount> =
+        arg_default("fee-amount", DefaultFn(|| token::Amount::from(0)));
+    const GAS_LIMIT: ArgDefault<GasLimit> =
+        arg_default("gas-limit", DefaultFn(|| GasLimit::from(10)));
+    const FEE_TOKEN: ArgDefaultFromCtx<WalletAddress> =
+        arg_default_from_ctx("fee-token", DefaultFn(|| "NAM".into()));
     const GENESIS_PATH: Arg<PathBuf> = arg("genesis-path");
     const GENESIS_VALIDATOR: ArgOpt<String> = arg("genesis-validator").opt();
     const HALT_ACTION: ArgFlag = flag("halt");
@@ -3024,7 +3024,7 @@ pub mod args {
         /// If any new account is initialized by the tx, use the given alias to
         /// save it in the wallet.
         pub initialized_account_alias: Option<String>,
-        /// The amount being payed to include the transaction
+        /// The amount being payed (for gas unit) to include the transaction
         pub fee_amount: token::Amount,
         /// The token in which the fee is being paid
         pub fee_token: WalletAddress,
@@ -3066,15 +3066,15 @@ pub mod args {
                  initialized, the alias will be the prefix of each new \
                  address joined with a number.",
             ))
-            .arg(GAS_AMOUNT.def().about(
-                "The amount being paid for the inclusion of this transaction",
+            .arg(FEE_AMOUNT.def().about(
+                "The amount being paid, per gas unit, for the inclusion of \
+                 this transaction",
+            ))
+            .arg(FEE_TOKEN.def().about("The token for paying the gas"))
+            .arg(GAS_LIMIT.def().about(
+                "The multiplier of the gas limit resolution defining the \
+                 maximum amount of gas needed to run transaction",
             ))
-            .arg(GAS_TOKEN.def().about("The token for paying the gas"))
-            .arg(
-                GAS_LIMIT.def().about(
-                    "The maximum amount of gas needed to run transaction",
-                ),
-            )
             .arg(EXPIRATION_OPT.def().about(
                 "The expiration datetime of the transaction, after which the \
                  tx won't be accepted anymore. All of these examples are \
@@ -3109,9 +3109,9 @@ pub mod args {
             let broadcast_only = BROADCAST_ONLY.parse(matches);
             let ledger_address = LEDGER_ADDRESS_DEFAULT.parse(matches);
             let initialized_account_alias = ALIAS_OPT.parse(matches);
-            let fee_amount = GAS_AMOUNT.parse(matches);
-            let fee_token = GAS_TOKEN.parse(matches);
-            let gas_limit = GAS_LIMIT.parse(matches).into();
+            let fee_amount = FEE_AMOUNT.parse(matches);
+            let fee_token = FEE_TOKEN.parse(matches);
+            let gas_limit = GAS_LIMIT.parse(matches);
             let expiration = EXPIRATION_OPT.parse(matches);
 
             let signing_key = SIGNING_KEY_OPT.parse(matches);