refactor: disbale add/remove liquidity

Author: think-in-universe

contracts/solver-registry/src/admin.rs

@@ -7,6 +7,11 @@ impl Contract {
         self.assert_owner();
         self.approved_codehashes.insert(codehash);
     }
+
+    pub fn change_owner(&mut self, new_owner_id: AccountId) {
+        self.assert_owner();
+        self.owner_id = new_owner_id;
+    }
 }
 
 impl Contract {

contracts/solver-registry/src/collateral.rs

@@ -54,10 +54,7 @@ pub fn verify_codehash(raw_tcb_info: String, rtmr3: String) -> String {
         "Invalid compose hash"
     );
     // event with compose hash matches report rtmr3
-    require!(
-        replayed_rtmr3 == rtmr3,
-        format!("Invalid rtmr3: {} v.s. {}", replayed_rtmr3, rtmr3)
-    );
+    require!(replayed_rtmr3 == rtmr3, "Invalid rtmr3");
 
     let (_, right) = app_compose.split_once("\\n    image:").unwrap();
     let (left, _) = right.split_once("\\n").unwrap();

contracts/solver-registry/src/events.rs

@@ -1,4 +1,3 @@
-use near_sdk::json_types::U128;
 use near_sdk::serde::Serialize;
 use near_sdk::serde_json::json;
 use near_sdk::{log, AccountId, PublicKey};
@@ -17,24 +16,26 @@ pub const EVENT_STANDARD_VERSION: &str = "1.0.0";
 pub enum Event<'a> {
     WorkerRegistered {
         worker_id: &'a AccountId,
-        public_key: &'a PublicKey,
         pool_id: &'a u32,
+        public_key: &'a PublicKey,
+        codehash: &'a String,
+        checksum: &'a String,
     },
     CreateLiquidityPool {
         pool_id: &'a u32,
         token_ids: &'a Vec<AccountId>,
         fee: &'a u32,
     },
-    AddLiquidity {
-        pool_id: &'a u32,
-        account_id: &'a AccountId,
-        amounts: &'a Vec<U128>,
-    },
-    RemoveLiquidity {
-        pool_id: &'a u32,
-        account_id: &'a AccountId,
-        amounts: &'a Vec<U128>,
-    },
+    // AddLiquidity {
+    //     pool_id: &'a u32,
+    //     account_id: &'a AccountId,
+    //     amounts: &'a Vec<U128>,
+    // },
+    // RemoveLiquidity {
+    //     pool_id: &'a u32,
+    //     account_id: &'a AccountId,
+    //     amounts: &'a Vec<U128>,
+    // },
 }
 
 impl Event<'_> {

contracts/solver-registry/src/lib.rs

@@ -5,9 +5,10 @@ use near_sdk::{
     env::{self, block_timestamp},
     ext_contract, log, near, require,
     store::{IterableMap, IterableSet, Vector},
-    AccountId, NearToken, PanicOnDefault, Promise, PublicKey,
+    AccountId, Gas, NearToken, PanicOnDefault, Promise, PromiseError, PublicKey,
 };
 
+use crate::events::*;
 use crate::pool::*;
 use crate::types::*;
 
@@ -20,6 +21,8 @@ mod types;
 mod upgrade;
 mod view;
 
+const GAS_REGISTER_WORKER_CALLBACK: Gas = Gas::from_tgas(10);
+
 #[near(serializers = [json, borsh])]
 #[derive(Clone)]
 pub struct Worker {
@@ -84,26 +87,48 @@ impl Contract {
 
         // TODO: verify predecessor implicit account is derived from this public key
         let public_key = env::signer_account_pk();
-
-        let predecessor = env::predecessor_account_id();
-        self.worker_by_account_id.insert(
-            predecessor,
-            Worker {
-                pool_id,
-                checksum,
-                codehash,
-            },
-        );
+        let worker_id = env::predecessor_account_id();
 
         // add the public key to the intents vault
         ext_intents_vault::ext(self.get_pool_account_id(pool_id))
             .with_attached_deposit(NearToken::from_yoctonear(1))
-            .add_public_key(self.intents_contract_id.clone(), public_key)
+            .add_public_key(self.intents_contract_id.clone(), public_key.clone())
+            .then(
+                Self::ext(env::current_account_id())
+                    .with_static_gas(GAS_REGISTER_WORKER_CALLBACK)
+                    .on_worker_key_added(worker_id, pool_id, public_key, codehash, checksum),
+            )
     }
 
-    pub fn require_approved_codehash(&self) {
-        let worker = self.get_worker(env::predecessor_account_id());
-        self.assert_approved_codehash(&worker.codehash);
+    #[private]
+    pub fn on_worker_key_added(
+        &mut self,
+        worker_id: AccountId,
+        pool_id: u32,
+        public_key: PublicKey,
+        codehash: String,
+        checksum: String,
+        #[callback_result] call_result: Result<(), PromiseError>,
+    ) {
+        if call_result.is_ok() {
+            self.worker_by_account_id.insert(
+                worker_id.clone(),
+                Worker {
+                    pool_id,
+                    checksum: checksum.clone(),
+                    codehash: codehash.clone(),
+                },
+            );
+
+            Event::WorkerRegistered {
+                worker_id: &worker_id,
+                pool_id: &pool_id,
+                public_key: &public_key,
+                codehash: &codehash,
+                checksum: &checksum,
+            }
+            .emit();
+        }
     }
 }
 
@@ -114,4 +139,9 @@ impl Contract {
             "Invalid code hash"
         );
     }
