Skip to content
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

Fix pool name bugs #1266

Merged
merged 5 commits into from
May 23, 2022
Merged

Fix pool name bugs #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8436952
Do not migrate dead pools
Bushstar May 23, 2022
4ee1ebc
Get pool suffix dynamically
Bushstar May 23, 2022
e09da71
Disallow / in pool name after Spice Garden
Bushstar May 23, 2022
83ca846
Merge branch 'master' into fix-pool-name-bug
prasannavl May 23, 2022
037ae09
Update mn_checks.cpp
prasannavl May 23, 2022
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
4 changes: 4 additions & 0 deletions src/masternodes/mn_checks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,10 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
return Res::Err("wrong commission");
}

if (height >= static_cast<uint32_t>(Params().GetConsensus().FortCanningCrunchHeight) && obj.pairSymbol.find('/') != std::string::npos) {
return Res::Err("token symbol should not contain '/'");
}

/// @todo ownerAddress validity checked only in rpc. is it enough?
CPoolPair poolPair(obj.poolPair);
auto pairSymbol = obj.pairSymbol;
Expand Down
9 changes: 8 additions & 1 deletion src/miner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,14 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
uint32_t entries{1};
mnview.ForEachPoolPair([&, id = id](DCT_ID const & poolId, const CPoolPair& pool){
if (pool.idTokenA.v == id || pool.idTokenB.v == id) {
++entries;
const auto tokenA = mnview.GetToken(pool.idTokenA);
const auto tokenB = mnview.GetToken(pool.idTokenB);
assert(tokenA);
assert(tokenB);
if ((tokenA->destructionHeight == -1 && tokenA->destructionTx == uint256{}) &&
(tokenB->destructionHeight == -1 && tokenB->destructionTx == uint256{})) {
++entries;
}
}
return true;
});
Expand Down
34 changes: 30 additions & 4 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2781,7 +2781,14 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
std::vector<DCT_ID> poolsToMigrate;
accountsView.ForEachPoolPair([&, id = id](DCT_ID const & poolId, const CPoolPair& pool){
if (pool.idTokenA.v == id || pool.idTokenB.v == id) {
poolsToMigrate.push_back(poolId);
const auto tokenA = accountsView.GetToken(pool.idTokenA);
const auto tokenB = accountsView.GetToken(pool.idTokenB);
assert(tokenA);
assert(tokenB);
if ((tokenA->destructionHeight == -1 && tokenA->destructionTx == uint256{}) &&
(tokenB->destructionHeight == -1 && tokenB->destructionTx == uint256{})) {
poolsToMigrate.push_back(poolId);
}
}
return true;
});
Expand Down Expand Up @@ -3763,7 +3770,7 @@ static inline T CalculateNewAmount(const int multiplier, const T amount) {
}

static Res PoolSplits(CCustomCSView& view, CAmount& totalBalance, ATTRIBUTES& attributes, const DCT_ID oldTokenId, const DCT_ID newTokenId,
const CBlockIndex* pindex, const CreationTxs& creationTxs, const std::string& newTokenSuffix, const int32_t multiplier) {
const CBlockIndex* pindex, const CreationTxs& creationTxs, const int32_t multiplier) {

try {
assert(creationTxs.count(oldTokenId.v));
Expand All @@ -3778,7 +3785,26 @@ static Res PoolSplits(CCustomCSView& view, CAmount& totalBalance, ATTRIBUTES& at
newPoolToken.creationTx = creationTx;
newPoolToken.minted = 0;

oldPoolToken->symbol += newTokenSuffix;
size_t suffixCount{1};
view.ForEachPoolPair([&, oldTokenId = oldTokenId](DCT_ID const & poolId, const CPoolPair& pool){
if (pool.idTokenA == oldTokenId || pool.idTokenB == oldTokenId) {
const auto tokenA = view.GetToken(pool.idTokenA);
const auto tokenB = view.GetToken(pool.idTokenB);
assert(tokenA);
assert(tokenB);
if ((tokenA->destructionHeight != -1 && tokenA->destructionTx != uint256{}) ||
(tokenB->destructionHeight != -1 && tokenB->destructionTx != uint256{})) {
const auto poolToken = view.GetToken(poolId);
assert(poolToken);
if (poolToken->symbol.find(oldPoolToken->symbol + "/v") != std::string::npos) {
++suffixCount;
}
}
}
return true;
});

oldPoolToken->symbol += "/v" + std::to_string(suffixCount);
oldPoolToken->flags |= static_cast<uint8_t>(CToken::TokenFlags::Tradeable);
oldPoolToken->destructionHeight = pindex->nHeight;
oldPoolToken->destructionTx = pindex->GetBlockHash();
Expand Down Expand Up @@ -4171,7 +4197,7 @@ void CChainState::ProcessTokenSplits(const CBlock& block, const CBlockIndex* pin

CAmount totalBalance{0};

res = PoolSplits(view, totalBalance, *attributes, oldTokenId, newTokenId, pindex, creationTxs,newTokenSuffix, multiplier);
res = PoolSplits(view, totalBalance, *attributes, oldTokenId, newTokenId, pindex, creationTxs, multiplier);
if (!res) {
LogPrintf("%s: Token split failed. %s\n", __func__, res.msg);
continue;
Expand Down