Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #513 from antiochp/unspent_commitment

Browse source 
get_unspent api changed to take a commitment directly
This commit is contained in:
Antioch Peverell 2020-09-01 11:29:40 +01:00 committed by GitHub
commit 24f35a22bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -1171,7 +1171,7 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]] [[package]]
name = "grin_api" name = "grin_api"
version = "4.1.0-alpha.1" version = "4.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin#34adaf797e9cc73b38cc0e5abcfd1969e6e21eac" source = "git+https://github.com/mimblewimble/grin#caa6b8c747788e32953950a2dfd0a7c1e5d29cd2"
dependencies = [ dependencies = [
"bytes", "bytes",
"easy-jsonrpc-mw", "easy-jsonrpc-mw",
@ -1204,7 +1204,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_chain" name = "grin_chain"
version = "4.1.0-alpha.1" version = "4.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin#34adaf797e9cc73b38cc0e5abcfd1969e6e21eac" source = "git+https://github.com/mimblewimble/grin#caa6b8c747788e32953950a2dfd0a7c1e5d29cd2"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"bitflags 1.2.1", "bitflags 1.2.1",
@ -1228,7 +1228,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_core" name = "grin_core"
version = "4.1.0-alpha.1" version = "4.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin#34adaf797e9cc73b38cc0e5abcfd1969e6e21eac" source = "git+https://github.com/mimblewimble/grin#caa6b8c747788e32953950a2dfd0a7c1e5d29cd2"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@ -1254,7 +1254,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_keychain" name = "grin_keychain"
version = "4.1.0-alpha.1" version = "4.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin#34adaf797e9cc73b38cc0e5abcfd1969e6e21eac" source = "git+https://github.com/mimblewimble/grin#caa6b8c747788e32953950a2dfd0a7c1e5d29cd2"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@ -1276,7 +1276,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_p2p" name = "grin_p2p"
version = "4.1.0-alpha.1" version = "4.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin#34adaf797e9cc73b38cc0e5abcfd1969e6e21eac" source = "git+https://github.com/mimblewimble/grin#caa6b8c747788e32953950a2dfd0a7c1e5d29cd2"
dependencies = [ dependencies = [
"bitflags 1.2.1", "bitflags 1.2.1",
"chrono", "chrono",
@ -1297,7 +1297,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_pool" name = "grin_pool"
version = "4.1.0-alpha.1" version = "4.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin#34adaf797e9cc73b38cc0e5abcfd1969e6e21eac" source = "git+https://github.com/mimblewimble/grin#caa6b8c747788e32953950a2dfd0a7c1e5d29cd2"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"chrono", "chrono",
@ -1331,7 +1331,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_store" name = "grin_store"
version = "4.1.0-alpha.1" version = "4.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin#34adaf797e9cc73b38cc0e5abcfd1969e6e21eac" source = "git+https://github.com/mimblewimble/grin#caa6b8c747788e32953950a2dfd0a7c1e5d29cd2"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"croaring-mw", "croaring-mw",
@ -1351,7 +1351,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_util" name = "grin_util"
version = "4.1.0-alpha.1" version = "4.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin#34adaf797e9cc73b38cc0e5abcfd1969e6e21eac" source = "git+https://github.com/mimblewimble/grin#caa6b8c747788e32953950a2dfd0a7c1e5d29cd2"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"base64 0.12.3", "base64 0.12.3",

17
impls/src/test_framework/mod.rs
View file

@ -16,7 +16,7 @@ use crate::api;
use crate::chain; use crate::chain;
use crate::chain::Chain; use crate::chain::Chain;
use crate::core; use crate::core;
use crate::core::core::{Output, OutputFeatures, OutputIdentifier, Transaction, TxKernel}; use crate::core::core::{Output, Transaction, TxKernel};
use crate::core::{consensus, global, pow}; use crate::core::{consensus, global, pow};
use crate::keychain; use crate::keychain;
use crate::libwallet; use crate::libwallet;
@ -36,19 +36,12 @@ mod testclient;
pub use self::{testclient::LocalWalletClient, testclient::WalletProxy}; pub use self::{testclient::LocalWalletClient, testclient::WalletProxy};
/// Get an output from the chain locally and present it back as an API output /// 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> { fn get_output_local(chain: &chain::Chain, commit: pedersen::Commitment) -> Option<api::Output> {
let outputs = [ if chain.get_unspent(commit).unwrap().is_some() {
OutputIdentifier::new(OutputFeatures::Plain, commit), let block_height = chain.get_header_for_output(commit).unwrap().height;
OutputIdentifier::new(OutputFeatures::Coinbase, commit), let output_pos = chain.get_output_pos(&commit).unwrap_or(0);
];
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)); return Some(api::Output::new(&commit, block_height, output_pos));
} }
}
None None
} }

2
impls/src/test_framework/testclient.rs
View file

@ -276,7 +276,7 @@ where
} }
let c = util::from_hex(&o_str).unwrap(); let c = util::from_hex(&o_str).unwrap();
let commit = Commitment::from_vec(c); let commit = Commitment::from_vec(c);
let out = super::get_output_local(&self.chain.clone(), &commit); let out = super::get_output_local(&self.chain.clone(), commit);
if let Some(o) = out { if let Some(o) = out {
outputs.push(o); outputs.push(o);
} }