Support omni-bridge token wrapping

Makefile.toml

@@ -5,12 +5,13 @@ skip_core_tasks = true
 [env]
 TARGET_DIR = "${PWD}/res"
 POA_TOKEN_WASM = "${TARGET_DIR}/defuse_poa_token.wasm"
+POA_TOKEN_WITH_DEPOSIT_DIR = "${TARGET_DIR}/poa-token-with-deposit"
 
 [tasks.default]
 alias = "build"
 
 [tasks.clippy]
-dependencies = ["add-cache-dir-tag", "build-poa-token"]
+dependencies = ["add-cache-dir-tag"]
 command = "cargo"
 args = ["clippy", "--workspace", "--all-targets", "--no-deps"]
 
@@ -34,7 +35,7 @@ args = [
 ]
 
 [tasks.build-poa-factory]
-dependencies = ["add-cache-dir-tag", "build-poa-token"]
+dependencies = ["add-cache-dir-tag", "build-poa-token", "build-poa-token-with-deposits"]
 command = "cargo"
 args = [
     "near",
@@ -65,6 +66,22 @@ args = [
     "--no-embed-abi",
 ]
 
+[tasks.build-poa-token-with-deposits]
+dependencies = ["add-cache-dir-tag"]
+command = "cargo"
+args = [
+    "near",
+    "build",
+    "non-reproducible-wasm",
+    "--manifest-path",
+    "./poa-token/Cargo.toml",
+    "--features",
+    "contract,deposits",
+    "--out-dir",
+    "${POA_TOKEN_WITH_DEPOSIT_DIR}",
+    "--no-embed-abi",
+]
+
 [tasks.test]
 alias = "tests"
 

near-utils/src/lock.rs

@@ -106,6 +106,11 @@ impl<T> Lock<T> {
         self.locked = false;
         &mut self.value
     }
+
+    #[inline]
+    pub fn ignore_lock(&self) -> &T {
+        &self.value
+    }
 }
 
 impl<T> From<T> for Lock<T> {

near-utils/src/panic.rs

@@ -44,6 +44,18 @@ impl<T> UnwrapOrPanic<T> for Option<T> {
     }
 }
 
+pub trait UnwrapOrPanicCtx<T> {
+    fn unwrap_or_panic_ctx(self, ctx: &str) -> T;
+}
+
+impl<T> UnwrapOrPanicCtx<T> for Option<T> {
+    #[inline]
+    #[track_caller]
+    fn unwrap_or_panic_ctx(self, ctx: &str) -> T {
+        self.unwrap_or_else(|| env::panic_str(ctx))
+    }
+}
+
 impl<T, E> UnwrapOrPanic<T> for Result<T, E>
 where
     E: FunctionError,

poa-factory/Cargo.toml

@@ -11,6 +11,7 @@ workspace = true
 
 [dependencies]
 defuse-admin-utils.workspace = true
+defuse-controller.workspace = true
 defuse-near-utils.workspace = true
 defuse-poa-token.workspace = true
 

poa-factory/src/contract.rs

@@ -2,7 +2,8 @@ use core::iter;
 use std::collections::{HashMap, HashSet};
 
 use defuse_admin_utils::full_access_keys::FullAccessKeys;
