mirror of
https://github.com/mimblewimble/grin-wallet.git
synced 2025-02-08 04:11:08 +03:00
* Simple contracts restructured v3 (#675) * Add prototype contract implementation Lacks: - Payment proofs (add early payment proofs) - Tests - Better structure * Separate contract utilities * Simplify the main setup/sign code flow * Remove commented initial_sec_key assignment * Simplify sign::compute function * Add logic for "removal" of secret keys from the context * Further simplify a bit sign and setup * No need for mutable context when adding outputs * Refactor the commented code (lol) * Refactor a bit * tmp --------- Co-authored-by: oryhp <gtrphyro@gmail.com> * contract test fixes (#676) * [Contracts] Experimental Slate v5 (#677) * beginning to add and modify slate version 5 * completion of conversions from V5 to V4 Slate * timestamp and memo fields * upgrade/downgrade serialization of v5 slates * add v5 binary slate versions + start of tests * add bin slate ser/deser to tests * ensure serialization of timestamp always excludes milliseconds * start to update v5 tests, update v5 documentation * add fn to generate populated internal slate for conversion testing * add basic tests to convert all slate versions * update * commit cargo.lock * [WIP] [Contracts] Early payment proofs (#681) * add types and beginnings of signature utils * add proof serialization * serialisation of proof data + signature operation * add serialization type for invoice proof + separate bin wrapper version * add witness data + serializion to invoice payment proof, insert verfication functions in place in order to begin verification testing * tests and infrastructure in place for validation * verification of promise sig * added verification of promise signature, infrastructure up to the point where a signature must be subtracted * attempting to figure out differences between recipient nonce that's getting stored and calculated recipient nonce * implementation of witness verification function, retrieve relevant values and re-validate derived recipient partial signature * move stored portion of invoice proof into core types for storage, need to rename invoice proof * define/refine the stored portion of payment proofs type 2? * Folding all proof data into tx log entry storage * back to importing master * remove cargo files from diffs * remove a lot of extra debug output * return proof witness as part of proof retrieval, define json serialization of invoice proof + witness fields * finish adding verification steps to foreign API * remove redundant promise sig field * move lcation of sign/verify calls * Replace Azure Pipelines with Github Actions (#688) * Update CI Badge on README.MD (#690) * Trigger CI on push and pull request (#693) * Update versioning to 5.2.0-beta.1 against grin 5.2.0-beta.3 (#691) * update versioning to 5.2.0-beta.1 against grin 5.2.0-beta.3 * tweak for CI trigger --------- Co-authored-by: Quentin Le Sceller <q.lesceller@gmail.com> --------- Co-authored-by: Quentin Le Sceller <q.lesceller@gmail.com> * fix Cargo.lock * Contracts - Test fixes + warning cleanups (#694) * clean up warnings in libwallet crate * clean up warnings in controller crate * update all contract tests with awareness of new proof structure * added explicit payment proof tests for both rsr and srs (#695) * Basic mwmixnet send (#696) * integrating onion library * updates and changes to support newly included mwmixnet types * add (incorrect) owner api function * turn off test for now * switch working grin branch to master * fix doctests for build * update cargo lock in attempt to fix croaring build on CI server * update cargo lock with upstream thiserror crate * update test dependency for croaring * [Contracts] Add self spend transaction state (#697) * Add self spend transaction state * subtle errors with output states and tx lookups - fixes * [Contracts] Slatepack v5 Deserialization fix (#698) * add V5 deserialization test + fixes * clarify comment * upwrap fix during v4 deserialization * further unwrap removal * update cargo lock, use latest grin packages * addition of self-spend cancel + tests (#699) * add tests + legacy self send cancel (#702) * [Contracts] Cancel self-spend TX Pt. 2 (#703) * add tests + legacy self send cancel * add missing file * Update grin to latest master, change versioning label to include contracts (#712) * Add owner_api_listen_interface as hidden configuration field (#714) * updates for rust 1.80 * updates for rust 1.80 --------- Co-authored-by: oryhp <gtrphyro@gmail.com> Co-authored-by: Quentin Le Sceller <q.lesceller@gmail.com>
103 lines
3.5 KiB
Rust
103 lines
3.5 KiB
Rust
// Copyright 2022 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.
|
|
|
|
//! Test a wallet doing contract early lock when using --add-outputs
|
|
// #[macro_use]
|
|
extern crate grin_wallet_controller as wallet;
|
|
extern crate grin_wallet_impls as impls;
|
|
extern crate log;
|
|
|
|
use grin_wallet_libwallet as libwallet;
|
|
|
|
use grin_core::consensus;
|
|
use libwallet::contract::my_fee_contribution;
|
|
use libwallet::contract::types::{ContractNewArgsAPI, ContractSetupArgsAPI};
|
|
use libwallet::{OutputStatus, Slate, SlateState};
|
|
use std::sync::atomic::Ordering;
|
|
use std::thread;
|
|
use std::time::Duration;
|
|
|
|
#[macro_use]
|
|
mod common;
|
|
use common::{clean_output_dir, create_wallets, setup};
|
|
|
|
/// contract new with --add-outputs
|
|
fn contract_early_lock_tx_impl(test_dir: &'static str) -> Result<(), libwallet::Error> {
|
|
// create a single wallet and mine 5 blocks
|
|
let (wallets, _chain, stopper, _bh) =
|
|
create_wallets(vec![vec![("default", 5)]], test_dir).unwrap();
|
|
let send_wallet = wallets[0].0.clone();
|
|
let send_mask = wallets[0].1.as_ref();
|
|
|
|
// Confirm all our outputs are unspent
|
|
wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| {
|
|
let (_, commits) = api.retrieve_outputs(m, true, false, None)?;
|
|
for commit in commits.iter() {
|
|
assert_eq!(commit.output.status, OutputStatus::Unspent);
|
|
}
|
|
Ok(())
|
|
})?;
|
|
|
|
let mut slate = Slate::blank(0, false); // this gets overriden below
|
|
|
|
// Call contract 'new' with --add-outputs
|
|
wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| {
|
|
// Send wallet inititates a standard transaction with --send=80
|
|
let args = &ContractNewArgsAPI {
|
|
setup_args: ContractSetupArgsAPI {
|
|
net_change: Some(-80_000_000_000),
|
|
num_participants: 2,
|
|
add_outputs: true,
|
|
..Default::default()
|
|
},
|
|
..Default::default()
|
|
};
|
|
slate = api.contract_new(m, args)?;
|
|
Ok(())
|
|
})?;
|
|
assert_eq!(slate.state, SlateState::Standard1);
|
|
|
|
// Assert we locked 2 inputs and prepared an unconfirmed change output
|
|
wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| {
|
|
let (_, commits) = api.retrieve_outputs(m, true, false, None)?;
|
|
// we locked the first two coinbase outputs
|
|
assert_eq!(commits[0].output.status, OutputStatus::Locked);
|
|
assert_eq!(commits[1].output.status, OutputStatus::Locked);
|
|
// we added a new unconfirmed change output
|
|
let new_output_idx = commits.len() - 1;
|
|
assert_eq!(
|
|
commits[new_output_idx].output.status,
|
|
OutputStatus::Unconfirmed
|
|
);
|
|
assert_eq!(
|
|
commits[new_output_idx].output.value,
|
|
2 * consensus::REWARD - 80_000_000_000 - my_fee_contribution(2, 1, 1, 2)?.fee()
|
|
);
|
|
Ok(())
|
|
})?;
|
|
|
|
// let logging finish
|
|
stopper.store(false, Ordering::Relaxed);
|
|
thread::sleep(Duration::from_millis(200));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn wallet_contract_early_lock_tx() -> Result<(), libwallet::Error> {
|
|
let test_dir = "test_output/contract_early_lock_tx";
|
|
setup(test_dir);
|
|
contract_early_lock_tx_impl(test_dir)?;
|
|
clean_output_dir(test_dir);
|
|
Ok(())
|
|
}
|