Make the the backing integer type for amounts 256 bit

Makefile

@@ -13,17 +13,23 @@ wasms_for_tests := wasm_for_tests/wasm_source
 # Paths for all the wasm templates
 wasm_templates := wasm/tx_template wasm/vp_template
 
+ifdef JOBS
+jobs := -j $(JOBS)
+else
+jobs :=
+endif
+
 # TODO upgrade libp2p
 audit-ignores += RUSTSEC-2021-0076
 
 build:
-	$(cargo) build
+	$(cargo) $(jobs) build
 
 build-test:
-	$(cargo) +$(nightly) build --tests -Z unstable-options
+	$(cargo) +$(nightly) build --tests $(jobs) -Z unstable-options
 
 build-release:
-	NAMADA_DEV=false $(cargo) build --release --package namada_apps --manifest-path Cargo.toml
+	NAMADA_DEV=false $(cargo) build $(jobs) --release --package namada_apps --manifest-path Cargo.toml
 
 install-release:
 	NAMADA_DEV=false $(cargo) install --path ./apps --locked
@@ -56,7 +62,7 @@ check-mainnet:
 clippy-wasm = $(cargo) +$(nightly) clippy --manifest-path $(wasm)/Cargo.toml --all-targets -- -D warnings
 
 clippy:
-	NAMADA_DEV=false $(cargo) +$(nightly) clippy --all-targets -- -D warnings && \
+	NAMADA_DEV=false $(cargo) +$(nightly) clippy $(jobs) --all-targets -- -D warnings && \
 	make -C $(wasms) clippy && \
 	make -C $(wasms_for_tests) clippy && \
 	$(foreach wasm,$(wasm_templates),$(clippy-wasm) && ) true
@@ -126,38 +132,35 @@ test-e2e:
 		-Z unstable-options --report-time
 
 test-unit-abcipp:
-	$(cargo) test \
+	$(cargo) +$(nightly) test \
 		--manifest-path ./apps/Cargo.toml \
+		$(jobs) \
 		--no-default-features \
 		--features "testing std abcipp" \
 		-Z unstable-options \
 		$(TEST_FILTER) -- \
 		-Z unstable-options --report-time && \
-	$(cargo) test \
+	$(cargo) +$(nightly) test \
 		--manifest-path \
 		./proof_of_stake/Cargo.toml \
+		$(jobs) \
 		--features "testing" \
 		-Z unstable-options \
 		$(TEST_FILTER) -- \
 		-Z unstable-options --report-time && \
-	$(cargo) test \
+	$(cargo) +$(nightly) test \
 		--manifest-path ./shared/Cargo.toml \
+		$(jobs) \
 		--no-default-features \
-		--features "testing wasm-runtime abcipp ibc-mocks-abcipp" \
-		-Z unstable-options \
-		$(TEST_FILTER) -- \
-		-Z unstable-options --report-time && \
-	$(cargo) test \
-		--manifest-path ./vm_env/Cargo.toml \
-		--no-default-features \
-		--features "abcipp" \
+		--features "testing wasm-runtime abcipp ibc-mocks-abcipp ferveo-tpke" \
 		-Z unstable-options \
 		$(TEST_FILTER) -- \
 		-Z unstable-options --report-time
 
 test-unit:
 	$(cargo) +$(nightly) test \
 		$(TEST_FILTER) \
+		$(jobs) \
 		-Z unstable-options \
 		-- --skip e2e \
 		-Z unstable-options --report-time
@@ -166,12 +169,14 @@ test-unit-mainnet:
 	$(cargo) +$(nightly) test \
 		--features "mainnet" \
 		$(TEST_FILTER) \
+		$(jobs)
 		-Z unstable-options \
 		-- --skip e2e \
 		-Z unstable-options --report-time
 
 test-unit-debug:
 	$(debug-cargo) +$(nightly) test \
+		$(jobs)
 		$(TEST_FILTER) -- \
 		-Z unstable-options \
 		-- --skip e2e \

apps/src/lib/cli.rs

