This commit is contained in:
@@ -91,6 +91,16 @@ CScript EncodeMarmaraCoinbaseOpRet(CPubKey pk,int32_t ht)
|
||||
CScript opret; int32_t unlockht; uint8_t evalcode = EVAL_MARMARA;
|
||||
unlockht = MarmaraUnlockht(ht);
|
||||
opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'C' << pk << ht << unlockht);
|
||||
{
|
||||
std::vector<uint8_t> vopret; uint8_t *script,i;
|
||||
GetOpReturnData(opret,vopret);
|
||||
script = (uint8_t *)vopret.data();
|
||||
{
|
||||
for (i=0; i<vopret.size(); i++)
|
||||
fprintf(stderr,"%02x",script[i]);
|
||||
fprintf(stderr," <- gen opret\n");
|
||||
}
|
||||
}
|
||||
return(opret);
|
||||
}
|
||||
|
||||
@@ -99,6 +109,12 @@ uint8_t DecodeMaramaraCoinbaseOpRet(const CScript &scriptPubKey,CPubKey &pk,int3
|
||||
std::vector<uint8_t> vopret; uint8_t *script,e,f,funcid;
|
||||
GetOpReturnData(scriptPubKey,vopret);
|
||||
script = (uint8_t *)vopret.data();
|
||||
{
|
||||
int32_t i;
|
||||
for (i=0; i<vopret.size(); i++)
|
||||
fprintf(stderr,"%02x",script[i]);
|
||||
fprintf(stderr," <- opret\n");
|
||||
}
|
||||
if ( vopret.size() > 2 && script[0] == EVAL_MARMARA )
|
||||
{
|
||||
if ( script[1] == 'C' )
|
||||
@@ -108,7 +124,7 @@ uint8_t DecodeMaramaraCoinbaseOpRet(const CScript &scriptPubKey,CPubKey &pk,int3
|
||||
return(script[1]);
|
||||
} else fprintf(stderr,"DecodeMaramaraCoinbaseOpRet unmarshal error for C\n");
|
||||
} else fprintf(stderr,"script[1] is %d != 'C' %d\n",script[1],'C');
|
||||
} else fprintf(stderr,"vopret.size() is %d [0] is %d != %d\n",(int32_t)vopret.size(),script[0],EVAL_MARMARA);
|
||||
} else fprintf(stderr,"vopret.size() is %d\n",(int32_t)vopret.size());
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user