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

modify rpc response about getSupportChains,getFastWithdraw(fix zklink-periphery issues #834 #816) #102

Merged
merged 2 commits into from
Dec 1, 2023
Merged

modify rpc response about getSupportChains,getFastWithdraw(fix zklink-periphery issues #834 #816) #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2de710d
add deposit confirmation in ChainResp
nick-zkp Nov 30, 2023
71fddf4
rename getFastWithdrawTxs to getWithdrawTxs;remove layer_zero_address…
nick-zkp Dec 1, 2023
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
4 changes: 2 additions & 2 deletions provider/src/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ pub struct ChainResp {
pub chain_type: u8,
pub layer_one_chain_id: U256,
pub main_contract: ZkLinkAddress,
pub layer_zero_contract: ZkLinkAddress,
pub gas_token_id: TokenId,
pub deposit_confirmation: u64,
}

#[derive(Debug, Serialize, Deserialize, Clone)]
Expand Down Expand Up @@ -401,7 +401,7 @@ pub struct BlockTxResp {

#[derive(Debug, Serialize, Deserialize, Clone)]
#[serde(rename_all = "camelCase")]
pub struct FastWithdrawTxResp {
pub struct WithdrawTxResp {
pub tx_hash: TxHash,
pub tx: ZkLinkTx,
#[serde(with = "ts_microseconds")]
Expand Down
6 changes: 3 additions & 3 deletions provider/src/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ pub trait ZkLinkRpc {
page_size: u32,
) -> RpcResult<Page<ZkLinkTxHistory>>;

#[method(name = "getFastWithdrawTxs")]
async fn tx_fast_withdraw(
#[method(name = "getWithdrawTxs")]
async fn tx_withdraw(
&self,
last_tx_timestamp: u64,
max_txs: u32,
) -> RpcResult<Vec<FastWithdrawTxResp>>;
) -> RpcResult<Vec<WithdrawTxResp>>;

#[method(name = "getChangePubkeyChainId")]
async fn get_change_pubkey_chain_id(&self) -> RpcResult<ChainId>;
Expand Down
Loading