-use defuse_near_utils::{CURRENT_ACCOUNT_ID, UnwrapOrPanicError, gas_left};
+use defuse_controller::ControllerUpgradable;
+use defuse_near_utils::{CURRENT_ACCOUNT_ID, UnwrapOrPanicError, gas_left, method_name};
 use defuse_poa_token::ext_poa_fungible_token;
 use near_contract_standards::fungible_token::{core::ext_ft_core, metadata::FungibleTokenMetadata};
 use near_plugins::{
@@ -21,6 +22,9 @@ use near_sdk::{
 
 use crate::PoaFactory;
 
+const STATE_MIGRATE_FUNCTION: &str = method_name!(Contract::state_migrate);
+const STATE_MIGRATE_DEFAULT_GAS: Gas = Gas::from_tgas(5);
+
 #[cfg(not(clippy))]
 const POA_TOKEN_WASM: &[u8] = include_bytes!(std::env!(
     "POA_TOKEN_WASM",
@@ -29,12 +33,14 @@ const POA_TOKEN_WASM: &[u8] = include_bytes!(std::env!(
 #[cfg(clippy)]
 const POA_TOKEN_WASM: &[u8] = b"";
 
-const POA_TOKEN_INIT_BALANCE: NearToken = NearToken::from_near(3);
+const POA_TOKEN_INIT_BALANCE: NearToken = NearToken::from_near(5);
 const POA_TOKEN_NEW_GAS: Gas = Gas::from_tgas(10);
 const POA_TOKEN_FT_DEPOSIT_GAS: Gas = Gas::from_tgas(10);
 /// Copied from `near_contract_standards::fungible_token::core_impl::GAS_FOR_FT_TRANSFER_CALL`
 const POA_TOKEN_FT_TRANSFER_CALL_MIN_GAS: Gas = Gas::from_tgas(30);
 
+const POA_TOKEN_UPRADE_GAS: Gas = Gas::from_tgas(10);
+
 #[derive(AccessControlRole, Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[near(serializers = [json])]
 pub enum Role {
@@ -92,6 +98,39 @@ impl Contract {
         );
         contract
     }
+
+    #[pause]
+    #[access_control_any(roles(Role::DAO, Role::TokenDeployer))]
+    #[payable]
+    pub fn upgrade_token(&mut self, token: String, self_public_key: PublicKey) -> Promise {
+        // FIXME: Check what conditions for atomicity, safety and repeatability are needed
+        Promise::new(Self::token_id(token))
+            .function_call(
+                "add_full_access_key".to_string(),
+                serde_json::to_vec(&json!({
+                    "public_key": self_public_key,
+                }))
+                .unwrap_or_panic_display(),
+                NearToken::from_near(0),
+                POA_TOKEN_UPRADE_GAS,
+            )
+            .deploy_contract(POA_TOKEN_WASM.to_vec())
+            .function_call(
+                "upgrade_to_versioned".to_string(),
+                serde_json::to_vec(&json!({})).unwrap_or_panic_display(),
+                NearToken::from_yoctonear(1), // FIXME: amount
+                POA_TOKEN_UPRADE_GAS,
+            )
+            .function_call(
+                "delete_key".to_string(),
+                serde_json::to_vec(&json!({
+                    "public_key": self_public_key,
+                }))
+                .unwrap_or_panic_display(),
+                NearToken::from_near(0),
+                POA_TOKEN_UPRADE_GAS,
+            )
+    }
 }
 
 #[near]
@@ -225,6 +264,30 @@ impl FullAccessKeys for Contract {
     }
 }
 
+#[near]
+impl ControllerUpgradable for Contract {
+    #[access_control_any(roles(Role::DAO, Role::TokenDeployer))]
+    #[payable]
+    fn upgrade(
+        &mut self,
+        #[serializer(borsh)] code: Vec<u8>,
+        #[serializer(borsh)] state_migration_gas: Option<Gas>,
+    ) -> Promise {
+        assert_one_yocto();
+        Promise::new(CURRENT_ACCOUNT_ID.clone())
+            .deploy_contract(code)
+            .function_call(
+                STATE_MIGRATE_FUNCTION.into(),
+                Vec::new(),
+                NearToken::from_yoctonear(0),
+                state_migration_gas.unwrap_or(STATE_MIGRATE_DEFAULT_GAS),
+            )
+    }
+
+    #[private]
+    fn state_migrate(&mut self) {}
+}
+
 #[derive(BorshSerialize, BorshStorageKey)]
 #[borsh(crate = "::near_sdk::borsh")]
 enum Prefix {

poa-factory/src/lib.rs

@@ -4,12 +4,13 @@ pub mod contract;
 use std::collections::HashMap;
 
 use defuse_admin_utils::full_access_keys::FullAccessKeys;
+use defuse_controller::ControllerUpgradable;
 use near_contract_standards::fungible_token::metadata::FungibleTokenMetadata;
 use near_plugins::AccessControllable;
 use near_sdk::{AccountId, Promise, ext_contract, json_types::U128};
 
 #[ext_contract(ext_poa_factory)]
-pub trait PoaFactory: AccessControllable + FullAccessKeys {
+pub trait PoaFactory: AccessControllable + FullAccessKeys + ControllerUpgradable {
     /// Deploys new token to `token.<CURRENT_ACCOUNT_ID>`.
     /// Requires to attach enough Ⓝ to cover storage costs.
     fn deploy_token(&mut self, token: String, metadata: Option<FungibleTokenMetadata>) -> Promise;

poa-token/Cargo.toml

@@ -11,6 +11,7 @@ workspace = true
 
 [dependencies]
 defuse-admin-utils.workspace = true
+defuse-controller.workspace = true
 defuse-near-utils.workspace = true
 
 near-contract-standards.workspace = true
@@ -19,3 +20,4 @@ near-sdk = { workspace = true, features = ["unstable"] }
 
 [features]
 contract = []
+deposits = []