feat:cargo check features

.github/workflows/ci.yml

@@ -50,13 +50,16 @@ jobs:
           echo 'Signature: 8a477f597d28d172789f06886806bc55' | tee target/CACHEDIR.TAG res/CACHEDIR.TAG > /dev/null
       - name: Run clippy for workspace
         run: make check
-      - name: Run clippy for defuse
-        # Run clippy only on the main contract feature
-        run: cargo clippy --manifest-path ./contracts/defuse/Cargo.toml --features=contract --features=near-sdk/non-contract-usage --no-deps
       - name: Install cargo-machete
         run: curl -fsSL https://github.com/bnjbvr/cargo-machete/releases/download/v0.9.1/cargo-machete-v0.9.1-x86_64-unknown-linux-musl.tar.gz | tar xz --strip-components=1 -C /usr/local/bin
+      - name: Check all examples
+        run: make check-examples
       - name: Check for unused dependencies
         run: make check-unused-deps
+      - name: Install cargo-hack
+        uses: taiki-e/install-action@cargo-hack
+      - name: Check all feature combinations
+        run: make check-all-features
 
   build:
     name: Build

Cargo.toml

@@ -126,8 +126,9 @@ near-sdk = "5.26.1"
 near-workspaces = "0.22"
 
 anyhow = "1"
-
-arbitrary = "1"
+# TODO: `features = ["derive"]` needed because near-sdk uses `derive(Arbitrary)`
+# but doesn't enable the feature itself. Remove once fixed upstream in near-sdk.
+arbitrary = { version = "1", features = ["derive"] }
 array-util = "1"
 bitflags = "2.9.1"
 bnum = { version = "0.13", features = ["borsh"] }

Makefile

@@ -3,6 +3,97 @@ DEFUSE_OUT_DIR ?= $(ROOT_DIR)res
 MAKE_OUT_DIR_PREFIX ?= $(ROOT_DIR)target/makenear
 MAKE_OUT_DIR = $(eval MAKE_OUT_DIR := $(shell mkdir -p $(MAKE_OUT_DIR_PREFIX) $(DEFUSE_OUT_DIR) && mktemp -d -p $(MAKE_OUT_DIR_PREFIX)))$(MAKE_OUT_DIR)
 
+.PHONY: help
+help:
+	@echo "Usage: make [target] [REPRODUCIBLE=1]"
+	@echo ""
+	@echo "Build targets (use REPRODUCIBLE=1 for reproducible builds):"
+	@$(foreach t,$(ALL_TARGETS),echo "  $(t)";)
+	@echo ""
+	@echo "Other targets:"
+	@echo "  all                 Build all contracts (default)"
+	@echo "  clean               Remove build artifacts and cargo clean"
+	@echo "  test                Run all workspace tests"
+	@echo "  check               Run clippy on codebase (codebase + per-contract wasm)"
+	@echo "  check-all           Run all checks"
+	@echo "  fmt                 Format Rust files and Cargo.toml manifests"
+	@echo "  help                Show this help"
+
+.PHONY: clean-out-dir
+clean-out-dir:
+	rm -rf $(DEFUSE_OUT_DIR)
+
+.PHONY: clean
+clean: clean-out-dir
+	cargo clean
+
+.PHONY: test
+test:
+	cargo test --workspace --all-targets
+
+.PHONY: check
+check: check-contracts
+	cargo clippy --workspace --all-targets --no-deps
+
+.PHONY: check-contracts
+
+.PHONY: check-fmt
+check-fmt:
+	cargo fmt --all --check
+	RUST_LOG=warn taplo format --check
+
+.PHONY: check-unused-deps
+check-unused-deps:
+	cargo machete 2>/dev/null
+
+.PHONY: check-examples
+check-examples:
+	RUSTFLAGS='$(RUSTFLAGS_CHECK)' cargo clippy --workspace --examples
+
+.PHONY: check-all
+check-all: check-fmt check-unused-deps check check-examples check-all-features
+
+.PHONY: fmt
+fmt:
+	cargo fmt --all
+	taplo format
+
+RUSTFLAGS_CHECK = -D warnings
+# --cfg clippy: cargo clippy only sets cfg(clippy) for workspace crates, not dependencies.
+# near-sdk compile_error!s on host unless one of its allowed cfgs is set, so we must set it via RUSTFLAGS.
+# --include-features near-sdk/non-contract-usage would be cleaner, but cargo-hack's
+# --ignore-unknown-features is not implemented for --include-features, so it fails
+# on crates that don't depend on near-sdk.
+CARGO_CHECK_HOST = RUSTFLAGS='$(RUSTFLAGS_CHECK) --cfg clippy' cargo hack clippy --exclude-features contract
+CARGO_CHECK_WASM = RUSTFLAGS='$(RUSTFLAGS_CHECK)' cargo hack clippy --target wasm32-unknown-unknown --exclude-features abi --exclude-features near-api-types --exclude-features near-api --no-dev-deps
+
+# Crates where every enum variant is feature-gated, requiring at least one
+# variant feature. These need --feature-powerset + --at-least-one-of instead
+# of --each-feature (which tests features in isolation).
+# Format: crate=feature1,feature2,...
+CRATES_AT_LEAST_ONE_VARIANT := \
+    defuse-token-id=nep141,nep171,nep245,imt \
+    defuse-ton-connect=text,binary,cell \
+    defuse-escrow-swap=nep141,nep245
+
+# Testing crates that cannot compile for wasm32-unknown-unknown.
+# defuse-randomness uses rand/getrandom which lacks wasm32 support;
+# it only reaches the defuse contract via dev-dependencies, never in the WASM binary.
+# defuse-wallet-sdk uses getrandom (via rand) without a wasm backend feature.
+CRATES_HOST_ONLY := \
+    defuse-test-utils \
+    defuse-sandbox \
+    defuse-randomness \
+    defuse-tests \
+    defuse-wallet-relayer \
+    defuse-wallet-sdk
+
+# Crates excluded from check-all-features-host (still covered by `make check`).
+# defuse-wallet-relayer: aws-lc-sys build script breaks with --cfg clippy in RUSTFLAGS.
+CRATES_SKIP_HOST_FEATURES := \
+    defuse-wallet-relayer
+
+
 .DEFAULT_GOAL := all
 CONTRACT_CRATES := \
     defuse \
