Handle usage of prevector for CScript in Zcash-specific code
This commit is contained in:
parent
29a8ade782
commit
d2fb34fb7c
|
@ -106,11 +106,11 @@ TEST(founders_reward_test, general) {
|
||||||
// address = t2ENg7hHVqqs9JwU5cgjvSbxnT2a9USNfhy
|
// address = t2ENg7hHVqqs9JwU5cgjvSbxnT2a9USNfhy
|
||||||
// script.ToString() = OP_HASH160 55d64928e69829d9376c776550b6cc710d427153 OP_EQUAL
|
// script.ToString() = OP_HASH160 55d64928e69829d9376c776550b6cc710d427153 OP_EQUAL
|
||||||
// HexStr(script) = a91455d64928e69829d9376c776550b6cc710d42715387
|
// HexStr(script) = a91455d64928e69829d9376c776550b6cc710d42715387
|
||||||
EXPECT_EQ(params.GetFoundersRewardScriptAtHeight(1), ParseHex("a914ef775f1f997f122a062fff1a2d7443abd1f9c64287"));
|
EXPECT_EQ(HexStr(params.GetFoundersRewardScriptAtHeight(1)), "a914ef775f1f997f122a062fff1a2d7443abd1f9c64287");
|
||||||
EXPECT_EQ(params.GetFoundersRewardAddressAtHeight(1), "t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi");
|
EXPECT_EQ(params.GetFoundersRewardAddressAtHeight(1), "t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi");
|
||||||
EXPECT_EQ(params.GetFoundersRewardScriptAtHeight(53126), ParseHex("a914ac67f4c072668138d88a86ff21b27207b283212f87"));
|
EXPECT_EQ(HexStr(params.GetFoundersRewardScriptAtHeight(53126)), "a914ac67f4c072668138d88a86ff21b27207b283212f87");
|
||||||
EXPECT_EQ(params.GetFoundersRewardAddressAtHeight(53126), "t2NGQjYMQhFndDHguvUw4wZdNdsssA6K7x2");
|
EXPECT_EQ(params.GetFoundersRewardAddressAtHeight(53126), "t2NGQjYMQhFndDHguvUw4wZdNdsssA6K7x2");
|
||||||
EXPECT_EQ(params.GetFoundersRewardScriptAtHeight(53127), ParseHex("a91455d64928e69829d9376c776550b6cc710d42715387"));
|
EXPECT_EQ(HexStr(params.GetFoundersRewardScriptAtHeight(53127)), "a91455d64928e69829d9376c776550b6cc710d42715387");
|
||||||
EXPECT_EQ(params.GetFoundersRewardAddressAtHeight(53127), "t2ENg7hHVqqs9JwU5cgjvSbxnT2a9USNfhy");
|
EXPECT_EQ(params.GetFoundersRewardAddressAtHeight(53127), "t2ENg7hHVqqs9JwU5cgjvSbxnT2a9USNfhy");
|
||||||
|
|
||||||
int maxHeight = params.GetConsensus().GetLastFoundersRewardBlockHeight();
|
int maxHeight = params.GetConsensus().GetLastFoundersRewardBlockHeight();
|
||||||
|
|
|
@ -1191,7 +1191,7 @@ uint256 SignatureHash(
|
||||||
// The prevout may already be contained in hashPrevout, and the nSequence
|
// The prevout may already be contained in hashPrevout, and the nSequence
|
||||||
// may already be contained in hashSequence.
|
// may already be contained in hashSequence.
|
||||||
ss << txTo.vin[nIn].prevout;
|
ss << txTo.vin[nIn].prevout;
|
||||||
ss << scriptCode;
|
ss << static_cast<const CScriptBase&>(scriptCode);
|
||||||
ss << amount;
|
ss << amount;
|
||||||
ss << txTo.vin[nIn].nSequence;
|
ss << txTo.vin[nIn].nSequence;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue