feat: add near-plugins usage and another refactoring (#10)

Author: aleksuss

Cargo.lock

@@ -1,18 +1,34 @@
+[workspace.package]
+version = "0.1.0"
+edition = "2024"
+# NEP-0330 is automatically implemented for all contracts built with https://github.com/near/cargo-near.
+# Link to the repository will be available via `contract_source_metadata` view-function.
+repository = "https://github.com/Near-One/tee-solver"
+
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "contracts/intents-vault",
     "contracts/solver-registry",
     "contracts/mock-intents",
     "contracts/mock-ft",
 ]
 
+[workspace.lints.clippy]
+all = { level = "deny", priority = -1 }
+nursery = { level = "deny", priority = -1 }
+pedantic = { level = "deny", priority = -1 }
+similar_names = "allow"
+needless_pass_by_value = "allow"
+module_inception = "allow"
+
 [profile.release]
 codegen-units = 1
-# Tell `rustc` to optimize for small code size.
+# Tell `rustc` to optimize compiled code to descrease the code size.
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
 # Opt into extra safety checks on arithmetic operations https://stackoverflow.com/a/64136471/249801
 overflow-checks = true
+strip = "symbols"

Cargo.toml

@@ -1,17 +1,15 @@
 [package]
 name = "intents-vault"
 description = "NEAR Intents Vault"
-version = "0.1.0"
-edition = "2021"
-# NEP-0330 is automatically implemented for all contracts built with https://github.com/near/cargo-near.
-# Link to the repository will be available via `contract_source_metadata` view-function.
-repository = "https://github.com/Near-One/tee-solver/tree/main/contracts/intents-vault"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-# fields to configure build with WASM reproducibility, according to specs  
-# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md 
+# fields to configure build with WASM reproducibility, according to specs
+# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
 image = "sourcescan/cargo-near:0.14.1-rust-1.86.0"
@@ -21,7 +19,7 @@ image_digest = "sha256:eaac91be3119cc7c136b6f375f2d3e092001f717ed6151ccc9d5348c2
 # in a reproducible manner
 # supported by `sourcescan/cargo-near:0.10.1-rust-1.82.0` image or later images
 passed_env = []
-# build command inside of docker container 
+# build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
 # supported by respective version of binary inside the container besides `--no-locked` flag
