Skip to content

Commit

Permalink
update sc-config for proxies (#206)
Browse files Browse the repository at this point in the history 
* set sc config based on endpoints needed and generated new proxies

* last updates

* .

* fixed proxy error

* proxy sc-config
  • Loading branch information
@evelinemolnar
evelinemolnar authored Sep 11, 2024
1 parent 6def514 commit b88edf9
Show file tree
Hide file tree
Showing 21 changed files with 297 additions and 3,673 deletions.
27 changes: 27 additions & 0 deletions bridge-proxy/sc-config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,30 @@

[[proxy]]
path = "../multi-transfer-esdt/src/bridge_proxy_contract_proxy.rs"
add-unlabelled = false
add-endpoints = [
"init",
"deposit",
]

[[proxy]]
path = "../multisig/src/bridge_proxy_contract_proxy.rs"
add-unlabelled = false
add-endpoints = [
"init",
"unpause",
"pause",
]

[[proxy]]
path = "../bridge-proxy/src/bridge_proxy_contract_proxy.rs"
add-unlabelled = false
add-endpoints = [
"init",
"unpause",
"setBridgedTokensWrapper",
"deposit",
"getPendingTransactionById",
"execute",
"deposit",
]
77 changes: 0 additions & 77 deletions bridge-proxy/src/bridge_proxy_contract_proxy.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,6 @@ where
}
}

#[rustfmt::skip]
impl<Env, From, To, Gas> BridgeProxyContractProxyMethods<Env, From, To, Gas>
where
Env: TxEnv,
Env::Api: VMApi,
From: TxFrom<Env>,
To: TxTo<Env>,
Gas: TxGas<Env>,
{
pub fn upgrade(
self,
) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_upgrade()
.original_result()
}
}

#[rustfmt::skip]
impl<Env, From, To, Gas> BridgeProxyContractProxyMethods<Env, From, To, Gas>
where
Expand Down Expand Up @@ -123,28 +104,6 @@ where
.original_result()
}

pub fn get_pending_transactions(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, MultiValue2<usize, transaction::EthTransaction<Env::Api>>>> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("getPendingTransactions")
.original_result()
}

pub fn set_multi_transfer_contract_address<
Arg0: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
>(
self,
opt_multi_transfer_address: Arg0,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("setupMultiTransfer")
.argument(&opt_multi_transfer_address)
.original_result()
}

pub fn set_bridged_tokens_wrapper<
Arg0: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
>(
Expand All @@ -158,33 +117,6 @@ where
.original_result()
}

pub fn multi_transfer_address(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("getMultiTransferAddress")
.original_result()
}

pub fn bridged_tokens_wrapper_address(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("getBridgedTokensWrapperAddress")
.original_result()
}

pub fn pause_endpoint(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("pause")
.original_result()
}

pub fn unpause_endpoint(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
Expand All @@ -193,13 +125,4 @@ where
.raw_call("unpause")
.original_result()
}

pub fn paused_status(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("isPaused")
.original_result()
}
}
188 changes: 0 additions & 188 deletions bridge-proxy/src/bridged_tokens_wrapper_proxy.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,6 @@ where
}
}

#[rustfmt::skip]
impl<Env, From, To, Gas> BridgedTokensWrapperProxyMethods<Env, From, To, Gas>
where
Env: TxEnv,
Env::Api: VMApi,
From: TxFrom<Env>,
To: TxTo<Env>,
Gas: TxGas<Env>,
{
pub fn upgrade(
self,
) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_upgrade()
.original_result()
}
}

#[rustfmt::skip]
impl<Env, From, To, Gas> BridgedTokensWrapperProxyMethods<Env, From, To, Gas>
where
Expand All @@ -97,35 +78,6 @@ where
.original_result()
}

pub fn update_wrapped_token<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
Arg1: ProxyArg<u32>,
>(
self,
universal_bridged_token_ids: Arg0,
num_decimals: Arg1,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("updateWrappedToken")
.argument(&universal_bridged_token_ids)
.argument(&num_decimals)
.original_result()
}

