Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 0 additions & 28 deletions crate/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ nodejs = []
web = []

[build-dependencies]
namada_tx = { git = "https://github.com/anoma/namada", tag="libs-v0.251.3" }
namada_tx = { path = "/home/mj/Projects/heliax/namada/crates/tx" }

[dependencies]
aes-gcm = "0.10.3"
Expand All @@ -29,7 +29,7 @@ chrono = "0.4.22"
getrandom = { version = "0.3.3", features = [] }
gloo-utils = { version = "0.1.5", features = ["serde"] }
js-sys = "0.3.60"
namada_sdk = { git = "https://github.com/anoma/namada", tag="libs-v0.251.3", default-features = false }
namada_sdk = { path = "/home/mj/Projects/heliax/namada/crates/sdk", default-features = false }
password-hash = "0.5.0"
rand = {version = "0.8.5"}
rayon = { version = "1.8", optional = true }
Expand Down
6 changes: 4 additions & 2 deletions crate/src/sdk/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{path::PathBuf, str::FromStr};

use namada_sdk::address::DecodeError;
use namada_sdk::args::{
TxShieldedSource, TxShieldedTarget, TxTransparentSource, TxTransparentTarget,
DryRun, TxShieldedSource, TxShieldedTarget, TxTransparentSource, TxTransparentTarget
};
use namada_sdk::borsh::{BorshDeserialize, BorshSerialize};
use namada_sdk::collections::HashMap;
Expand Down Expand Up @@ -1082,7 +1082,7 @@ fn tx_msg_into_args(tx_msg: &[u8]) -> Result<args::Tx, JsError> {
};

let args = args::Tx {
dry_run: None,
dry_run: Some(DryRun::Wrapper),
dump_tx: None,
force,
ledger_address,
Expand All @@ -1100,6 +1100,8 @@ fn tx_msg_into_args(tx_msg: &[u8]) -> Result<args::Tx, JsError> {
device_transport: Default::default(),
};

web_sys::console::log_1(&format!("Tx args: {:?}", args).into());

Ok(args)
}

Expand Down
19 changes: 16 additions & 3 deletions crate/src/sdk/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ use namada_sdk::masp_primitives::transaction::components::amount::I128Sum;
use namada_sdk::masp_primitives::transaction::TxId;
use namada_sdk::masp_primitives::zip32::{ExtendedFullViewingKey, ExtendedKey};
use namada_sdk::rpc::{self, query_denom, query_epoch, InnerTxResult, TxAppliedEvents, TxResponse};
use namada_sdk::signing::SigningData;
use namada_sdk::signing::{mock_hw_sig, Signable, SigningData};
use namada_sdk::string_encoding::Format;
use namada_sdk::tendermint_rpc::Url;
use namada_sdk::token::{Amount, DenominatedAmount};
use namada_sdk::token::{MaspTxId, OptionExt};
use namada_sdk::tx::data::{ResultCode, TxType};
use namada_sdk::tx::data::{DryRunResult, ResultCode, TxType};
use namada_sdk::tx::Section;
use namada_sdk::tx::{
build_batch, build_bond, build_claim_rewards, build_ibc_transfer, build_redelegation,
Expand Down Expand Up @@ -408,6 +408,20 @@ impl Sdk {
Ok(event)
}

pub async fn dry_run_tx(&self, tx_bytes: &[u8], pk: &str) -> Result<JsValue, JsValue> {
let mut tx = Tx::try_from_slice(tx_bytes).expect("Should be able to deserialize a Tx");

let pk = common::PublicKey::from_str(pk).unwrap();
mock_hw_sig(&mut tx, pk, Signable::FeeRawHeader);

let result = rpc::dry_run_tx(&self.namada, tx.to_bytes()).await.map_err(|e| JsValue::from_str(&e.to_string()))?;

let DryRunResult(_, gas_cost) = &result;

Ok(JsValue::from(u64::from(*gas_cost)))
}


pub async fn broadcast_tx(&self, tx_bytes: &[u8], deadline: u64) -> Result<JsValue, JsValue> {
#[derive(serde::Serialize)]
struct TxErrResponse {
Expand All @@ -420,7 +434,6 @@ impl Sdk {
let tx_hash = tx.header_hash().to_string();

let response = self.namada.client().broadcast_tx_sync(tx.to_bytes()).await;

match response {
Ok(res) => {
if res.clone().code != 0.into() {
Expand Down
7 changes: 7 additions & 0 deletions packages/lib/src/rpc/rpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,13 @@ export class Rpc {
return deserialize(Buffer.from(response), TxResponseMsgValue);
}

async dryRunTx(
signedTxBytes: Uint8Array,
publicKey: string,
): Promise<number> {
return await this.sdk.dry_run_tx(signedTxBytes, publicKey);
}

/**
* Sync the shielded context
* @async
Expand Down