From 405f49b699da9f685098d1a01497900fcff824c3 Mon Sep 17 00:00:00 2001 From: Kevin Gislason Date: Fri, 26 Nov 2021 18:34:44 -0600 Subject: [PATCH 1/2] testnet_tx_summary --- .gitignore | 2 +- Cargo.toml | 2 +- src/service.rs | 21 +++++++++------------ ui/src-tauri/Cargo.lock | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 07a1e397..16d56367 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /target Cargo.lock - +.DS_Store diff --git a/Cargo.toml b/Cargo.toml index 73ee345b..07ae6f6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ derivative = { version = "2.2.0", default-features = false, features = ["use_cor dirs-next = { version = "2.0.0" } futures = { version = "0.3.17", default-features = false } http-types = { version = "2.12.0", default-features = false } -manta-api = { git = "https://github.com/Manta-Network/manta-api", branch = "manta", default-features = false, features = ["signer", "testnet"] } +manta-api = { git = "https://github.com/Manta-Network/manta-api", branch = "signer_tx_summary_testnet", default-features = false, features = ["signer", "testnet"] } manta-asset = { git = "https://github.com/Manta-Network/manta-types", branch = "manta" } manta-crypto = { git = "https://github.com/Manta-Network/manta-crypto", branch = "manta" } manta-data = { git = "https://github.com/Manta-Network/manta-types", branch = "manta" } diff --git a/src/service.rs b/src/service.rs index b2f64b87..e766734e 100644 --- a/src/service.rs +++ b/src/service.rs @@ -30,8 +30,10 @@ use async_std::{ use codec::{Decode, Encode}; use http_types::headers::HeaderValue; use manta_api::{ - DeriveShieldedAddressParams, GenerateAssetParams, GeneratePrivateTransferBatchParams, - GenerateReclaimBatchParams, RecoverAccountParams, + get_private_transfer_batch_params_currency_symbol, get_private_transfer_batch_params_recipient, + get_private_transfer_batch_params_value, get_reclaim_batch_params_currency_symbol, + get_reclaim_batch_params_value, DeriveShieldedAddressParams, GenerateAssetParams, + GeneratePrivateTransferBatchParams, GenerateReclaimBatchParams, RecoverAccountParams, }; use manta_asset::AssetId; use manta_crypto::MantaSerDes; @@ -101,15 +103,10 @@ impl From<&GeneratePrivateTransferBatchParams> for TransactionSummary { fn from(params: &GeneratePrivateTransferBatchParams) -> Self { Self { kind: TransactionKind::PrivateTransfer { - recipient: bs58::encode(params.receiving_address.encode()).into_string(), + recipient: get_private_transfer_batch_params_recipient(params), }, - amount: params - .private_transfer_params_list - .last() - .unwrap() - .non_change_output_value - .to_string(), - currency_symbol: get_currency_symbol_by_asset_id(params.asset_id), + amount: get_private_transfer_batch_params_value(params), + currency_symbol: get_private_transfer_batch_params_currency_symbol(params), } } } @@ -119,8 +116,8 @@ impl From<&GenerateReclaimBatchParams> for TransactionSummary { fn from(params: &GenerateReclaimBatchParams) -> Self { Self { kind: TransactionKind::Reclaim, - amount: params.reclaim_params.reclaim_value.to_string(), - currency_symbol: get_currency_symbol_by_asset_id(params.reclaim_params.asset_id), + amount: get_reclaim_batch_params_value(params), + currency_symbol: get_reclaim_batch_params_currency_symbol(params), } } } diff --git a/ui/src-tauri/Cargo.lock b/ui/src-tauri/Cargo.lock index d505ddee..3102637a 100644 --- a/ui/src-tauri/Cargo.lock +++ b/ui/src-tauri/Cargo.lock @@ -2676,7 +2676,7 @@ dependencies = [ [[package]] name = "manta-api" version = "0.3.3" -source = "git+https://github.com/Manta-Network/manta-api?branch=manta#49af461241c9049b6f347f560be7cead7f70b9de" +source = "git+https://github.com/Manta-Network/manta-api?branch=signer_tx_summary_testnet#15129844f2e328f293a9b19409aa27a361f846a9" dependencies = [ "ark-bls12-381", "ark-crypto-primitives", From 16e7bed92300645f9b942afe662d5f9cc491c635 Mon Sep 17 00:00:00 2001 From: Kevin Gislason Date: Sat, 27 Nov 2021 00:51:53 -0600 Subject: [PATCH 2/2] update manta-api; --- Cargo.toml | 4 ++-- ui/package.json | 4 ++-- ui/src-tauri/Cargo.lock | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 07ae6f6c..435c2038 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "manta-signer" edition = "2018" -version = "0.3.0" +version = "0.4.0" authors = ["Manta Network "] readme = "README.md" license-file = "LICENSE" @@ -36,7 +36,7 @@ derivative = { version = "2.2.0", default-features = false, features = ["use_cor dirs-next = { version = "2.0.0" } futures = { version = "0.3.17", default-features = false } http-types = { version = "2.12.0", default-features = false } -manta-api = { git = "https://github.com/Manta-Network/manta-api", branch = "signer_tx_summary_testnet", default-features = false, features = ["signer", "testnet"] } +manta-api = { git = "https://github.com/Manta-Network/manta-api", branch = "manta", default-features = false, features = ["signer", "testnet"] } manta-asset = { git = "https://github.com/Manta-Network/manta-types", branch = "manta" } manta-crypto = { git = "https://github.com/Manta-Network/manta-crypto", branch = "manta" } manta-data = { git = "https://github.com/Manta-Network/manta-types", branch = "manta" } diff --git a/ui/package.json b/ui/package.json index b664ebb9..8aef8ba8 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "manta-signer-ui", - "version": "0.3.0", + "version": "0.4.0", "private": true, "dependencies": { "@tauri-apps/api": "^1.0.0-beta.8", @@ -43,4 +43,4 @@ "devDependencies": { "@tauri-apps/cli": "^1.0.0-beta.10" } -} +} \ No newline at end of file diff --git a/ui/src-tauri/Cargo.lock b/ui/src-tauri/Cargo.lock index 3102637a..d31af9e5 100644 --- a/ui/src-tauri/Cargo.lock +++ b/ui/src-tauri/Cargo.lock @@ -2676,7 +2676,7 @@ dependencies = [ [[package]] name = "manta-api" version = "0.3.3" -source = "git+https://github.com/Manta-Network/manta-api?branch=signer_tx_summary_testnet#15129844f2e328f293a9b19409aa27a361f846a9" +source = "git+https://github.com/Manta-Network/manta-api?branch=manta#bb37de4b7a72c267eaefe458b1060107e46bbf9c" dependencies = [ "ark-bls12-381", "ark-crypto-primitives", @@ -2778,7 +2778,7 @@ dependencies = [ [[package]] name = "manta-signer" -version = "0.3.0" +version = "0.4.0" dependencies = [ "ark-serialize", "async-std",