GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed type conversion

Browse Source
This commit is contained in:
Jędrzej Stuczyński
2025-03-20 16:03:43 +00:00
parent e1583daaa3
commit fbfeacf539
4 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nym-wallet/src-tauri/src/main.rs
+1 -1
View File
@@ -177,7 +177,7 @@ fn main() {
simulate::mixnet::simulate_pledge_more,
simulate::mixnet::simulate_unbond_mixnode,
simulate::mixnet::simulate_update_mixnode_config,
simulate::mixnet::simulate_update_mixnode_cost_params,
simulate::mixnet::simulate_update_node_cost_params,
simulate::mixnet::simulate_update_gateway_config,
simulate::mixnet::simulate_delegate_to_node,
simulate::mixnet::simulate_undelegate_from_node,
nym-wallet/src-tauri/src/operations/mixnet/bond.rs
+16 -10
View File
@@ -12,7 +12,7 @@ use log::info;
use nym_contracts_common::signing::MessageSignature;
use nym_mixnet_contract_common::gateway::GatewayConfigUpdate;
use nym_mixnet_contract_common::nym_node::{NodeConfigUpdate, StakeSaturationResponse};
use nym_mixnet_contract_common::{MixNodeConfigUpdate, NodeId, NymNode, NodeCostParams as OtherNodeCostParams};
use nym_mixnet_contract_common::{MixNodeConfigUpdate, NodeId, NymNode};
use nym_node_requests::api::client::NymNodeApiClientExt;
use nym_node_requests::api::v1::node::models::NodeDescription;
use nym_node_requests::api::ErrorResponse;
@@ -335,17 +335,17 @@ pub async fn update_mixnode_cost_params(
let guard = state.read().await;
let reg = guard.registered_coins()?;
let fee_amount = guard.convert_tx_fee(fee.as_ref());
let contract_cost_params = new_costs.try_convert_to_mixnet_contract_cost_params(reg)?;
let cost_params = new_costs.try_convert_to_mixnet_contract_cost_params(reg)?;
log::info!(
">>> Update mixnode cost parameters: new parameters = {}, fee {:?}",
contract_cost_params.to_inline_json(),
cost_params.to_inline_json(),
fee,
);
let res = guard
.current_client()?
.nyxd
.update_cost_params(contract_cost_params, fee)
.await?;
.current_client()?
.nyxd
.update_cost_params(cost_params, fee)
.await?;
log::info!("<<< tx hash = {}", res.transaction_hash);
log::trace!("<<< {:?}", res);
Ok(TransactionExecuteResult::from_execute_result(
@@ -686,17 +686,23 @@ pub async fn update_nymnode_config(
#[tauri::command]
pub async fn update_nymnode_cost_params(
update: OtherNodeCostParams,
new_costs: NodeCostParams,
fee: Option<Fee>,
state: tauri::State<'_, WalletState>,
) -> Result<TransactionExecuteResult, BackendError> {
let guard = state.write().await;
let reg = guard.registered_coins()?;
let fee_amount = guard.convert_tx_fee(fee.as_ref());
log::info!(">>> update nym node cost params: update = {update:?}, fee {fee:?}",);
let cost_params = new_costs.try_convert_to_mixnet_contract_cost_params(reg)?;
log::info!(
">>> update nym node cost params: update = {}, fee {fee:?}",
cost_params.to_inline_json()
);
let res = guard
.current_client()?
.nyxd
.update_cost_params(update, fee)
.update_cost_params(cost_params, fee)
.await?;
log::info!("<<< tx hash = {}", res.transaction_hash);
log::trace!("<<< {:?}", res);
nym-wallet/src-tauri/src/operations/simulate/mixnet.rs
+1 -1
View File
@@ -146,7 +146,7 @@ pub async fn simulate_unbond_mixnode(
}
#[tauri::command]
pub async fn simulate_update_mixnode_cost_params(
pub async fn simulate_update_node_cost_params(
new_costs: NodeCostParams,
state: tauri::State<'_, WalletState>,
) -> Result<FeeDetails, BackendError> {
nym-wallet/src/requests/simulate.ts
+33 -36
View File
@@ -1,90 +1,87 @@
import {
FeeDetails,
DecCoin,
Gateway,
NodeCostParams,
MixNodeConfigUpdate,
GatewayConfigUpdate,
FeeDetails,
DecCoin,
Gateway,
NodeCostParams,
MixNodeConfigUpdate,
GatewayConfigUpdate,
} from '@nymproject/types';
import { TBondGatewayArgs, TBondMixNodeArgs, TSimulateUpdateBondArgs } from 'src/types';
import { invokeWrapper } from './wrapper';
import {TBondGatewayArgs, TBondMixNodeArgs, TSimulateUpdateBondArgs} from 'src/types';
import {invokeWrapper} from './wrapper';
export const simulateBondGateway = async (args: TBondGatewayArgs) =>
invokeWrapper<FeeDetails>('simulate_bond_gateway', args);
invokeWrapper<FeeDetails>('simulate_bond_gateway', args);
export const simulateUnbondGateway = async (args: any) => invokeWrapper<FeeDetails>('simulate_unbond_gateway', args);
export const simulateBondMixnode = async (args: TBondMixNodeArgs) =>
invokeWrapper<FeeDetails>('simulate_bond_mixnode', args);
invokeWrapper<FeeDetails>('simulate_bond_mixnode', args);
export const simulateUnbondMixnode = async (args: any) => invokeWrapper<FeeDetails>('simulate_unbond_mixnode', args);
export const simulateUpdateMixnodeCostParams = async (newCosts: NodeCostParams) =>
invokeWrapper<FeeDetails>('simulate_update_mixnode_cost_params', { newCosts });
invokeWrapper<FeeDetails>('simulate_update_node_cost_params', {newCosts});
export const simulateUpdateMixnodeConfig = async (update: MixNodeConfigUpdate) =>
invokeWrapper<FeeDetails>('simulate_update_mixnode_config', { update });
invokeWrapper<FeeDetails>('simulate_update_mixnode_config', {update});
export const simulateUpdateGatewayConfig = async (update: GatewayConfigUpdate) =>
invokeWrapper<FeeDetails>('simulate_update_gateway_config', { update });
invokeWrapper<FeeDetails>('simulate_update_gateway_config', {update});
export const simulateDelegateToNode = async (args: { nodeId: number; amount: DecCoin }) =>
invokeWrapper<FeeDetails>('simulate_delegate_to_node', args);
invokeWrapper<FeeDetails>('simulate_delegate_to_node', args);
export const simulateUndelegateFromNode = async (nodeId: number) =>
invokeWrapper<FeeDetails>('simulate_undelegate_from_node', { nodeId });
invokeWrapper<FeeDetails>('simulate_undelegate_from_node', {nodeId});
export const simulateClaimDelegatorReward = async (nodeId: number) =>
invokeWrapper<FeeDetails>('simulate_claim_delegator_reward', { nodeId });
invokeWrapper<FeeDetails>('simulate_claim_delegator_reward', {nodeId});
export const simulateVestingClaimDelegatorReward = async (mixId: number) =>
invokeWrapper<FeeDetails>('simulate_vesting_claim_delegator_reward', { mixId });
invokeWrapper<FeeDetails>('simulate_vesting_claim_delegator_reward', {mixId});
export const simulateVestingUndelegateFromMixnode = async (args: any) =>
invokeWrapper<FeeDetails>('simulate_vesting_undelegate_from_mixnode', args);
export const simulateNymNodeCostParams = async (args: any) =>
invokeWrapper<FeeDetails>('simulate_nymnode_cost_params', args);
invokeWrapper<FeeDetails>('simulate_vesting_undelegate_from_mixnode', args);
export const simulateVestingBondGateway = async (args: { gateway: Gateway; pledge: DecCoin; msgSignature: string }) =>
invokeWrapper<FeeDetails>('simulate_vesting_bond_gateway', args);
invokeWrapper<FeeDetails>('simulate_vesting_bond_gateway', args);
export const simulateVestingUnbondGateway = async (args: any) =>
invokeWrapper<FeeDetails>('simulate_vesting_unbond_gateway', args);
invokeWrapper<FeeDetails>('simulate_vesting_unbond_gateway', args);
export const simulateVestingDelegateToMixnode = async (args: { mixId: number }) =>
invokeWrapper<FeeDetails>('simulate_vesting_delegate_to_mixnode', args);
invokeWrapper<FeeDetails>('simulate_vesting_delegate_to_mixnode', args);
export const simulateVestingBondMixnode = async (args: TBondMixNodeArgs) =>
invokeWrapper<FeeDetails>('simulate_vesting_bond_mixnode', args);
invokeWrapper<FeeDetails>('simulate_vesting_bond_mixnode', args);
export const simulateVestingUnbondMixnode = async () => invokeWrapper<FeeDetails>('simulate_vesting_unbond_mixnode');
export const simulateVestingUpdateMixnodeCostParams = async (newCosts: NodeCostParams) =>
invokeWrapper<FeeDetails>('simulate_vesting_update_mixnode_cost_params', { newCosts });
invokeWrapper<FeeDetails>('simulate_vesting_update_mixnode_cost_params', {newCosts});
export const simulateVestingUpdateMixnodeConfig = async (update: MixNodeConfigUpdate) =>
invokeWrapper<FeeDetails>('simulate_vesting_update_mixnode_config', { update });
invokeWrapper<FeeDetails>('simulate_vesting_update_mixnode_config', {update});
export const simulateVestingUpdateGatewayConfig = async (update: GatewayConfigUpdate) =>
invokeWrapper<FeeDetails>('simulate_vesting_update_gateway_config', { update });
invokeWrapper<FeeDetails>('simulate_vesting_update_gateway_config', {update});
export const simulateWithdrawVestedCoins = async (args: any) =>
invokeWrapper<FeeDetails>('simulate_withdraw_vested_coins', args);
invokeWrapper<FeeDetails>('simulate_withdraw_vested_coins', args);
export const simulateSend = async ({ address, amount, memo }: { address: string; amount: DecCoin; memo: string }) =>
invokeWrapper<FeeDetails>('simulate_send', { address, amount, memo });
export const simulateSend = async ({address, amount, memo}: { address: string; amount: DecCoin; memo: string }) =>
invokeWrapper<FeeDetails>('simulate_send', {address, amount, memo});
export const getCustomFees = async ({ feesAmount }: { feesAmount: DecCoin }) =>
invokeWrapper<FeeDetails>('get_custom_fees', { feesAmount });
export const getCustomFees = async ({feesAmount}: { feesAmount: DecCoin }) =>
invokeWrapper<FeeDetails>('get_custom_fees', {feesAmount});
export const simulateClaimOperatorReward = async () => invokeWrapper<FeeDetails>('simulate_claim_operator_reward');
export const simulateVestingClaimOperatorReward = async () =>
invokeWrapper<FeeDetails>('simulate_vesting_claim_operator_reward');
invokeWrapper<FeeDetails>('simulate_vesting_claim_operator_reward');
export const simulateUpdateBond = async (args: TSimulateUpdateBondArgs) =>
invokeWrapper<FeeDetails>('simulate_update_pledge', args);
invokeWrapper<FeeDetails>('simulate_update_pledge', args);
export const simulateVestingUpdateBond = async (args: TSimulateUpdateBondArgs) =>
invokeWrapper<FeeDetails>('simulate_vesting_update_pledge', args);
invokeWrapper<FeeDetails>('simulate_vesting_update_pledge', args);