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

[r2r] Allow passing Zcash params file path to activation request #1538

Merged
merged 7 commits into from
Nov 10, 2022
Merged

[r2r] Allow passing Zcash params file path to activation request #1538

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3db76a3
zcash_params_path added in activation params
laruh Nov 9, 2022
61177a1
Merge remote-tracking branch 'origin/dev' into passing_Zcash_params_f…
laruh Nov 9, 2022
4d45bf2
Merge remote-tracking branch 'origin/dev' into passing_Zcash_params_f…
laruh Nov 9, 2022
d92f8d9
remove log
laruh Nov 9, 2022
fd8b045
add async_blocking
laruh Nov 10, 2022
6d21964
Merge remote-tracking branch 'origin/dev' into passing_Zcash_params_f…
laruh Nov 10, 2022
badb919
async_blocking sightly changed
laruh Nov 10, 2022
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
23 changes: 20 additions & 3 deletions mm2src/coins/z_coin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ const DEX_FEE_OVK: OutgoingViewingKey = OutgoingViewingKey([7; 32]);
const DEX_FEE_Z_ADDR: &str = "zs1rp6426e9r6jkq2nsanl66tkd34enewrmr0uvj0zelhkcwmsy0uvxz2fhm9eu9rl3ukxvgzy2v9f";
const TRANSACTIONS_TABLE: &str = "transactions";
const BLOCKS_TABLE: &str = "blocks";
const SAPLING_SPEND_NAME: &str = "sapling-spend.params";
const SAPLING_OUTPUT_NAME: &str = "sapling-output.params";

#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct ZcoinConsensusParams {
Expand Down Expand Up @@ -700,6 +702,7 @@ pub struct ZcoinActivationParams {
pub mode: ZcoinRpcMode,
pub required_confirmations: Option<u64>,
pub requires_notarization: Option<bool>,
pub zcash_params_path: Option<String>,
}

pub async fn z_coin_from_conf_and_params(
Expand Down Expand Up @@ -763,9 +766,23 @@ impl<'a> UtxoCoinWithIguanaPrivKeyBuilder for ZCoinBuilder<'a> {
.expect("DEX_FEE_Z_ADDR is a valid z-address")
.expect("DEX_FEE_Z_ADDR is a valid z-address");

let z_tx_prover = async_blocking(LocalTxProver::with_default_location)
.await
.or_mm_err(|| ZCoinBuildError::ZCashParamsNotFound)?;
let z_tx_prover = match &self.z_coin_params.zcash_params_path {
None => async_blocking(LocalTxProver::with_default_location)
.await
.or_mm_err(|| ZCoinBuildError::ZCashParamsNotFound)?,
Some(file_path) => {
let path = PathBuf::from(file_path);
let (spend_path, output_path) = if path.exists() {
(path.join(SAPLING_SPEND_NAME), path.join(SAPLING_OUTPUT_NAME))
} else {
return MmError::err(ZCoinBuildError::ZCashParamsNotFound);
};
if !(spend_path.exists() && output_path.exists()) {
return MmError::err(ZCoinBuildError::ZCashParamsNotFound);
}
LocalTxProver::new(&spend_path, &output_path)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As there are FS operations and LocalTxProver::new can take significant time to load, please wrap this entire code block into async_blocking.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I see.
Done

},
};

let my_z_addr_encoded = encode_payment_address(
self.protocol_info.consensus_params.hrp_sapling_payment_address(),
Expand Down