@@ -35,12 +33,7 @@ container_build_command = [
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = "5.14.0"
-serde_json = "1.0.140"
+near-sdk = "5"
 
-[dev-dependencies]
-near-sdk = { version = "5.14.0", features = ["unit-testing"] }
-tokio = "1.44.1"
-anyhow = "1.0.97"
-near-workspaces = { version = "0.20.1", features = ["unstable"]}
-near-gas = "0.3.0"
+[lints]
+workspace = true

contracts/intents-vault/Cargo.toml

@@ -1,5 +1,5 @@
 use near_sdk::{
-    assert_one_yocto, env, ext_contract, near, require, AccountId, NearToken, Promise, PublicKey,
+    AccountId, NearToken, Promise, PublicKey, assert_one_yocto, env, ext_contract, near, require,
 };
 
 #[allow(dead_code)]
@@ -23,7 +23,7 @@ impl Contract {
         public_key: PublicKey,
     ) -> Promise {
         assert_one_yocto();
-        self.require_parent_account();
+        require_parent_account();
 
         ext_intents::ext(intents_contract_id)
             .with_attached_deposit(NearToken::from_yoctonear(1))
@@ -37,21 +37,19 @@ impl Contract {
         public_key: PublicKey,
     ) -> Promise {
         assert_one_yocto();
-        self.require_parent_account();
+        require_parent_account();
 
         ext_intents::ext(intents_contract_id)
             .with_attached_deposit(NearToken::from_yoctonear(1))
             .remove_public_key(public_key)
     }
 }
 
-impl Contract {
-    fn require_parent_account(&self) {
-        let contract_id = env::current_account_id().to_string();
-        let (_, parent_account_id) = contract_id.split_once('.').expect("Invalid contract ID");
-        require!(
-            env::predecessor_account_id() == parent_account_id,
-            "Only parent account can perform this action"
-        );
-    }
+fn require_parent_account() {
+    let contract_id = env::current_account_id().to_string();
+    let (_, parent_account_id) = contract_id.split_once('.').expect("Invalid contract ID");
+    require!(
+        env::predecessor_account_id() == parent_account_id,
+        "Only parent account can perform this action"
+    );
 }

contracts/intents-vault/res/intents_vault.wasm

@@ -1,17 +1,15 @@
 [package]
 name = "mock-ft"
 description = "Mocked Fungible Token Contract for Testing"
-version = "0.1.0"
-edition = "2021"
-# NEP-0330 is automatically implemented for all contracts built with https://github.com/near/cargo-near.
-# Link to the repository will be available via `contract_source_metadata` view-function.
-repository = "https://github.com/Near-One/tee-solver/tree/main/contracts/mock-ft"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-# fields to configure build with WASM reproducibility, according to specs  
-# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md 
+# fields to configure build with WASM reproducibility, according to specs
+# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
 image = "sourcescan/cargo-near:0.14.1-rust-1.86.0"
@@ -21,7 +19,7 @@ image_digest = "sha256:eaac91be3119cc7c136b6f375f2d3e092001f717ed6151ccc9d5348c2
 # in a reproducible manner
 # supported by `sourcescan/cargo-near:0.10.1-rust-1.82.0` image or later images
 passed_env = []
-# build command inside of docker container 
+# build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
 # supported by respective version of binary inside the container besides `--no-locked` flag
@@ -35,13 +33,5 @@ container_build_command = [
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = "5.14.0"
-near-contract-standards = "5.14.0"
-serde_json = "1.0.140"
-
-[dev-dependencies]
-near-sdk = { version = "5.14.0", features = ["unit-testing"] }
-tokio = "1.44.1"
-anyhow = "1.0.97"
-near-workspaces = { version = "0.20.1", features = ["unstable"]}
-near-gas = "0.3.0"
+near-sdk = "5"
+near-contract-standards = "5"

contracts/intents-vault/src/lib.rs

@@ -1,5 +1,5 @@
 use near_contract_standards::fungible_token::metadata::{
-    FungibleTokenMetadata, FungibleTokenMetadataProvider, FT_METADATA_SPEC,
+    FT_METADATA_SPEC, FungibleTokenMetadata, FungibleTokenMetadataProvider,
 };
 use near_contract_standards::fungible_token::{
     FungibleToken, FungibleTokenCore, FungibleTokenResolver,
@@ -10,7 +10,7 @@ use near_contract_standards::storage_management::{
 use near_sdk::borsh::BorshSerialize;
 use near_sdk::collections::LazyOption;
 use near_sdk::json_types::U128;
-use near_sdk::{log, near, AccountId, BorshStorageKey, NearToken, PanicOnDefault, PromiseOrValue};
+use near_sdk::{AccountId, BorshStorageKey, NearToken, PanicOnDefault, PromiseOrValue, log, near};
 
 #[derive(PanicOnDefault)]
 #[near(contract_state)]
@@ -33,11 +33,13 @@ impl Contract {
     /// Initializes the contract with the given total supply owned by the given `owner_id` with
     /// default metadata (for example purposes only).
     #[init]
-    pub fn new_default_meta(owner_id: AccountId, total_supply: U128) -> Self {
+    #[must_use]
+    #[allow(clippy::use_self)]
+    pub fn new_default_meta(owner_id: &AccountId, total_supply: U128) -> Self {
         Self::new(
             owner_id,
             total_supply,
-            FungibleTokenMetadata {
+            &FungibleTokenMetadata {
                 spec: FT_METADATA_SPEC.to_string(),
                 name: "Mocked Fungible Token".to_string(),
                 symbol: "MOCKED".to_string(),
@@ -52,17 +54,19 @@ impl Contract {
     /// Initializes the contract with the given total supply owned by the given `owner_id` with
     /// the given fungible token metadata.
     #[init]
-    pub fn new(owner_id: AccountId, total_supply: U128, metadata: FungibleTokenMetadata) -> Self {
+    #[must_use]
+    #[allow(clippy::use_self)]
+    pub fn new(owner_id: &AccountId, total_supply: U128, metadata: &FungibleTokenMetadata) -> Self {
         metadata.assert_valid();
         let mut this = Self {
             token: FungibleToken::new(StorageKey::FungibleToken),
-            metadata: LazyOption::new(StorageKey::Metadata, Some(&metadata)),
+            metadata: LazyOption::new(StorageKey::Metadata, Some(metadata)),
         };
-        this.token.internal_register_account(&owner_id);
-        this.token.internal_deposit(&owner_id, total_supply.into());
+        this.token.internal_register_account(owner_id);
+        this.token.internal_deposit(owner_id, total_supply.into());
 
         near_contract_standards::fungible_token::events::FtMint {
-            owner_id: &owner_id,
+            owner_id,
             amount: total_supply,
             memo: Some("new tokens are minted"),
         }
@@ -76,7 +80,7 @@ impl Contract {
 impl FungibleTokenCore for Contract {
     #[payable]
     fn ft_transfer(&mut self, receiver_id: AccountId, amount: U128, memo: Option<String>) {
-        self.token.ft_transfer(receiver_id, amount, memo)
+        self.token.ft_transfer(receiver_id, amount, memo);
     }
 
     #[payable]

contracts/mock-ft/Cargo.toml

@@ -1,17 +1,15 @@
 [package]
 name = "mock-intents"
 description = "Mocked Intents Contract for Testing"
-version = "0.1.0"
-edition = "2021"
-# NEP-0330 is automatically implemented for all contracts built with https://github.com/near/cargo-near.
-# Link to the repository will be available via `contract_source_metadata` view-function.
-repository = "https://github.com/Near-One/tee-solver/tree/main/contracts/mock-intents"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-# fields to configure build with WASM reproducibility, according to specs  
-# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md 
+# fields to configure build with WASM reproducibility, according to specs
+# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
 image = "sourcescan/cargo-near:0.14.1-rust-1.86.0"
@@ -21,7 +19,7 @@ image_digest = "sha256:eaac91be3119cc7c136b6f375f2d3e092001f717ed6151ccc9d5348c2
 # in a reproducible manner
 # supported by `sourcescan/cargo-near:0.10.1-rust-1.82.0` image or later images
 passed_env = []
-# build command inside of docker container 
+# build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
 # supported by respective version of binary inside the container besides `--no-locked` flag
@@ -35,12 +33,7 @@ container_build_command = [
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = "5.14.0"
-serde_json = "1.0.140"
+near-sdk = "5"
 
-[dev-dependencies]
-near-sdk = { version = "5.14.0", features = ["unit-testing"] }
-tokio = "1.44.1"
-anyhow = "1.0.97"
-near-workspaces = { version = "0.20.1", features = ["unstable"]}
-near-gas = "0.3.0"
+[lints]
+workspace = true