[BLOCKED] simplify features gates

.github/workflows/ci.yml

@@ -71,7 +71,9 @@ jobs:
           save-if: ${{ github.ref == 'refs/heads/main' }}
           cache-all-crates: "true" # Yes, it's a string
       - name: Install Cargo Plugins
-        run: cargo install cargo-make cargo-near --locked
+        run: |
+          cargo install cargo-make --locked
+          cargo install cargo-near --git https://github.com/near/cargo-near --rev daa04940cbf834ef3ccf55b595e140475e41a314
       - name: Build
         run: cargo make build
       - name: Upload Artifacts
@@ -104,7 +106,9 @@ jobs:
           save-if: ${{ github.ref == 'refs/heads/main' }}
           cache-all-crates: "true" # Yes, it's a string
       - name: Install Cargo Plugins
-        run: cargo install cargo-make cargo-near --locked
+        run: |
+          cargo install cargo-make --locked
+          cargo install cargo-near --git https://github.com/near/cargo-near --rev daa04940cbf834ef3ccf55b595e140475e41a314
       - name: Build Reproducible WASM and calculate checksum
         run: cargo make build-reproducible
       - name: Upload Reproducible Artifacts

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
         run: cargo install --debug cargo-make@0.37.24 --locked
 
       - name: Install cargo-near
-        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/download/cargo-near-v0.17.0/cargo-near-installer.sh | sh
+        run: cargo install cargo-near --git https://github.com/near/cargo-near --rev daa04940cbf834ef3ccf55b595e140475e41a314
 
       - name: Build Reproducible WASM
         run: cargo make build-defuse-reproducible

Makefile.toml

@@ -39,8 +39,8 @@ args = [
     "--locked",
     "--manifest-path",
     "./defuse/Cargo.toml",
-    "--features",
-    "abi,contract",
+    "--features=contract",
+    "--abi-features=abi,contract",
     "--out-dir",
     "${TARGET_DIR}",
     "--no-embed-abi",
@@ -56,8 +56,8 @@ args = [
     "--locked",
     "--manifest-path",
     "./escrow-swap/Cargo.toml",
-    "--features",
-    "abi,contract",
+    "--features=contract",
+    "--abi-features=abi,contract",
     "--out-dir",
     "${TARGET_DIR}",
     "--no-embed-abi",
@@ -73,8 +73,7 @@ args = [
     "--locked",
     "--manifest-path",
     "./poa-factory/Cargo.toml",
-    "--features",
-    "contract",
+    "--features=contract",
     "--out-dir",
     "${TARGET_DIR}",
     "--no-embed-abi",
@@ -90,8 +89,7 @@ args = [
     "--locked",
     "--manifest-path",
     "./poa-token/Cargo.toml",
-    "--features",
-    "contract",
+    "--features=contract",
     "--out-dir",
     "${TARGET_DIR}",
     "--no-embed-abi",
@@ -107,8 +105,7 @@ args = [
     "--locked",
     "--manifest-path",
     "./poa-token/Cargo.toml",
-    "--features",
-    "contract,no-registration",
+    "--features=contract,no-registration",
     "--out-dir",
     "${POA_TOKEN_WITH_NO_REGISTRATION_DIR}",
     "--no-embed-abi",
@@ -251,8 +248,7 @@ args = [
     "--locked",
     "--manifest-path",
     "./tests/contracts/multi-token-receiver-stub/Cargo.toml",
-    "--features",
-    "abi",
+    "--abi-features=abi",
     "--out-dir",
     "${MT_RECEIVER_STUB_DIR}",
     "--no-embed-abi",

core/src/amounts.rs

@@ -227,7 +227,7 @@ where
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::schemars::{r#gen::SchemaGenerator, schema::Schema};
     use serde_with::schemars_0_8::JsonSchemaAs;

core/src/nonce/salted.rs

@@ -57,7 +57,7 @@ impl FromStr for Salt {
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::schemars::{
         JsonSchema,

core/src/payload/mod.rs

@@ -51,7 +51,7 @@ impl<T> ExtractDefusePayload<T> for DefusePayload<T> {
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 mod examples {
     use super::*;
 

crypto/src/public_key.rs

@@ -127,7 +127,7 @@ impl FromStr for PublicKey {
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::{
         schemars::{

crypto/src/serde/curve.rs

@@ -26,7 +26,7 @@ impl<'de, C: TypedCurve, const N: usize> DeserializeAs<'de, [u8; N]> for AsCurve
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::schemars::{
         JsonSchema,

crypto/src/signature.rs

@@ -83,7 +83,7 @@ impl FromStr for Signature {
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::{
         schemars::{

defuse/Cargo.toml

@@ -51,7 +51,8 @@ container_build_command = [
     "build",
     "non-reproducible-wasm",
     "--locked",
-    "--features=abi,contract",
+    "--features=contract",
+    "--abi-features=abi,contract",
     "--no-embed-abi",
 ]
 

defuse/src/contract/mod.rs

@@ -1,4 +1,4 @@
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 mod abi;
 mod accounts;
 mod admin;

escrow-swap/src/event.rs

@@ -133,5 +133,5 @@ pub trait EscrowIntentEmit<'a>: Into<Event<'a>> {
 impl<'a, T> EscrowIntentEmit<'a> for T where T: Into<Event<'a>> {}
 
 // fix JsonSchema macro bug
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 use near_sdk::serde;

escrow-swap/src/state.rs

@@ -279,5 +279,5 @@ pub struct State {
 }
 
 // fix JsonSchema macro bug
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 use near_sdk::serde;

serde-utils/src/base58.rs

@@ -39,7 +39,7 @@ where
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::schemars::{
         JsonSchema,

serde-utils/src/base64.rs

@@ -79,7 +79,7 @@ impl<T> AsBase64<T> {
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::schemars::{
         JsonSchema,

serde-utils/src/tlb.rs

@@ -60,7 +60,7 @@ where
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::schemars::{SchemaGenerator, schema::Schema};
     use serde_with::schemars_0_8::JsonSchemaAs;

token-id/src/lib.rs

@@ -114,7 +114,7 @@ impl FromStr for TokenId {
     }
 }
 
-#[cfg(all(feature = "abi", not(target_arch = "wasm32")))]
+#[cfg(feature = "abi")]
 const _: () = {
     use near_sdk::schemars::{
         JsonSchema,