GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

validation variables changed to not assume witness program for pegin

Browse source
This commit is contained in:
Gregory Sanders 2017-10-21 16:32:04 +02:00
parent 2940c4e0ea
commit da6960ddb7
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/validation.cpp
View file

@ -2294,8 +2294,8 @@ bool BitcoindRPCCheck(const bool init)
return true; return true;
} }
/* Takes federation redeeem script and adds HMAC_SHA256(pubkey, witnessProgram) as a tweak to each pubkey */ /* Takes federation redeeem script and adds HMAC_SHA256(pubkey, scriptPubKey) as a tweak to each pubkey */
CScript calculate_contract(const CScript& federationRedeemScript, const CScript& witnessProgram) { CScript calculate_contract(const CScript& federationRedeemScript, const CScript& scriptPubKey) {
CScript scriptDestination(federationRedeemScript); CScript scriptDestination(federationRedeemScript);
txnouttype type; txnouttype type;
std::vector<std::vector<unsigned char> > solutions; std::vector<std::vector<unsigned char> > solutions;
@ -2317,7 +2317,7 @@ CScript calculate_contract(const CScript& federationRedeemScript, const CScript&
size_t pub_len = 33; size_t pub_len = 33;
int ret; int ret;
unsigned char *pub_start = &(*(sdpc - pub_len)); unsigned char *pub_start = &(*(sdpc - pub_len));
CHMAC_SHA256(pub_start, pub_len).Write(witnessProgram.data(), witnessProgram.size()).Finalize(tweak); CHMAC_SHA256(pub_start, pub_len).Write(scriptPubKey.data(), scriptPubKey.size()).Finalize(tweak);
secp256k1_pubkey watchman; secp256k1_pubkey watchman;
secp256k1_pubkey tweaked; secp256k1_pubkey tweaked;
ret = secp256k1_ec_pubkey_parse(secp256k1_ctx_verify_amounts, &watchman, pub_start, pub_len); ret = secp256k1_ec_pubkey_parse(secp256k1_ctx_verify_amounts, &watchman, pub_start, pub_len);