mirror of
https://github.com/jwinterm/grin-wallet.git
synced 2026-10-17 15:21:39 +02:00
* Add support for sending compact slates (#366) * WIP add support for sending compact slates * add repopulate_tx function to internal API * first pass at compacted slate working * move slate compaction to separate function * test fixes * support compact slate inits in invoice workflow * add compress flags to send and invoice * attempting to remove is_compact and assume all V4 slates begin as compact * attempting to calculate offsets when full tx data isn't available * update calc_commit to use participant blind data * update doctests for compact slates * start to remove unneeded fields from serialization * make num_participants optional * remove other_version from slate * use grin master branch * remove message field * lock height assumed to be 0 if it doesn't exist * don't serialise receiver signature when null * don't serialize payment_info if not needed * remove participant id from participant info * add note on id field * fix finalize and receive doctests * finalize_tx tests, init_send_tx tests * doctests for process_invoice_tx, retrieve_tx, tx_lock_outputs * finished test changes * update from grin master * rebuild PR from diff (#380) * recreate PR from diff (#381) * serialize tx struct into top level coms object (#382) * remove height (#383) * Add State Slate (#384) * add state field to slate and SlateV4 * set slate state at each transaction stage, add check to tests * serialize slate status properly * V4 Slate field tweaks (#386) * various tweaks to V4 slate * field renaming * serialize slate v4 ID as base64 (#387) * remove amount and fee where not needed (#388) * Final Changes for compact Slate (#389) * add tests for all types of file output, remove message args * default range proof serialization * shorten output features serialization * rename payment proof fields in slate v4 * v4 payment proof serialization * Binary Slates (#385) * start test implementation * add experimental binary serialization to slate * serialize id * serialize fields that can be skipped as a separate struct * factor out sigs serialization * clean up sigs and coms serialization * completed v4 bin serialization * add manual de/ser traits for V4 bin slate * add simple byte array serializer * complete wiring in of bin slate serialization * clarify comment * clarify comment * update version * test output dir name fix * update slate v4 change description * add binary output to command line * Remove unneeded signature data during S2 and I2 stages (#390) * remove unneeded return signature data during S2 * remove unneeded sig data from I2 * Doctest Fixes for compact slate branch (#392) * begin to fix doctests * more doctest fixes * fix receive_tx * update get_stored_tx to accept an UUID instead of a tx object, and operate on a raw Transaction object (#394) * Fixes to async transaction posting (#395) * unstash post_tx changes * add offset during S3 and I3 * Revert slate id serialization to hex-string uuid (#396) * update from master (#397) * v3.x.x - v4.0.0 wallet compatibility fixes (#398) * changes to support http sending to v3 wallets * sending via http/tor TO 3.0.0 wallet works * receiving FROM 3.0.0 wallets works over http/tor * output converted V3 slate when needed * paying invoices from 3.0.0 wallets working * handle all participant info in slate states * sending and receiving standard file transactions between v3 and 4 wallets confirmed working * all file-based workflows working * fixes resulting from tests * remove reminder warnings * remove lock_height, add kernel_features + arguments (#399) * grin-wallet master now building against grin master (#402) (#403) Co-authored-by: Antioch Peverell <apeverell@protonmail.com> * Enhanced offset creation (#407) * initial tests reworking offset creation * invoice flow fixing + tests * further test fixes * change offset name in v4 slate, base64 serialize * logic optimisation * changes based on review feedback Co-authored-by: Antioch Peverell <apeverell@protonmail.com>
284 lines
8.0 KiB
Rust
284 lines
8.0 KiB
Rust
// Copyright 2019 The Grin Developers
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use crate::api;
|
|
use crate::chain;
|
|
use crate::chain::Chain;
|
|
use crate::core;
|
|
use crate::core::core::{Output, OutputFeatures, OutputIdentifier, Transaction, TxKernel};
|
|
use crate::core::{consensus, global, pow};
|
|
use crate::keychain;
|
|
use crate::libwallet;
|
|
use crate::libwallet::api_impl::{foreign, owner};
|
|
use crate::libwallet::{
|
|
BlockFees, InitTxArgs, NodeClient, WalletInfo, WalletInst, WalletLCProvider,
|
|
};
|
|
use crate::util::secp::key::SecretKey;
|
|
use crate::util::secp::pedersen;
|
|
use crate::util::Mutex;
|
|
use chrono::Duration;
|
|
use std::sync::Arc;
|
|
use std::thread;
|
|
|
|
mod testclient;
|
|
|
|
pub use self::{testclient::LocalWalletClient, testclient::WalletProxy};
|
|
|
|
/// Get an output from the chain locally and present it back as an API output
|
|
fn get_output_local(chain: &chain::Chain, commit: &pedersen::Commitment) -> Option<api::Output> {
|
|
let outputs = [
|
|
OutputIdentifier::new(OutputFeatures::Plain, commit),
|
|
OutputIdentifier::new(OutputFeatures::Coinbase, commit),
|
|
];
|
|
|
|
for x in outputs.iter() {
|
|
if chain.get_unspent(&x).unwrap().is_some() {
|
|
let block_height = chain.get_header_for_output(&x).unwrap().height;
|
|
let output_pos = chain.get_output_pos(&x.commit).unwrap_or(0);
|
|
return Some(api::Output::new(&commit, block_height, output_pos));
|
|
}
|
|
}
|
|
None
|
|
}
|
|
|
|
/// Get a kernel from the chain locally
|
|
fn get_kernel_local(
|
|
chain: Arc<chain::Chain>,
|
|
excess: &pedersen::Commitment,
|
|
min_height: Option<u64>,
|
|
max_height: Option<u64>,
|
|
) -> Option<api::LocatedTxKernel> {
|
|
chain
|
|
.get_kernel_height(&excess, min_height, max_height)
|
|
.unwrap()
|
|
.map(|(tx_kernel, height, mmr_index)| api::LocatedTxKernel {
|
|
tx_kernel,
|
|
height,
|
|
mmr_index,
|
|
})
|
|
}
|
|
|
|
/// get output listing traversing pmmr from local
|
|
fn get_outputs_by_pmmr_index_local(
|
|
chain: Arc<chain::Chain>,
|
|
start_index: u64,
|
|
end_index: Option<u64>,
|
|
max: u64,
|
|
) -> api::OutputListing {
|
|
let outputs = chain
|
|
.unspent_outputs_by_pmmr_index(start_index, max, end_index)
|
|
.unwrap();
|
|
api::OutputListing {
|
|
last_retrieved_index: outputs.0,
|
|
highest_index: outputs.1,
|
|
outputs: outputs
|
|
.2
|
|
.iter()
|
|
.map(|x| {
|
|
api::OutputPrintable::from_output(x, chain.clone(), None, true, false).unwrap()
|
|
})
|
|
.collect(),
|
|
}
|
|
}
|
|
|
|
/// get output listing in a given block range
|
|
fn height_range_to_pmmr_indices_local(
|
|
chain: Arc<chain::Chain>,
|
|
start_index: u64,
|
|
end_index: Option<u64>,
|
|
) -> api::OutputListing {
|
|
let indices = chain
|
|
.block_height_range_to_pmmr_indices(start_index, end_index)
|
|
.unwrap();
|
|
api::OutputListing {
|
|
last_retrieved_index: indices.0,
|
|
highest_index: indices.1,
|
|
outputs: vec![],
|
|
}
|
|
}
|
|
|
|
fn create_block_with_reward(
|
|
chain: &Chain,
|
|
prev: core::core::BlockHeader,
|
|
txs: Vec<&Transaction>,
|
|
reward_output: Output,
|
|
reward_kernel: TxKernel,
|
|
) -> core::core::Block {
|
|
let next_header_info = consensus::next_difficulty(1, chain.difficulty_iter().unwrap());
|
|
let mut b = core::core::Block::new(
|
|
&prev,
|
|
txs.into_iter().cloned().collect(),
|
|
next_header_info.clone().difficulty,
|
|
(reward_output, reward_kernel),
|
|
)
|
|
.unwrap();
|
|
b.header.timestamp = prev.timestamp + Duration::seconds(60);
|
|
b.header.pow.secondary_scaling = next_header_info.secondary_scaling;
|
|
chain.set_txhashset_roots(&mut b).unwrap();
|
|
pow::pow_size(
|
|
&mut b.header,
|
|
next_header_info.difficulty,
|
|
global::proofsize(),
|
|
global::min_edge_bits(),
|
|
)
|
|
.unwrap();
|
|
b
|
|
}
|
|
|
|
/// Adds a block with a given reward to the chain and mines it
|
|
pub fn add_block_with_reward(
|
|
chain: &Chain,
|
|
txs: Vec<&Transaction>,
|
|
reward_output: Output,
|
|
reward_kernel: TxKernel,
|
|
) {
|
|
let prev = chain.head_header().unwrap();
|
|
let block = create_block_with_reward(chain, prev, txs, reward_output, reward_kernel);
|
|
process_block(chain, block);
|
|
}
|
|
|
|
/// adds a reward output to a wallet, includes that reward in a block
|
|
/// and return the block
|
|
pub fn create_block_for_wallet<'a, L, C, K>(
|
|
chain: &Chain,
|
|
prev: core::core::BlockHeader,
|
|
txs: Vec<&Transaction>,
|
|
wallet: Arc<Mutex<Box<dyn WalletInst<'a, L, C, K> + 'a>>>,
|
|
keychain_mask: Option<&SecretKey>,
|
|
) -> Result<core::core::Block, libwallet::Error>
|
|
where
|
|
L: WalletLCProvider<'a, C, K>,
|
|
C: NodeClient + 'a,
|
|
K: keychain::Keychain + 'a,
|
|
{
|
|
// build block fees
|
|
let fee_amt = txs.iter().map(|tx| tx.fee()).sum();
|
|
let block_fees = BlockFees {
|
|
fees: fee_amt,
|
|
key_id: None,
|
|
height: prev.height + 1,
|
|
};
|
|
// build coinbase (via api) and add block
|
|
let coinbase_tx = {
|
|
let mut w_lock = wallet.lock();
|
|
let w = w_lock.lc_provider()?.wallet_inst()?;
|
|
foreign::build_coinbase(&mut **w, keychain_mask, &block_fees, false)?
|
|
};
|
|
let block = create_block_with_reward(chain, prev, txs, coinbase_tx.output, coinbase_tx.kernel);
|
|
Ok(block)
|
|
}
|
|
|
|
/// adds a reward output to a wallet, includes that reward in a block, mines
|
|
/// the block and adds it to the chain, with option transactions included.
|
|
/// Helpful for building up precise wallet balances for testing.
|
|
pub fn award_block_to_wallet<'a, L, C, K>(
|
|
chain: &Chain,
|
|
txs: Vec<&Transaction>,
|
|
wallet: Arc<Mutex<Box<dyn WalletInst<'a, L, C, K> + 'a>>>,
|
|
keychain_mask: Option<&SecretKey>,
|
|
) -> Result<(), libwallet::Error>
|
|
where
|
|
L: WalletLCProvider<'a, C, K>,
|
|
C: NodeClient + 'a,
|
|
K: keychain::Keychain + 'a,
|
|
{
|
|
let prev = chain.head_header().unwrap();
|
|
let block = create_block_for_wallet(chain, prev, txs, wallet, keychain_mask)?;
|
|
process_block(chain, block);
|
|
Ok(())
|
|
}
|
|
|
|
pub fn process_block(chain: &Chain, block: core::core::Block) {
|
|
chain.process_block(block, chain::Options::MINE).unwrap();
|
|
chain.validate(false).unwrap();
|
|
}
|
|
|
|
/// Award a blocks to a wallet directly
|
|
pub fn award_blocks_to_wallet<'a, L, C, K>(
|
|
chain: &Chain,
|
|
wallet: Arc<Mutex<Box<dyn WalletInst<'a, L, C, K> + 'a>>>,
|
|
keychain_mask: Option<&SecretKey>,
|
|
number: usize,
|
|
pause_between: bool,
|
|
) -> Result<(), libwallet::Error>
|
|
where
|
|
L: WalletLCProvider<'a, C, K>,
|
|
C: NodeClient + 'a,
|
|
K: keychain::Keychain + 'a,
|
|
{
|
|
for _ in 0..number {
|
|
award_block_to_wallet(chain, vec![], wallet.clone(), keychain_mask)?;
|
|
if pause_between {
|
|
thread::sleep(std::time::Duration::from_millis(100));
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// send an amount to a destination
|
|
pub fn send_to_dest<'a, L, C, K>(
|
|
wallet: Arc<Mutex<Box<dyn WalletInst<'a, L, C, K>>>>,
|
|
keychain_mask: Option<&SecretKey>,
|
|
client: LocalWalletClient,
|
|
dest: &str,
|
|
amount: u64,
|
|
test_mode: bool,
|
|
) -> Result<(), libwallet::Error>
|
|
where
|
|
L: WalletLCProvider<'a, C, K>,
|
|
C: NodeClient + 'a,
|
|
K: keychain::Keychain + 'a,
|
|
{
|
|
let slate = {
|
|
let mut w_lock = wallet.lock();
|
|
let w = w_lock.lc_provider()?.wallet_inst()?;
|
|
let args = InitTxArgs {
|
|
src_acct_name: None,
|
|
amount,
|
|
minimum_confirmations: 2,
|
|
max_outputs: 500,
|
|
num_change_outputs: 1,
|
|
selection_strategy_is_use_all: true,
|
|
..Default::default()
|
|
};
|
|
let slate_i = owner::init_send_tx(&mut **w, keychain_mask, args, test_mode)?;
|
|
let slate = client.send_tx_slate_direct(dest, &slate_i)?;
|
|
owner::tx_lock_outputs(&mut **w, keychain_mask, &slate)?;
|
|
owner::finalize_tx(&mut **w, keychain_mask, &slate)?
|
|
};
|
|
let client = {
|
|
let mut w_lock = wallet.lock();
|
|
let w = w_lock.lc_provider()?.wallet_inst()?;
|
|
w.w2n_client().clone()
|
|
};
|
|
owner::post_tx(&client, slate.tx_or_err()?, false)?; // mines a block
|
|
Ok(())
|
|
}
|
|
|
|
/// get wallet info totals
|
|
pub fn wallet_info<'a, L, C, K>(
|
|
wallet: Arc<Mutex<Box<dyn WalletInst<'a, L, C, K>>>>,
|
|
keychain_mask: Option<&SecretKey>,
|
|
) -> Result<WalletInfo, libwallet::Error>
|
|
where
|
|
L: WalletLCProvider<'a, C, K>,
|
|
C: NodeClient + 'a,
|
|
K: keychain::Keychain + 'a,
|
|
{
|
|
let (wallet_refreshed, wallet_info) =
|
|
owner::retrieve_summary_info(wallet, keychain_mask, &None, true, 1)?;
|
|
assert!(wallet_refreshed);
|
|
Ok(wallet_info)
|
|
}
|