Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pausable macro to NEAR methods #179

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Add pausable macro to NEAR methods #179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9219d4c
Add puasable macro to NEAR methods
karim-en Jan 10, 2025
db0a65a
Remove except
karim-en Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 72 additions & 64 deletions near/omni-bridge/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ pub enum Role {
UpgradableCodeStager,
UpgradableCodeDeployer,
MetadataManager,
UnrestrictedRelayer,
}

#[ext_contract(ext_token)]
Expand Down Expand Up @@ -265,6 +266,7 @@ impl Contract {
contract
}

#[pause(except(roles(Role::DAO, Role::UnrestrictedRelayer)))]
pub fn log_metadata(&self, token_id: &AccountId) -> Promise {
ext_token::ext(token_id.clone())
.with_static_gas(LOG_METADATA_GAS)
Expand Down Expand Up @@ -335,6 +337,7 @@ impl Contract {
}

#[payable]
#[pause]
pub fn update_transfer_fee(&mut self, transfer_id: TransferId, fee: UpdateFee) {
match fee {
UpdateFee::Fee(fee) => {
Expand Down Expand Up @@ -383,6 +386,7 @@ impl Contract {
/// - If the `borsh::to_vec` serialization of the `TransferMessagePayload` fails.
/// - If a `fee` is provided and it doesn't match the fee in the stored transfer message.
#[payable]
#[pause(except(roles(Role::DAO, Role::UnrestrictedRelayer)))]
pub fn sign_transfer(
&mut self,
transfer_id: TransferId,
Expand Down Expand Up @@ -460,6 +464,7 @@ impl Contract {
}

#[payable]
#[pause(except(roles(Role::DAO, Role::UnrestrictedRelayer)))]
pub fn fin_transfer(&mut self, #[serializer(borsh)] args: FinTransferArgs) -> Promise {
require!(
args.storage_deposit_actions.len() <= 3,
Expand Down Expand Up @@ -543,6 +548,7 @@ impl Contract {
}

#[payable]
#[pause(except(roles(Role::DAO, Role::UnrestrictedRelayer)))]
pub fn claim_fee(&mut self, #[serializer(borsh)] args: ClaimFeeArgs) -> Promise {
ext_prover::ext(self.prover_account.clone())
.with_static_gas(VERIFY_PROOF_GAS)
Expand Down Expand Up @@ -643,6 +649,7 @@ impl Contract {
}

#[payable]
#[pause(except(roles(Role::DAO, Role::UnrestrictedRelayer)))]
pub fn deploy_token(&mut self, #[serializer(borsh)] args: DeployTokenArgs) -> Promise {
ext_prover::ext(self.prover_account.clone())
.with_static_gas(VERIFY_PROOF_GAS)
Expand Down Expand Up @@ -711,71 +718,8 @@ impl Contract {
)
}

fn deploy_token_internal(
&mut self,
chain_kind: ChainKind,
token_address: &OmniAddress,
metadata: BasicMetadata,
attached_deposit: NearToken,
) -> Promise {
let deployer = self
.token_deployer_accounts
.get(&chain_kind)
.unwrap_or_else(|| env::panic_str("ERR_DEPLOYER_NOT_SET"));
let prefix = token_address.get_token_prefix();
let token_id: AccountId = format!("{prefix}.{deployer}")
.parse()
.unwrap_or_else(|_| env::panic_str("ERR_PARSE_ACCOUNT"));

let storage_usage = env::storage_usage();
require!(
self.token_id_to_address
.insert(&(chain_kind, token_id.clone()), token_address)
.is_none(),
"ERR_TOKEN_EXIST"
);
require!(
self.token_address_to_id
.insert(token_address, &token_id)
.is_none(),
"ERR_TOKEN_EXIST"
);
require!(
self.token_decimals
.insert(
token_address,
&Decimals {
decimals: metadata.decimals,
origin_decimals: metadata.decimals
}
)
.is_none(),
"ERR_TOKEN_EXIST"
);
require!(self.deployed_tokens.insert(&token_id), "ERR_TOKEN_EXIST");
let required_deposit = env::storage_byte_cost()
.saturating_mul((env::storage_usage().saturating_sub(storage_usage)).into())
.saturating_add(storage::BRIDGE_TOKEN_INIT_BALANCE)
.saturating_add(NEP141_DEPOSIT);

require!(
attached_deposit >= required_deposit,
"ERROR: The deposit is not sufficient to cover the storage."
);

ext_deployer::ext(deployer)
.with_static_gas(DEPLOY_TOKEN_GAS)
.with_attached_deposit(storage::BRIDGE_TOKEN_INIT_BALANCE)
.deploy_token(token_id.clone(), metadata)
.then(
ext_token::ext(token_id)
.with_static_gas(STORAGE_DEPOSIT_GAS)
.with_attached_deposit(NEP141_DEPOSIT)
.storage_deposit(&env::current_account_id(), Some(true)),
)
}

#[payable]
#[pause(except(roles(Role::DAO, Role::UnrestrictedRelayer)))]
pub fn bind_token(&mut self, #[serializer(borsh)] args: BindTokenArgs) -> Promise {
ext_prover::ext(self.prover_account.clone())
.with_static_gas(VERIFY_PROOF_GAS)
Expand Down Expand Up @@ -1267,6 +1211,70 @@ impl Contract {
}
}

fn deploy_token_internal(
&mut self,
chain_kind: ChainKind,
token_address: &OmniAddress,
metadata: BasicMetadata,
attached_deposit: NearToken,
) -> Promise {
let deployer = self
.token_deployer_accounts
.get(&chain_kind)
.unwrap_or_else(|| env::panic_str("ERR_DEPLOYER_NOT_SET"));
let prefix = token_address.get_token_prefix();
let token_id: AccountId = format!("{prefix}.{deployer}")
.parse()
.unwrap_or_else(|_| env::panic_str("ERR_PARSE_ACCOUNT"));

let storage_usage = env::storage_usage();
require!(
self.token_id_to_address
.insert(&(chain_kind, token_id.clone()), token_address)
.is_none(),
"ERR_TOKEN_EXIST"
);
require!(
self.token_address_to_id
.insert(token_address, &token_id)
.is_none(),
"ERR_TOKEN_EXIST"
);
require!(
self.token_decimals
.insert(
token_address,
&Decimals {
decimals: metadata.decimals,
origin_decimals: metadata.decimals
}
)
.is_none(),
"ERR_TOKEN_EXIST"
);
require!(self.deployed_tokens.insert(&token_id), "ERR_TOKEN_EXIST");
let required_deposit = env::storage_byte_cost()
.saturating_mul((env::storage_usage().saturating_sub(storage_usage)).into())
.saturating_add(storage::BRIDGE_TOKEN_INIT_BALANCE)
.saturating_add(NEP141_DEPOSIT);

require!(
attached_deposit >= required_deposit,
"ERROR: The deposit is not sufficient to cover the storage."
);

ext_deployer::ext(deployer)
.with_static_gas(DEPLOY_TOKEN_GAS)
.with_attached_deposit(storage::BRIDGE_TOKEN_INIT_BALANCE)
.deploy_token(token_id.clone(), metadata)
.then(
ext_token::ext(token_id)
.with_static_gas(STORAGE_DEPOSIT_GAS)
.with_attached_deposit(NEP141_DEPOSIT)
.storage_deposit(&env::current_account_id(), Some(true)),
)
}

fn refund(account_id: AccountId, amount: NearToken) {
if !amount.is_zero() {
Promise::new(account_id).transfer(amount);
Expand Down
Loading