@@ -1627,6 +1627,7 @@ pub mod args {
     use namada::types::storage::{self, BlockHeight, Epoch};
     use namada::types::time::DateTimeUtc;
     use namada::types::token;
+    use namada::types::token::NATIVE_MAX_DECIMAL_PLACES;
     use namada::types::transaction::GasLimit;
     use rust_decimal::Decimal;
 
@@ -1642,7 +1643,7 @@ pub mod args {
     const ALIAS_OPT: ArgOpt<String> = ALIAS.opt();
     const ALIAS: Arg<String> = arg("alias");
     const ALLOW_DUPLICATE_IP: ArgFlag = flag("allow-duplicate-ip");
-    const AMOUNT: Arg<token::Amount> = arg("amount");
+    const AMOUNT: Arg<token::DenominatedAmount> = arg("amount");
     const ARCHIVE_DIR: ArgOpt<PathBuf> = arg_opt("archive-dir");
     const BALANCE_OWNER: ArgOpt<WalletBalanceOwner> = arg_opt("owner");
     const BASE_DIR: ArgDefault<PathBuf> = arg_default(
@@ -1676,10 +1677,20 @@ 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_AMOUNT: ArgDefault<token::DenominatedAmount> = arg_default(
+        "gas-amount",
+        DefaultFn(|| token::DenominatedAmount {
+            amount: token::Amount::default(),
+            denom: NATIVE_MAX_DECIMAL_PLACES.into(),
+        }),
+    );
+    const GAS_LIMIT: ArgDefault<token::DenominatedAmount> = arg_default(
+        "gas-limit",
+        DefaultFn(|| token::DenominatedAmount {
+            amount: token::Amount::default(),
+            denom: NATIVE_MAX_DECIMAL_PLACES.into(),
+        }),
+    );
     const GAS_TOKEN: ArgDefaultFromCtx<WalletAddress> =
         arg_default_from_ctx("gas-token", DefaultFn(|| "NAM".into()));
     const GENESIS_PATH: Arg<PathBuf> = arg("genesis-path");
@@ -1996,7 +2007,19 @@ pub mod args {
         /// Transferred token address
         pub sub_prefix: Option<String>,
         /// Transferred token amount
-        pub amount: token::Amount,
+        pub amount: InputAmount,
+    }
+
+    /// An amount read in by the cli
+    #[derive(Copy, Clone, Debug)]
+    pub enum InputAmount {
+        /// An amount whose representation has been validated
+        /// against the allowed representation in storage
+        Validated(token::DenominatedAmount),
+        /// The parsed amount read in from the cli. It has
+        /// not yet been validated against the allowed
+        /// representation in storage.
+        Unvalidated(token::DenominatedAmount),
     }
 
     impl Args for TxTransfer {
@@ -2006,7 +2029,7 @@ pub mod args {
             let target = TRANSFER_TARGET.parse(matches);
             let token = TOKEN.parse(matches);
             let sub_prefix = SUB_PREFIX.parse(matches);
-            let amount = AMOUNT.parse(matches);
+            let amount = InputAmount::Unvalidated(AMOUNT.parse(matches));
             Self {
                 tx,
                 source,
@@ -2076,7 +2099,7 @@ pub mod args {
                 receiver,
                 token,
                 sub_prefix,
-                amount,
+                amount: amount.amount,
                 port_id,
                 channel_id,
                 timeout_height,
@@ -2293,6 +2316,14 @@ pub mod args {
             let tx = Tx::parse(matches);
             let validator = VALIDATOR.parse(matches);
             let amount = AMOUNT.parse(matches);
+            let amount = amount
+                .canonical()
+                .increase_precision(NATIVE_MAX_DECIMAL_PLACES.into())
+                .unwrap_or_else(|e| {
+                    println!("Could not parse bond amount: {:?}", e);
+                    safe_exit(1);
+                })
+                .amount;
             let source = SOURCE_OPT.parse(matches);
             Self {
                 tx,
@@ -2332,6 +2363,14 @@ pub mod args {
             let tx = Tx::parse(matches);
             let validator = VALIDATOR.parse(matches);
             let amount = AMOUNT.parse(matches);
+            let amount = amount
+                .canonical()
+                .increase_precision(NATIVE_MAX_DECIMAL_PLACES.into())
+                .unwrap_or_else(|e| {
+                    println!("Could not parse bond amount: {:?}", e);
+                    safe_exit(1);
+                })
+                .amount;
             let source = SOURCE_OPT.parse(matches);
             Self {
                 tx,
@@ -2739,17 +2778,21 @@ pub mod args {
         pub owner: Option<WalletBalanceOwner>,
         /// Address of a token
         pub token: Option<WalletAddress>,
+        /// sub-prefix if querying a multi-token
+        pub sub_prefix: Option<String>,
     }
 
     impl Args for QueryTransfers {
         fn parse(matches: &ArgMatches) -> Self {
             let query = Query::parse(matches);
             let owner = BALANCE_OWNER.parse(matches);
             let token = TOKEN_OPT.parse(matches);
+            let sub_prefix = SUB_PREFIX.parse(matches);
             Self {
                 query,
                 owner,
                 token,
+                sub_prefix,
             }
         }
 
@@ -2761,6 +2804,11 @@ pub mod args {
                 .arg(TOKEN_OPT.def().about(
                     "The token address that queried transfers must involve.",
                 ))
+                .arg(
+                    SUB_PREFIX.def().about(
+                        "The token's sub prefix whose balance to query.",
+                    ),
+                )
         }
     }
 
@@ -2996,7 +3044,7 @@ pub mod args {
         /// save it in the wallet.
         pub initialized_account_alias: Option<String>,
         /// The amount being payed to include the transaction
-        pub fee_amount: token::Amount,
+        pub fee_amount: InputAmount,
         /// The token in which the fee is being paid
         pub fee_token: WalletAddress,
         /// The max amount of gas used to process tx
@@ -3080,9 +3128,10 @@ 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_amount =
+                InputAmount::Unvalidated(GAS_AMOUNT.parse(matches));
             let fee_token = GAS_TOKEN.parse(matches);
-            let gas_limit = GAS_LIMIT.parse(matches).into();
+            let gas_limit = GAS_LIMIT.parse(matches).amount.into();
             let expiration = EXPIRATION_OPT.parse(matches);
 
             let signing_key = SIGNING_KEY_OPT.parse(matches);