DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

desprout

Browse Source
This commit is contained in:
Duke Leto
2020-06-07 16:10:49 -04:00
parent 0c118eb129
commit b0ea67d5be
5 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile.am
View File

@@ -1,3 +1,5 @@
# Copyright 2019-2020 The Hush developers
DIST_SUBDIRS = secp256k1 univalue cryptoconditions DIST_SUBDIRS = secp256k1 univalue cryptoconditions
AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(SAN_LDFLAGS) $(HARDENED_LDFLAGS) AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(SAN_LDFLAGS) $(HARDENED_LDFLAGS)
@@ -186,7 +188,6 @@ BITCOIN_CORE_H = \
prevector.h \ prevector.h \
primitives/block.h \ primitives/block.h \
primitives/transaction.h \ primitives/transaction.h \
primitives/nonce.h \
protocol.h \ protocol.h \
pubkey.h \ pubkey.h \
random.h \ random.h \
@@ -486,7 +487,7 @@ libbitcoin_cli_a_SOURCES = \
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
# #
# bitcoind binary # # komodod binary #
komodod_SOURCES = bitcoind.cpp komodod_SOURCES = bitcoind.cpp
komodod_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) komodod_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
komodod_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) komodod_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
@@ -545,7 +546,7 @@ if TARGET_DARWIN
komodod_LDFLAGS += -static-libgcc komodod_LDFLAGS += -static-libgcc
endif endif
# bitcoin-cli binary # # komodo-cli binary #
komodo_cli_SOURCES = bitcoin-cli.cpp komodo_cli_SOURCES = bitcoin-cli.cpp
komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
@@ -593,7 +594,7 @@ wallet_utility_LDADD = \
$(LIBCRYPTOCONDITIONS) $(LIBCRYPTOCONDITIONS)
endif endif
# zcash-tx binary # # komodo-tx binary #
komodo_tx_SOURCES = komodo-tx.cpp komodo_tx_SOURCES = komodo-tx.cpp
komodo_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) komodo_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
komodo_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) komodo_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
@@ -603,7 +604,6 @@ if TARGET_WINDOWS
komodo_tx_SOURCES += bitcoin-tx-res.rc komodo_tx_SOURCES += bitcoin-tx-res.rc
endif endif
# FIXME: Is libzcash needed for hush-tx ?
komodo_tx_LDADD = \ komodo_tx_LDADD = \
$(LIBUNIVALUE) \ $(LIBUNIVALUE) \
$(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_COMMON) \
@@ -615,7 +615,6 @@ komodo_tx_LDADD = \
$(LIBCRYPTOCONDITIONS) $(LIBCRYPTOCONDITIONS)
komodo_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) komodo_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
#
# zcash protocol primitives # # zcash protocol primitives #
libzcash_a_SOURCES = \ libzcash_a_SOURCES = \

1
src/primitives/transaction.h
View File

@@ -44,6 +44,7 @@
#include "zcash/Zcash.h" #include "zcash/Zcash.h"
#include "zcash/JoinSplit.hpp" #include "zcash/JoinSplit.hpp"
#include "zcash/Proof.hpp" #include "zcash/Proof.hpp"
#include "zcash/Note.hpp"
extern uint32_t ASSETCHAINS_MAGIC; extern uint32_t ASSETCHAINS_MAGIC;
extern std::string ASSETCHAINS_SELFIMPORT; extern std::string ASSETCHAINS_SELFIMPORT;

1
src/transaction_builder.cpp
View File

@@ -12,6 +12,7 @@
#include <boost/variant.hpp> #include <boost/variant.hpp>
#include <boost/optional/optional_io.hpp> #include <boost/optional/optional_io.hpp>
#include <librustzcash.h> #include <librustzcash.h>
#include "zcash/Note.hpp"
SpendDescriptionInfo::SpendDescriptionInfo( SpendDescriptionInfo::SpendDescriptionInfo(
libzcash::SaplingExpandedSpendingKey expsk, libzcash::SaplingExpandedSpendingKey expsk,

2
src/wallet/rpchushwallet.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2020 The Hush developers // Copyright (c) 2019-2020 The Hush developers
// Copyright (c) 2019 Cryptoforge // Copyright (c) 2019 Cryptoforge
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.

31
src/zcash/Note.cpp
View File

@@ -13,37 +13,6 @@
using namespace libzcash; using namespace libzcash;
/*
SproutNote::SproutNote() {
a_pk = random_uint256();
rho = random_uint256();
r = random_uint256();
}
uint256 SproutNote::cm() const {
unsigned char discriminant = 0xb0;
CSHA256 hasher;
hasher.Write(&discriminant, 1);
hasher.Write(a_pk.begin(), 32);
auto value_vec = convertIntToVectorLE(value_);
hasher.Write(&value_vec[0], value_vec.size());
hasher.Write(rho.begin(), 32);
hasher.Write(r.begin(), 32);
uint256 result;
hasher.Finalize(result.begin());
return result;
}
uint256 SproutNote::nullifier(const SproutSpendingKey& a_sk) const {
return PRF_nf(a_sk, rho);
}
*/
// Construct and populate Sapling note for a given payment address and value. // Construct and populate Sapling note for a given payment address and value.
SaplingNote::SaplingNote(const SaplingPaymentAddress& address, const uint64_t value) : BaseNote(value) { SaplingNote::SaplingNote(const SaplingPaymentAddress& address, const uint64_t value) : BaseNote(value) {
d = address.d; d = address.d;