@@ -16,6 +107,9 @@ CONTRACT_CRATES := \
 
 ALL_TARGETS :=
 
+crate_name = $(firstword $(subst =, ,$1))
+crate_features = $(lastword $(subst =, ,$1))
+
 # Generate all build targets from cargo metadata, filtered to CONTRACT_CRATES
 $(eval $(shell cargo metadata --format-version=1 | jq -rn \
     --arg outdir '$(DEFUSE_OUT_DIR)' --arg reproducible '$(REPRODUCIBLE)' --arg makedir '$$$$(MAKE_OUT_DIR)' \
@@ -36,6 +130,10 @@ $(eval $(shell cargo metadata --format-version=1 | jq -rn \
      ($$vval.container_build_command | join(" ")) as $$non_reproducible_cmd | \
      (if $$reproducible != "" then $$reproducible_cmd else $$non_reproducible_cmd end) as $$cmd | \
      (if $$vkey == "" then "" else ".\($$vkey)" end) as $$suffix | \
+     ($$vval.container_build_command | map(select(startswith("--features="))) | if length > 0 then " " + first else "" end) as $$features_flag | \
+     "$$(eval .PHONY: check-contract/\($$tname))", \
+     "$$(eval check-contracts:: check-contract/\($$tname))", \
+     "$$(eval check-contract/\($$tname):; cargo clippy -p \($$name) --no-deps --target wasm32-unknown-unknown\($$features_flag))", \
      "$$(eval .PHONY: \($$tname))", \
      "$$(eval ALL_TARGETS += \($$tname))", \
      "$$(eval \($$name)/all:: \($$tname))", \
@@ -47,51 +145,25 @@ $(eval $(shell cargo metadata --format-version=1 | jq -rn \
 .PHONY: all
 all: $(ALL_TARGETS)
 
-.PHONY: help
-help:
-	@echo "Usage: make [target] [REPRODUCIBLE=1]"
-	@echo ""
-	@echo "Build targets (use REPRODUCIBLE=1 for reproducible builds):"
-	@$(foreach t,$(ALL_TARGETS),echo "  $(t)";)
-	@echo ""
-	@echo "Other targets:"
-	@echo "  all              Build all contracts (default)"
-	@echo "  clean            Remove build artifacts and cargo clean"
-	@echo "  clean-out-dir    Remove output directory only"
-	@echo "  test             Run all workspace tests"
-	@echo "  clippy           Run clippy lints"
-	@echo "  fmt              Format Rust files and Cargo.toml manifests"
-	@echo "  help             Show this help"
+.PHONY: check-all-features-host
+check-all-features-host::
+	$(CARGO_CHECK_HOST) --workspace --each-feature --exclude-no-default-features \
+	    $(foreach c,$(CRATES_AT_LEAST_ONE_VARIANT),--exclude $(call crate_name,$c)) \
+	    $(addprefix --exclude ,$(CRATES_SKIP_HOST_FEATURES))
 
-.PHONY: clean-out-dir
-clean-out-dir:
-	rm -rf $(DEFUSE_OUT_DIR)
+$(foreach c,$(CRATES_AT_LEAST_ONE_VARIANT),\
+  $(eval check-all-features-host::; \
+    $(CARGO_CHECK_HOST) -p $(call crate_name,$c) --feature-powerset --at-least-one-of $(call crate_features,$c)))
 
-.PHONY: clean
-clean: clean-out-dir
-	cargo clean
+.PHONY: check-all-features-wasm
+check-all-features-wasm::
+	$(CARGO_CHECK_WASM) --workspace --each-feature --exclude-no-default-features \
+	    $(foreach c,$(CRATES_AT_LEAST_ONE_VARIANT),--exclude $(call crate_name,$c)) \
+	    $(addprefix --exclude ,$(CRATES_HOST_ONLY))
 
-.PHONY: test
-test:
-	cargo test --workspace --all-targets
-
-.PHONY: check
-check:
-	cargo clippy --workspace --all-targets --no-deps
-
-.PHONY: check-fmt
-check-fmt:
-	cargo fmt --all --check
-	RUST_LOG=warn taplo format --check
+$(foreach c,$(CRATES_AT_LEAST_ONE_VARIANT),\
+  $(eval check-all-features-wasm::; \
+    $(CARGO_CHECK_WASM) -p $(call crate_name,$c) --feature-powerset --at-least-one-of $(call crate_features,$c)))
 
-.PHONY: check-unused-deps
-check-unused-deps:
-	cargo machete 2>/dev/null
-
-.PHONY: check-all
-check-all: check-fmt check check-unused-deps
-
-.PHONY: fmt
-fmt:
-	cargo fmt --all
-	taplo format
+.PHONY: check-all-features
+check-all-features: check-all-features-host check-all-features-wasm

contracts/defuse/core/src/nonce/salted.rs

@@ -77,8 +77,7 @@ const _: () = {
         fn json_schema(_gen: &mut SchemaGenerator) -> Schema {
             SchemaObject {
                 instance_type: Some(InstanceType::String.into()),
-                extensions: [("contentEncoding", "hex".into())]
-                    .into_iter()
+                extensions: std::iter::once(("contentEncoding", "hex".into()))
                     .map(|(k, v)| (k.to_string(), v))
                     .collect(),
                 ..Default::default()

contracts/defuse/core/src/payload/mod.rs

@@ -50,7 +50,7 @@ impl<T> ExtractDefusePayload<T> for DefusePayload<T> {
 
 #[cfg(feature = "abi")]
 mod examples {
-    use super::*;
+    use super::Nonce;
 
     use near_sdk::base64::{self, Engine};
 

contracts/escrow-swap/src/contract/auth_call.rs

@@ -12,26 +12,26 @@ use super::{Contract, ContractExt};
 #[near]
 impl AuthCallee for Contract {
     fn on_auth(&mut self, signer_id: AccountId, msg: String) -> PromiseOrValue<()> {
-        self.internal_on_auth(&signer_id, msg).unwrap_or_panic()
+        self.internal_on_auth(&signer_id, &msg).unwrap_or_panic()
     }
 }
 
 impl Contract {
     fn internal_on_auth(
         &mut self,
         signer_id: &AccountIdRef,
-        msg: String,
+        msg: &str,
     ) -> Result<PromiseOrValue<()>> {
-        let msg: Message = serde_json::from_str(&msg)?;
+        let msg: Message = serde_json::from_str(msg)?;
 
         let mut guard = self.cleanup_guard();
         let state = guard.try_as_alive_mut()?.verify_mut(&msg.params)?;
 
-        if !msg
+        if msg
             .params
             .auth_caller
             .as_ref()
-            .is_some_and(|a| *a == env::predecessor_account_id())
+            .is_none_or(|a| *a != env::predecessor_account_id())
         {
             return Err(Error::Unauthorized);
         }

contracts/escrow-swap/src/contract/cleanup.rs

@@ -13,14 +13,14 @@ use super::{Contract, ContractExt};
 
 impl Contract {
     #[inline]
-    pub(super) fn cleanup_guard(&mut self) -> CleanupGuard<'_> {
+    pub(super) const fn cleanup_guard(&mut self) -> CleanupGuard<'_> {
         CleanupGuard(&mut self.0)
     }
 }
 
 pub struct CleanupGuard<'a>(&'a mut ContractStorage);
 
-impl<'a> CleanupGuard<'a> {
+impl CleanupGuard<'_> {
     #[inline]
     pub const fn as_alive_mut(&mut self) -> Option<&mut Storage> {
         self.0.0.as_mut()
@@ -56,9 +56,11 @@ impl<'a> CleanupGuard<'a> {
     }
 }
 
-impl<'a> Drop for CleanupGuard<'a> {
+impl Drop for CleanupGuard<'_> {
     fn drop(&mut self) {
-        self.maybe_cleanup().map(Promise::detach);
+        if let Some(p) = self.maybe_cleanup() {
+            p.detach();
+        }
     }
 }
 

contracts/escrow-swap/src/contract/close.rs

@@ -45,6 +45,6 @@ impl State {
             self.close_unchecked(reason);
         }
 
-        self.lost_found(params)
+        Ok(self.lost_found(params))
     }
 }

contracts/escrow-swap/src/contract/fill.rs

@@ -191,13 +191,13 @@ impl ProtocolFees {
     ) -> Result<ProtocolFeesCollected<'static>> {
         Ok(ProtocolFeesCollected {
             fee: self.fee.fee_ceil(taker_dst_used),
-            surplus: if !self.surplus.is_zero() {
+            surplus: if self.surplus.is_zero() {
+                0
+            } else {
                 let maker_want_dst = <u128 as CheckedMul<UD128>>::checked_mul(src_out, maker_price)
                     .ok_or(Error::IntegerOverflow)?;
                 let surplus = taker_dst_used.saturating_sub(maker_want_dst);
                 self.surplus.fee_ceil(surplus)
-            } else {
-                0
             },
             collector: self.collector.into(),
         })

contracts/escrow-swap/src/contract/fund.rs

@@ -11,10 +11,10 @@ impl State {
     pub(super) fn fund(
         &mut self,
         params: Params,
-        sender_id: AccountId,
+        sender_id: &AccountId,
         amount: u128,
     ) -> Result<PromiseOrValue<u128>> {
-        if sender_id != params.maker {
+        if *sender_id != params.maker {
             return Err(Error::Unauthorized);
         }
 

contracts/escrow-swap/src/contract/lost_found.rs

@@ -16,7 +16,7 @@ impl Contract {
         Ok(guard
             .try_as_alive_mut()?
             .verify_mut(&params)?
-            .lost_found(params)?
+            .lost_found(params)
             .map_or_else(
                 || PromiseOrValue::Value(guard.maybe_cleanup().is_some()),
                 PromiseOrValue::Promise,
@@ -25,7 +25,7 @@ impl Contract {
 }
 
 impl State {
-    pub(super) fn lost_found(&mut self, params: Params) -> Result<Option<Promise>> {
+    pub(super) fn lost_found(&mut self, params: Params) -> Option<Promise> {
         let (sent_src, send_src_p) = self
             .closed
             .then(|| mem::take(&mut self.maker_src_remaining))
@@ -59,18 +59,13 @@ impl State {
             })
             .unzip();
 
-        let Some(send) = send_src_p
+        let send = send_src_p
             .into_iter()
             .chain(send_dst_p)
-            .reduce(Promise::and)
-        else {
-            return Ok(None);
-        };
+            .reduce(Promise::and)?;
 
         Event::MakerRefunded(MakerSent::from_sent(sent_src, sent_dst)).emit();
 
-        Ok(send
-            .then(self.callback_resolve_transfers(sent_src, sent_dst))
-            .into())
+        Some(send.then(self.callback_resolve_transfers(sent_src, sent_dst)))
     }
 }