From b756ffbf48274cf8250df09a9b80786cfcec9897 Mon Sep 17 00:00:00 2001 From: tdudz Date: Wed, 9 Aug 2017 16:33:07 -0700 Subject: [PATCH 1/2] gutted out CConfidentialAsset blinder code --- src/primitives/transaction.cpp | 7 ------- src/primitives/transaction.h | 7 ------- src/validation.cpp | 6 +----- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 59ea7554ddd..a2d7a46584e 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -17,13 +17,6 @@ void CConfidentialAsset::SetToAsset(const CAsset& asset) vchCommitment.insert(vchCommitment.end(), asset.begin(), asset.end()); } -void CConfidentialAsset::SetToBlinder(const uint256& blinder) -{ - vchCommitment.reserve(nCommittedSize); - vchCommitment.push_back(12); - vchCommitment.insert(vchCommitment.end(), blinder.begin(), blinder.end()); -} - void CConfidentialValue::SetToBlinder(const uint256& blinder) { vchCommitment.reserve(nCommittedSize); diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 9612af6d80d..35b7325f919 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -109,7 +109,6 @@ class CConfidentialAsset : public CConfidentialCommitment<33, 10, 11, 12> public: CConfidentialAsset() { SetNull(); } CConfidentialAsset(CAsset asset) { SetToAsset(asset); } - CConfidentialAsset(uint256 blinder) { SetToBlinder(blinder); } /* An explicit asset identifier is a 256-bit nothing-up-my-sleeve number * that used as auxiliary input to the Pedersen commitment setup to create @@ -119,13 +118,7 @@ class CConfidentialAsset : public CConfidentialCommitment<33, 10, 11, 12> assert(IsExplicit()); return *reinterpret_cast(&vchCommitment[1]); } - const uint256& GetBlinder() const - { - assert(IsBlinder()); - return *reinterpret_cast(&vchCommitment[1]); - } void SetToAsset(const CAsset& asset); - void SetToBlinder(const uint256& blinder); }; diff --git a/src/validation.cpp b/src/validation.cpp index 377d5f5535a..8928491c1db 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -898,10 +898,6 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, std::ve } else if (asset.IsCommitment()) { if (secp256k1_generator_parse(secp256k1_ctx_verify_amounts, &gen, &asset.vchCommitment[0]) != 1) return false; - } else if (asset.IsBlinder()) { - if (secp256k1_generator_generate_blinded(secp256k1_ctx_verify_amounts, &gen, zero, asset.GetBlinder().begin()) != 1) { - return false; - } } else { return false; } @@ -976,7 +972,7 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, std::ve const CConfidentialAsset& asset = tx.vout[i].nAsset; const CTxOutWitness* ptxoutwit = tx.wit.vtxoutwit.size() <= i? NULL: &tx.wit.vtxoutwit[i]; //No need for surjective proof - if (asset.IsExplicit() || asset.IsBlinder()) { + if (asset.IsExplicit()) { if (ptxoutwit && !ptxoutwit->vchSurjectionproof.empty()) { return false; } From f9e3f0d84e99e3721b429214d07c2444b94c5773 Mon Sep 17 00:00:00 2001 From: tdudz Date: Wed, 9 Aug 2017 17:15:55 -0700 Subject: [PATCH 2/2] forgot to edit comment for CConfidentialAsset --- src/primitives/transaction.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 35b7325f919..2f54dfd1f9d 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -103,7 +103,7 @@ class CConfidentialCommitment } }; -/** A 33-byte commitment to a blinded asset, a 32-byte naked blinding value, or an explicit asset NUMS identifier */ +/** A 33-byte commitment to a blinded asset or an explicit asset NUMS identifier */ class CConfidentialAsset : public CConfidentialCommitment<33, 10, 11, 12> { public: