Skip to content

modify rpc tokenaddress #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gutongjiang wants to merge 8 commits into
base: master
Choose a base branch
from
Open

modify rpc tokenaddress #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56914ff
modify rpc tokenaddress
gutongjiang Jul 28, 2018
faa81e7
token minimum is 1
gutongjiang Jul 28, 2018
1ba4723
tokentransfer sign error
gutongjiang Jul 28, 2018
8114c49
if token amount < 17, use opcode
gutongjiang Jul 29, 2018
6a26600
serch token list from blockchain
gutongjiang Jul 30, 2018
eb80c95
check token balance is enough when transfer token
gutongjiang Jul 30, 2018
c6a5626
remove test data
gutongjiang Jul 31, 2018
4e746aa
don't use the UTXOs which contains token in sendtoaddress
gutongjiang Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 31 additions & 36 deletions BitcoinUnlimited-bucash1.3.0.1/src/consensus/tx_verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ bool Consensus::CheckTxInputs(const CTransaction &tx, CValidationState &state, c

std::map<std::string, CAmount> mVinToken;
std::map<std::string, CAmount> mVoutToken;
std::vector<std::string> vTxid;
// verify token issue txid
std::vector<std::string> vTxid;
std::vector<std::string> vTokenid;

for (unsigned int i = 0; i < tx.vin.size(); i++)
Expand All @@ -246,42 +247,26 @@ bool Consensus::CheckTxInputs(const CTransaction &tx, CValidationState &state, c
// Token
// verify token
CScript prevPubkey = coin.out.scriptPubKey;
if (prevPubkey.IsPayToScriptHash())
{
std::vector<unsigned char> vec(prevPubkey.begin() + 2, prevPubkey.begin() + 22);
CScriptID hash = CScriptID(uint160(vec));
CScript redeemScript;
if (pwalletMain->GetCScript(hash, redeemScript))
{
if (!redeemScript.IsPayToToken())
continue;

int namesize = redeemScript[1];
int amountsize = redeemScript[2 + namesize];
std::vector<unsigned char> vecName(redeemScript.begin() + 2, redeemScript.begin() + 2 + namesize);
std::vector<unsigned char> vecAmount(redeemScript.begin() + 3 + namesize, redeemScript.begin() + 3 + namesize + amountsize);
std::string tokenName(vecName.begin(), vecName.end());
CAmount tokenAmount = CScriptNum(vecAmount, true).getint64();
if (tokenAmount > MAX_TOKEN_SUPPLY)
return state.DoS(100, false, REJECT_INVALID, "token amount out of range");

CAmount temp = mVinToken[tokenName];
temp += tokenAmount;
if (temp > MAX_TOKEN_SUPPLY)
return state.DoS(100, false, REJECT_INVALID, "vin amount out of range");
mVinToken[tokenName] = temp;
}
}
else if (prevPubkey.IsPayToToken())
if (prevPubkey.IsPayToToken())
{
int namesize = prevPubkey[1];
int amountsize = prevPubkey[2 + namesize];
std::vector<unsigned char> vecName(prevPubkey.begin() + 2, prevPubkey.begin() + 2 + namesize);
std::vector<unsigned char> vecAmount(prevPubkey.begin() + 3 + namesize, prevPubkey.begin() + 3 + namesize + amountsize);
std::string tokenName(vecName.begin(), vecName.end());
CAmount tokenAmount = CScriptNum(vecAmount, true).getint64();
mVinToken[tokenName] = tokenAmount;


// check opcode or scriptnum
CAmount tokenAmount = 0;
std::vector<unsigned char> opcode(prevPubkey.begin() + 2 + namesize, prevPubkey.begin() + 3 + namesize);
if (0x50 < opcode.at(0) && opcode.at(0) < 0x61)
{
tokenAmount = opcode.at(0) - 0x50;
}
else
{
std::vector<unsigned char> vec(prevPubkey.begin() + 3 + namesize, prevPubkey.begin() + 3 + namesize + amountsize);
tokenAmount = CScriptNum(vec, true).getint64();
}

if (tokenAmount > MAX_TOKEN_SUPPLY)
return state.DoS(100, false, REJECT_INVALID, "token amount out of range");

Expand All @@ -306,9 +291,20 @@ bool Consensus::CheckTxInputs(const CTransaction &tx, CValidationState &state, c

std::vector<unsigned char> vecName(outScript.begin() + 2, outScript.begin() + 2 + namesize);
std::string name(vecName.begin(), vecName.end());

std::vector<unsigned char> vec(outScript.begin() + 3 + namesize, outScript.begin() + 3 + namesize + amountsize);
CAmount amount = CScriptNum(vec, true).getint64();

// check opcode or scriptnum
CAmount amount = 0;
std::vector<unsigned char> opcode(outScript.begin() + 2 + namesize, outScript.begin() + 3 + namesize);
if (0x50 < opcode.at(0) && opcode.at(0) < 0x61)
{
amount = opcode.at(0) - 0x50;
}
else
{
std::vector<unsigned char> vec(outScript.begin() + 3 + namesize, outScript.begin() + 3 + namesize + amountsize);
amount = CScriptNum(vec, true).getint64();
}

if (amount > MAX_TOKEN_SUPPLY)
return state.DoS(100, false, REJECT_INVALID, "token amount out of range");

Expand Down Expand Up @@ -345,7 +341,6 @@ bool Consensus::CheckTxInputs(const CTransaction &tx, CValidationState &state, c
// if (!issue)
// return state.DoS(100, false, REJECT_INVALID, "tokenid must be one of the issuer's UTXO txid");
// }
// verify token end

if (nValueIn < tx.GetValueOut())
return state.DoS(100, false, REJECT_INVALID, "bad-txns-in-belowout", false,
Expand Down
Loading