+
+    // fn require_approved_codehash(&self) {
+    //     let worker = self.get_worker(env::predecessor_account_id());
+    //     self.assert_approved_codehash(&worker.codehash);
+    // }
 }

contracts/solver-registry/src/pool.rs

@@ -1,4 +1,4 @@
-use near_sdk::json_types::U128;
+// use near_sdk::json_types::U128;
 use near_sdk::store::LookupMap;
 use near_sdk::{near, require, AccountId, Gas, NearToken, PromiseError, PromiseOrValue};
 
@@ -96,30 +96,31 @@ impl Contract {
         }
     }
 
-    #[payable]
-    pub fn add_liquidity(
-        &mut self,
-        pool_id: u32,
-        token_ids: Vec<AccountId>,
-        amounts: Vec<Balance>,
-    ) {
-        require!(token_ids.len() == 2, "Must have exactly 2 tokens");
-        require!(amounts.len() == 2, "Must have exactly 2 amounts");
-        require!(amounts[0] > 0, "Amount must be greater than 0");
-        require!(amounts[1] > 0, "Amount must be greater than 0");
-
-        let pool = self.pools.get(pool_id).expect("Pool not found");
-        let shares_total_supply = pool.shares_total_supply;
-    }
-
-    #[payable]
-    pub fn remove_liquidity(&mut self, pool_id: u32, shares: U128) {
-        let shares = shares.0;
-        require!(shares > 0, "Shares must be greater than 0");
-
-        let pool = self.pools.get(pool_id).expect("Pool not found");
-        // pool.shares_total_supply -= shares;
-    }
+    // `add_liquidity` and `remove_liquidity` are not needed for now
+    // #[payable]
+    // pub fn add_liquidity(
+    //     &mut self,
+    //     pool_id: u32,
+    //     token_ids: Vec<AccountId>,
+    //     amounts: Vec<Balance>,
+    // ) {
+    //     require!(token_ids.len() == 2, "Must have exactly 2 tokens");
+    //     require!(amounts.len() == 2, "Must have exactly 2 amounts");
+    //     require!(amounts[0] > 0, "Amount must be greater than 0");
+    //     require!(amounts[1] > 0, "Amount must be greater than 0");
+
+    //     let pool = self.pools.get(pool_id).expect("Pool not found");
+    //     let shares_total_supply = pool.shares_total_supply;
+    // }
+
+    // #[payable]
+    // pub fn remove_liquidity(&mut self, pool_id: u32, shares: U128) {
+    //     let shares = shares.0;
+    //     require!(shares > 0, "Shares must be greater than 0");
+
+    //     let pool = self.pools.get(pool_id).expect("Pool not found");
+    //     // pool.shares_total_supply -= shares;
+    // }
 }
 
 impl Contract {

contracts/solver-registry/src/token_receiver.rs

@@ -1,12 +1,12 @@
-use near_sdk::json_types::U128;
-use near_sdk::{near, AccountId};
+// use near_sdk::json_types::U128;
+// use near_sdk::{near, AccountId};
 
-use crate::*;
+// use crate::*;
 
-#[near]
-impl Contract {
-    #[payable]
-    pub fn ft_on_transfer(&mut self, token_id: AccountId, amount: U128) {
-        // TODO
-    }
-}
+// #[near]
+// impl Contract {
+//     #[payable]
+//     pub fn ft_on_transfer(&mut self, token_id: AccountId, amount: U128) {
+//         // TODO
+//     }
+// }

contracts/solver-registry/src/view.rs

@@ -3,14 +3,22 @@ use near_sdk::AccountId;
 
 #[near]
 impl Contract {
+    pub fn get_owner_id(&self) -> AccountId {
+        self.owner_id.clone()
+    }
+
+    pub fn get_pool_len(&self) -> u32 {
+        self.pools.len()
+    }
+
+    pub fn get_worker_len(&self) -> u32 {
+        self.worker_by_account_id.len()
+    }
+
     pub fn get_worker(&self, account_id: AccountId) -> Worker {
         self.worker_by_account_id
             .get(&account_id)
             .unwrap()
             .to_owned()
     }
-
-    pub fn get_owner_id(&self) -> AccountId {
-        self.owner_id.clone()
-    }
 }

contracts/solver-registry/tests/constants.rs

@@ -7,5 +7,3 @@ pub const QUOTE_HEX : &str = "040002008100000000000000939a7233f79c4ca9940a0db395
 pub const CHECKSUM: &str = "test_checksum";
 pub const TCB_INFO: &str = include_str!("samples/tcb_info.json");
 pub const CODE_HASH: &str = "a27359cd0d747ae62300649e959c02707d70a9fb0900a9771d1f6f9311e89c3f";
-
-pub const QUOTE: &str = r#"{"signer_id": "solvers.near", "nonce": "3awkvkIUsqRsSJhdlNhGzBafs5ITIUZYb1T3AUOB7bA=", "verifying_contract": "intents.near", "deadline": "2025-12-31T11:59:59.000Z", "intents": [{"intent": "token_diff", "diff": {"nep141:wrap.near": "-500000000000000000000000", "nep141:eth-0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.omft.near": "-1277075"}}]}"#;