pub fn remove_wrapped_token<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
>(
self,
universal_bridged_token_ids: Arg0,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("removeWrappedToken")
.argument(&universal_bridged_token_ids)
.original_result()
}

pub fn whitelist_token<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
Arg1: ProxyArg<u32>,
Expand All @@ -145,35 +97,6 @@ where
.original_result()
}

pub fn update_whitelisted_token<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
Arg1: ProxyArg<u32>,
>(
self,
chain_specific_token_id: Arg0,
chain_specific_token_decimals: Arg1,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("updateWhitelistedToken")
.argument(&chain_specific_token_id)
.argument(&chain_specific_token_decimals)
.original_result()
}

pub fn blacklist_token<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
>(
self,
chain_specific_token_id: Arg0,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("blacklistToken")
.argument(&chain_specific_token_id)
.original_result()
}

pub fn deposit_liquidity(
self,
) -> TxTypedCall<Env, From, To, (), Gas, ()> {
Expand All @@ -182,42 +105,6 @@ where
.original_result()
}

/// Will wrap what it can, and send back the rest unchanged
pub fn wrap_tokens(
self,
) -> TxTypedCall<Env, From, To, (), Gas, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>> {
self.wrapped_tx
.raw_call("wrapTokens")
.original_result()
}

pub fn unwrap_token<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
>(
self,
requested_token: Arg0,
) -> TxTypedCall<Env, From, To, (), Gas, ()> {
self.wrapped_tx
.raw_call("unwrapToken")
.argument(&requested_token)
.original_result()
}

pub fn unwrap_token_create_transaction<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
Arg1: ProxyArg<eth_address::EthAddress<Env::Api>>,
>(
self,
requested_token: Arg0,
to: Arg1,
) -> TxTypedCall<Env, From, To, (), Gas, ()> {
self.wrapped_tx
.raw_call("unwrapTokenCreateTransaction")
.argument(&requested_token)
.argument(&to)
.original_result()
}

pub fn set_esdt_safe_contract_address<
Arg0: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
>(
Expand All @@ -231,72 +118,6 @@ where
.original_result()
}

pub fn universal_bridged_token_ids(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, TokenIdentifier<Env::Api>>> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("getUniversalBridgedTokenIds")
.original_result()
}

pub fn token_liquidity<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
>(
self,
token: Arg0,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("getTokenLiquidity")
.argument(&token)
.original_result()
}

pub fn chain_specific_to_universal_mapping<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
>(
self,
token: Arg0,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, TokenIdentifier<Env::Api>> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("getChainSpecificToUniversalMapping")
.argument(&token)
.original_result()
}

pub fn chain_specific_token_ids<
Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
>(
self,
universal_token_id: Arg0,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, TokenIdentifier<Env::Api>>> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("getchainSpecificTokenIds")
.argument(&universal_token_id)
.original_result()
}

pub fn esdt_safe_contract_address(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("getEsdtSafeContractAddress")
.original_result()
}

pub fn pause_endpoint(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("pause")
.original_result()
}

pub fn unpause_endpoint(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
Expand All @@ -305,13 +126,4 @@ where
.raw_call("unpause")
.original_result()
}

pub fn paused_status(
self,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("isPaused")
.original_result()
}
}
26 changes: 26 additions & 0 deletions bridged-tokens-wrapper/sc-config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,29 @@

[[proxy]]
path = "../multi-transfer-esdt/src/bridged_tokens_wrapper_proxy.rs"
add-unlabelled = false
add-endpoints = [
"wrapTokens",
"init",
"unpause",
]

[[proxy]]
path = "../multisig/src/bridged_tokens_wrapper_proxy.rs"
add-unlabelled = false
add-endpoints = [
"init",
"unpause",
]

[[proxy]]
path = "../bridge-proxy/src/bridged_tokens_wrapper_proxy.rs"
add-unlabelled = false
add-endpoints = [
"init",
"unpause",
"whitelistToken",
"addWrappedToken",
"depositLiquidity",
"setEsdtSafeContractAddress"
]
Loading

0 comments on commit b88edf9

Please sign in to comment.