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

Change to CTxout

Browse Source
This commit is contained in:
jl777
2019-02-25 04:56:10 -11:00
parent 3e5cd48c38
commit 483ac5bbea
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cc/dilithium.c
View File

@@ -2917,7 +2917,7 @@ char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,
int32_t dilithium_Qmsghash(uint8_t *msg,CTransaction tx,std::vector<uint256> voutpubtxids) int32_t dilithium_Qmsghash(uint8_t *msg,CTransaction tx,std::vector<uint256> voutpubtxids)
{ {
CScript data; uint256 hash; int32_t i,numvins,numvouts,len = 0; std::vector<uint256> vintxids; std::vector<int64_t> nValues; std::vector<int32_t> vinprevns; std::vector<CScript> scriptPubKeys; CScript data; uint256 hash; int32_t i,numvins,numvouts,len = 0; std::vector<uint256> vintxids; std::vector<int32_t> vinprevns; std::vector<CTxOut> vouts;
numvins = tx.vin.size(); numvins = tx.vin.size();
numvouts = tx.vout.size(); numvouts = tx.vout.size();
if ( tx.vout[numvouts-1].scriptPubKey[0] == 0x6a ) if ( tx.vout[numvouts-1].scriptPubKey[0] == 0x6a )
@@ -2928,11 +2928,9 @@ int32_t dilithium_Qmsghash(uint8_t *msg,CTransaction tx,std::vector<uint256> vou
vinprevns.push_back(tx.vin[i].prevout.n); vinprevns.push_back(tx.vin[i].prevout.n);
} }
for (i=0; i<numvouts-1; i++) for (i=0; i<numvouts-1; i++)
{ vouts.push_back(tx.vout[i]);
nValues.push_back(tx.vout[i].nValue); data << E_MARSHAL(ss << vintxids << vinprevns << vouts << voutpubtxids);
scriptPubKeys.push_back(tx.vout[i].scriptPubKey); fprintf(stderr,"size of data.%d\n",(int32_t)data.size());
}
data << E_MARSHAL(ss << vintxids << vinprevns << nValues << scriptPubKeys << voutpubtxids);
hash = Hash(data.begin(),data.end()); hash = Hash(data.begin(),data.end());
memcpy(msg,&hash,sizeof(hash)); memcpy(msg,&hash,sizeof(hash));
return(0); return(0);
@@ -3275,7 +3273,7 @@ bool dilithium_Qvalidate(struct CCcontract_info *cp,int32_t height,Eval *eval,co
{ {
int32_t i,numvins,numvouts,mlen,smlen=CRYPTO_BYTES+32; CPubKey destpub33; std::string handle; uint256 tmptxid,hashBlock,destpubtxid,signerpubtxid; CTransaction vintx; std::vector<uint8_t> tmpsig,sig,vopret; uint8_t msg[32],msg2[CRYPTO_BYTES+32],pk[CRYPTO_PUBLICKEYBYTES],*script; std::vector<uint256> voutpubtxids; int32_t i,numvins,numvouts,mlen,smlen=CRYPTO_BYTES+32; CPubKey destpub33; std::string handle; uint256 tmptxid,hashBlock,destpubtxid,signerpubtxid; CTransaction vintx; std::vector<uint8_t> tmpsig,sig,vopret; uint8_t msg[32],msg2[CRYPTO_BYTES+32],pk[CRYPTO_PUBLICKEYBYTES],*script; std::vector<uint256> voutpubtxids;
numvins = tx.vin.size(); numvins = tx.vin.size();
signerpubtxid = zeriod; signerpubtxid = zeroid;
for (i=0; i<numvins; i++) for (i=0; i<numvins; i++)
{ {
if ( IsCCInput(tx.vin[i].scriptSig) != 0 ) if ( IsCCInput(tx.vin[i].scriptSig) != 0 )