Skip to content

Commit

Permalink
rename storage mapper
Browse files Browse the repository at this point in the history
  • Loading branch information
dragos-rebegea committed Jul 19, 2024
1 parent df1b9de commit 4e038e6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
2 changes: 1 addition & 1 deletion bridge-proxy/src/bridge-proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub trait BridgeProxyContract:

fn refund_transaction(&self, tx_id: usize, token_id: &TokenIdentifier, amount: &BigUint) {
let tx = self.get_pending_transaction_by_id(tx_id);
let esdt_safe_addr = self.esdt_safe_address().get();
let esdt_safe_addr = self.bridged_tokens_wrapper_address().get();

self.tx()
.to(esdt_safe_addr)
Expand Down
21 changes: 9 additions & 12 deletions bridge-proxy/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,27 @@ pub trait ConfigModule {
}

#[only_owner]
#[endpoint(setupEsdtSafe)]
fn set_esdt_safe_contract_address(&self, opt_esdt_safe_address: OptionalValue<ManagedAddress>) {
match opt_esdt_safe_address {
#[endpoint(setBridgedTokensWrapper)]
fn set_bridged_tokens_wrapper(&self, opt_address: OptionalValue<ManagedAddress>) {
match opt_address {
OptionalValue::Some(sc_addr) => {
require!(
self.blockchain().is_smart_contract(&sc_addr),
"Invalid multi-transfer address"
"Invalid bridged tokens wrapper address"
);
self.esdt_safe_address().set(&sc_addr);
self.bridged_tokens_wrapper_address().set(&sc_addr);
}
OptionalValue::None => self.esdt_safe_address().clear(),
OptionalValue::None => self.bridged_tokens_wrapper_address().clear(),
}
}

#[view(getMultiTransferAddress)]
#[storage_mapper("multiTransferAddress")]
fn multi_transfer_address(&self) -> SingleValueMapper<ManagedAddress>;

#[view(getEsdtSafeAddress)]
#[storage_mapper("esdtSafeAddress")]
fn esdt_safe_address(&self) -> SingleValueMapper<ManagedAddress>;

#[proxy]
fn esdt_safe_proxy(&self, sc_address: ManagedAddress) -> esdt_safe::Proxy<Self::Api>;
#[view(getBridgedTokensWrapperAddress)]
#[storage_mapper("bridgedTokensWrapperAddress")]
fn bridged_tokens_wrapper_address(&self) -> SingleValueMapper<ManagedAddress>;

#[storage_mapper("pending_transactions")]
fn pending_transactions(&self) -> VecMapper<EthTransaction<Self::Api>>;
Expand Down
4 changes: 2 additions & 2 deletions bridge-proxy/wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ multiversx_sc_wasm_adapter::endpoints! {
getPendingTransactionById => get_pending_transaction_by_id
getPendingTransactions => get_pending_transactions
setupMultiTransfer => set_multi_transfer_contract_address
setupEsdtSafe => set_esdt_safe_contract_address
setBridgedTokensWrapper => set_bridged_tokens_wrapper
getMultiTransferAddress => multi_transfer_address
getEsdtSafeAddress => esdt_safe_address
getBridgedTokensWrapperAddress => bridged_tokens_wrapper_address
pause => pause_endpoint
unpause => unpause_endpoint
isPaused => paused_status
Expand Down

0 comments on commit 4e038e6

Please sign in to comment.