mirror of
https://github.com/mimblewimble/grin.git
synced 2025-02-01 17:01:09 +03:00
1609b041b1
* create 2.0.0 branch * fix humansize version * update grin.yml version * PoW HardFork (#2866) * allow version 2 blocks for next 6 months * add cuckarood.rs with working tests * switch cuckaroo to cuckarood at right heights * reorder to reduce conditions * remove _ prefix on used args; fix typo * Make Valid Header Version dependant on ChainType * Rustfmt * Add tests, uncomment header v2 * Rustfmt * Add FLOONET_FIRST_HARD_FORK height and simplify logic * assume floonet stays closer to avg 60s block time * move floonet hf forward by half a day * update version in new block when previous no longer valid * my next commit:-) * micro optimization * Support new Bulletproof rewind scheme (#2848) * Update keychain with new rewind scheme * Refactor: proof builder trait * Update tests, cleanup * rustfmt * Move conversion of SwitchCommitmentType * Add proof build trait to tx builders * Cache hashes in proof builders * Proof builder tests * Add ViewKey struct * Fix some warnings * Zeroize proof builder secrets on drop * Modify mine_block to use wallet V2 API (#2892) * update mine_block to use V2 wallet API * rustfmt * Add version endpoint to node API, rename pool/push (#2897) * add node version API, tweak pool/push parameter * rustfmt * Upate version api call (#2899) * Update version number for next (potential) release * zeroize: Upgrade to v0.9 (#2914) * zeroize: Upgrade to v0.9 * missed Cargo.lock * [PENDING APPROVAL] put phase outs of C32 and beyond on hold (#2714) * put phase outs of C32 and beyond on hold * update tests for phaseouts on hold * Don't wait for p2p-server thread (#2917) Currently p2p.stop() stops and wait for all peers to exit, that's basically all we need. However we also run a TCP listener in this thread which is blocked on `accept` most of the time. We do an attempt to stop it but it would work only if we get an incoming connection during the shutdown, which is a week guarantee. This fix remove joining to p2p-server thread, it stops all peers and makes an attempt to stop the listener. Fixes [#2906] * rustfmt
132 lines
3.5 KiB
Rust
132 lines
3.5 KiB
Rust
// Copyright 2018 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.
|
|
|
|
//! Common test functions
|
|
|
|
use crate::keychain::{Identifier, Keychain};
|
|
use grin_core::core::{
|
|
block::{Block, BlockHeader},
|
|
Transaction,
|
|
};
|
|
use grin_core::libtx::{
|
|
build::{self, input, output, with_fee},
|
|
proof::{ProofBuild, ProofBuilder},
|
|
reward,
|
|
};
|
|
use grin_core::pow::Difficulty;
|
|
use grin_keychain as keychain;
|
|
|
|
// utility producing a transaction with 2 inputs and a single outputs
|
|
pub fn tx2i1o() -> Transaction {
|
|
let keychain = keychain::ExtKeychain::from_random_seed(false).unwrap();
|
|
let builder = ProofBuilder::new(&keychain);
|
|
let key_id1 = keychain::ExtKeychain::derive_key_id(1, 1, 0, 0, 0);
|
|
let key_id2 = keychain::ExtKeychain::derive_key_id(1, 2, 0, 0, 0);
|
|
let key_id3 = keychain::ExtKeychain::derive_key_id(1, 3, 0, 0, 0);
|
|
|
|
build::transaction(
|
|
vec![
|
|
input(10, key_id1),
|
|
input(11, key_id2),
|
|
output(19, key_id3),
|
|
with_fee(2),
|
|
],
|
|
&keychain,
|
|
&builder,
|
|
)
|
|
.unwrap()
|
|
}
|
|
|
|
// utility producing a transaction with a single input and output
|
|
pub fn tx1i1o() -> Transaction {
|
|
let keychain = keychain::ExtKeychain::from_random_seed(false).unwrap();
|
|
let builder = ProofBuilder::new(&keychain);
|
|
let key_id1 = keychain::ExtKeychain::derive_key_id(1, 1, 0, 0, 0);
|
|
let key_id2 = keychain::ExtKeychain::derive_key_id(1, 2, 0, 0, 0);
|
|
|
|
build::transaction(
|
|
vec![input(5, key_id1), output(3, key_id2), with_fee(2)],
|
|
&keychain,
|
|
&builder,
|
|
)
|
|
.unwrap()
|
|
}
|
|
|
|
// utility producing a transaction with a single input
|
|
// and two outputs (one change output)
|
|
// Note: this tx has an "offset" kernel
|
|
pub fn tx1i2o() -> Transaction {
|
|
let keychain = keychain::ExtKeychain::from_random_seed(false).unwrap();
|
|
let builder = ProofBuilder::new(&keychain);
|
|
let key_id1 = keychain::ExtKeychain::derive_key_id(1, 1, 0, 0, 0);
|
|
let key_id2 = keychain::ExtKeychain::derive_key_id(1, 2, 0, 0, 0);
|
|
let key_id3 = keychain::ExtKeychain::derive_key_id(1, 3, 0, 0, 0);
|
|
|
|
build::transaction(
|
|
vec![
|
|
input(6, key_id1),
|
|
output(3, key_id2),
|
|
output(1, key_id3),
|
|
with_fee(2),
|
|
],
|
|
&keychain,
|
|
&builder,
|
|
)
|
|
.unwrap()
|
|
}
|
|
|
|
// utility to create a block without worrying about the key or previous
|
|
// header
|
|
pub fn new_block<K, B>(
|
|
txs: Vec<&Transaction>,
|
|
keychain: &K,
|
|
builder: &B,
|
|
previous_header: &BlockHeader,
|
|
key_id: &Identifier,
|
|
) -> Block
|
|
where
|
|
K: Keychain,
|
|
B: ProofBuild,
|
|
{
|
|
let fees = txs.iter().map(|tx| tx.fee()).sum();
|
|
let reward_output = reward::output(keychain, builder, &key_id, fees, false).unwrap();
|
|
Block::new(
|
|
&previous_header,
|
|
txs.into_iter().cloned().collect(),
|
|
Difficulty::min(),
|
|
reward_output,
|
|
)
|
|
.unwrap()
|
|
}
|
|
|
|
// utility producing a transaction that spends an output with the provided
|
|
// value and blinding key
|
|
pub fn txspend1i1o<K, B>(
|
|
v: u64,
|
|
keychain: &K,
|
|
builder: &B,
|
|
key_id1: Identifier,
|
|
key_id2: Identifier,
|
|
) -> Transaction
|
|
where
|
|
K: Keychain,
|
|
B: ProofBuild,
|
|
{
|
|
build::transaction(
|
|
vec![input(v, key_id1), output(3, key_id2), with_fee(2)],
|
|
keychain,
|
|
builder,
|
|
)
|
|
.unwrap()
|
|
}
|