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

Jump to bottom

Move RBF from mempool back to the miner #2449

Merged
merged 6 commits into from
Sep 15, 2023
Merged

Move RBF from mempool back to the miner #2449

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efa2cb6
Move RBF from mempool to miner
Bushstar Sep 14, 2023
219391f
Reformat Python
Bushstar Sep 14, 2023
f6482b6
lint: remove unused variable
Bushstar Sep 14, 2023
af4fad7
Fix feature_evm_miner test
sieniven Sep 14, 2023
495ba05
Merge branch 'master' of github.com:DeFiCh/ain into bush/move-rbf-miner
sieniven Sep 15, 2023
5c187c0
lint: add circular dep
Bushstar Sep 15, 2023
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
9 changes: 3 additions & 6 deletions lib/ain-evm/src/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ impl EVMCoreService {
tx: &str,
queue_id: u64,
pre_validate: bool,
test_tx: bool,
) -> Result<ValidateTxInfo> {
debug!("[validate_raw_tx] queue_id {}", queue_id);
debug!("[validate_raw_tx] raw transaction : {:#?}", tx);
Expand Down Expand Up @@ -333,11 +332,9 @@ impl EVMCoreService {
.get_total_gas_used_in(queue_id)
.unwrap_or_default();

if !test_tx {
let block_gas_limit = self.storage.get_attributes_or_default()?.block_gas_limit;
if total_current_gas_used + U256::from(used_gas) > U256::from(block_gas_limit) {
return Err(format_err!("Tx can't make it in block. Block size limit {}, pending block gas used : {:x?}, tx used gas : {:x?}, total : {:x?}", block_gas_limit, total_current_gas_used, U256::from(used_gas), total_current_gas_used + U256::from(used_gas)).into());
}
let block_gas_limit = self.storage.get_attributes_or_default()?.block_gas_limit;
if total_current_gas_used + U256::from(used_gas) > U256::from(block_gas_limit) {
return Err(format_err!("Tx can't make it in block. Block size limit {}, pending block gas used : {:x?}, tx used gas : {:x?}, total : {:x?}", block_gas_limit, total_current_gas_used, U256::from(used_gas), total_current_gas_used + U256::from(used_gas)).into());
}

Ok(ValidateTxInfo {
Expand Down
3 changes: 1 addition & 2 deletions lib/ain-rs-exports/src/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,6 @@ pub fn evm_unsafe_try_validate_raw_tx_in_q(
queue_id: u64,
raw_tx: &str,
pre_validate: bool,
test_tx: bool,
) -> ffi::ValidateTxMiner {
debug!("[evm_unsafe_try_validate_raw_tx_in_q]");
match SERVICES.evm.verify_tx_fees(raw_tx) {
Expand All @@ -512,7 +511,7 @@ pub fn evm_unsafe_try_validate_raw_tx_in_q(
match SERVICES
.evm
.core
.validate_raw_tx(raw_tx, queue_id, pre_validate, test_tx)
.validate_raw_tx(raw_tx, queue_id, pre_validate)
{
Ok(ValidateTxInfo {
signed_tx,
Expand Down
1 change: 0 additions & 1 deletion lib/ain-rs-exports/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ pub mod ffi {
queue_id: u64,
raw_tx: &str,
pre_validate: bool,
test_tx: bool,
) -> ValidateTxMiner;
fn evm_unsafe_try_push_tx_in_q(
result: &mut CrossBoundaryResult,
Expand Down
2 changes: 1 addition & 1 deletion src/consensus/tx_verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, CValidationState& state, c
// Note: TXs are already filtered. So we pass isEVMEnabled to false, but for future proof, refactor this enough,
// that it's propagated.
uint64_t gasUsed{};
auto res = ApplyCustomTx(discardCache, inputs, tx, chainparams.GetConsensus(), nSpendHeight, gasUsed, 0, &canSpend, 0, 0, false);
auto res = ApplyCustomTx(discardCache, inputs, tx, chainparams.GetConsensus(), nSpendHeight, gasUsed, 0, &canSpend, 0, 0, false, false);
if (!res.ok && (res.code & CustomTxErrCodes::Fatal)) {
return state.Invalid(ValidationInvalidReason::CONSENSUS, false, REJECT_INVALID, "bad-txns-customtx", res.msg);
}
Expand Down
6 changes: 2 additions & 4 deletions src/masternodes/consensus/txvisitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ CCustomTxVisitor::CCustomTxVisitor(const CTransaction &tx,
const uint64_t evmQueueId,
const bool isEvmEnabledForBlock,
uint64_t &gasUsed,
const bool evmPreValidate,
const bool testTx)
const bool evmPreValidate)
: height(height),
mnview(mnview),
tx(tx),
Expand All @@ -75,8 +74,7 @@ CCustomTxVisitor::CCustomTxVisitor(const CTransaction &tx,
evmQueueId(evmQueueId),
isEvmEnabledForBlock(isEvmEnabledForBlock),
gasUsed(gasUsed),
evmPreValidate(evmPreValidate),
testTx(testTx) {}
evmPreValidate(evmPreValidate) {}

Res CCustomTxVisitor::HasAuth(const CScript &auth) const {
return ::HasAuth(tx, coins, auth);
Expand Down
4 changes: 1 addition & 3 deletions src/masternodes/consensus/txvisitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ class CCustomTxVisitor {
bool isEvmEnabledForBlock;
uint64_t &gasUsed;
bool evmPreValidate;
bool testTx;

public:
CCustomTxVisitor(const CTransaction &tx,
Expand All @@ -67,8 +66,7 @@ class CCustomTxVisitor {
const uint64_t evmQueueId,
const bool isEvmEnabledForBlock,
uint64_t &gasUsed,
const bool evmPreValidate,
const bool testTx);
const bool evmPreValidate);

protected:
Res HasAuth(const CScript &auth) const;
Expand Down
2 changes: 1 addition & 1 deletion src/masternodes/consensus/xvm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ Res CXVMConsensus::operator()(const CEvmTxMessage &obj) const {
return Res::Err("evm tx size too large");

CrossBoundaryResult result;
auto validateResults = evm_unsafe_try_validate_raw_tx_in_q(result, evmQueueId, HexStr(obj.evmTx), evmPreValidate, testTx);
auto validateResults = evm_unsafe_try_validate_raw_tx_in_q(result, evmQueueId, HexStr(obj.evmTx), evmPreValidate);
if (!result.ok) {
LogPrintf("[evm_try_validate_raw_tx] failed, reason : %s\n", result.reason);
return Res::Err("evm tx failed to validate %s", result.reason);
Expand Down
19 changes: 8 additions & 11 deletions src/masternodes/mn_checks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,14 @@ class CCustomTxApplyVisitor {
bool isEvmEnabledForBlock;
uint64_t &gasUsed;
bool evmPreValidate;
bool testTx;

template<typename T, typename T1, typename ...Args>
Res ConsensusHandler(const T& obj) const {

static_assert(std::is_base_of_v<CCustomTxVisitor, T1>, "CCustomTxVisitor base required");

if constexpr (std::is_invocable_v<T1, T>)
return T1{tx, height, coins, mnview, consensus, time, txn, evmQueueId, isEvmEnabledForBlock, gasUsed, evmPreValidate, testTx}(obj);
return T1{tx, height, coins, mnview, consensus, time, txn, evmQueueId, isEvmEnabledForBlock, gasUsed, evmPreValidate}(obj);
else if constexpr (sizeof...(Args) != 0)
return ConsensusHandler<T, Args...>(obj);
else
Expand All @@ -361,8 +360,7 @@ class CCustomTxApplyVisitor {
const uint64_t evmQueueId,
const bool isEvmEnabledForBlock,
uint64_t &gasUsed,
const bool evmPreValidate,
const bool testTx)
const bool evmPreValidate)

: tx(tx),
height(height),
Expand All @@ -374,8 +372,7 @@ class CCustomTxApplyVisitor {
evmQueueId(evmQueueId),
isEvmEnabledForBlock(isEvmEnabledForBlock),
gasUsed(gasUsed),
evmPreValidate(evmPreValidate),
testTx(testTx) {}
evmPreValidate(evmPreValidate) {}

template<typename T>
Res operator()(const T& obj) const {
Expand Down Expand Up @@ -454,8 +451,7 @@ Res CustomTxVisit(CCustomCSView &mnview,
const uint32_t txn,
const uint64_t evmQueueId,
const bool isEvmEnabledForBlock,
const bool evmPreValidate,
const bool testTx) {
const bool evmPreValidate) {
if (IsDisabledTx(height, tx, consensus)) {
return Res::ErrCode(CustomTxErrCodes::Fatal, "Disabled custom transaction");
}
Expand All @@ -470,7 +466,7 @@ Res CustomTxVisit(CCustomCSView &mnview,

try {
auto res = std::visit(
CCustomTxApplyVisitor(tx, height, coins, mnview, consensus, time, txn, q, isEvmEnabledForBlock, gasUsed, evmPreValidate, testTx),
CCustomTxApplyVisitor(tx, height, coins, mnview, consensus, time, txn, q, isEvmEnabledForBlock, gasUsed, evmPreValidate),
txMessage);
if (wipeQueue) {
XResultStatusLogged(evm_unsafe_try_remove_queue(result, q));
Expand Down Expand Up @@ -569,7 +565,8 @@ Res ApplyCustomTx(CCustomCSView &mnview,
uint256 *canSpend,
uint32_t txn,
const uint64_t evmQueueId,
const bool isEvmEnabledForBlock) {
const bool isEvmEnabledForBlock,
const bool evmPreValidate) {
auto res = Res::Ok();
if (tx.IsCoinBase() && height > 0) { // genesis contains custom coinbase txs
return res;
Expand Down Expand Up @@ -608,7 +605,7 @@ Res ApplyCustomTx(CCustomCSView &mnview,
PopulateVaultHistoryData(mnview.GetHistoryWriters(), view, txMessage, txType, height, txn, tx.GetHash());
}

res = CustomTxVisit(view, coins, tx, height, consensus, txMessage, time, gasUsed, txn, evmQueueId, isEvmEnabledForBlock, false, false);
res = CustomTxVisit(view, coins, tx, height, consensus, txMessage, time, gasUsed, txn, evmQueueId, isEvmEnabledForBlock, evmPreValidate);

if (res) {
if (canSpend && txType == CustomTxType::UpdateMasternode) {
Expand Down
6 changes: 3 additions & 3 deletions src/masternodes/mn_checks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ Res ApplyCustomTx(CCustomCSView &mnview,
uint256 *canSpend,
uint32_t txn,
const uint64_t evmQueueId,
const bool isEvmEnabledForBlock);
const bool isEvmEnabledForBlock,
const bool evmPreValidate);

Res CustomTxVisit(CCustomCSView &mnview,
const CCoinsViewCache &coins,
Expand All @@ -188,8 +189,7 @@ Res CustomTxVisit(CCustomCSView &mnview,
const uint32_t txn,
const uint64_t evmQueueId,
const bool isEvmEnabledForBlock,
const bool evmPreValidate,
const bool testTx);
const bool evmPreValidate);


ResVal<uint256> ApplyAnchorRewardTx(CCustomCSView &mnview,
Expand Down
3 changes: 1 addition & 2 deletions src/masternodes/mn_rpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ void execTestTx(const CTransaction& tx, uint32_t height, CTransactionRef optAuth
auto consensus = Params().GetConsensus();
auto isEvmEnabledForBlock = IsEVMEnabled(height, view, consensus);
uint64_t gasUsed{};
res = CustomTxVisit(view, coins, tx, height, consensus, txMessage, ::ChainActive().Tip()->nTime, gasUsed, 0, 0, isEvmEnabledForBlock, true, true);
res = CustomTxVisit(view, coins, tx, height, consensus, txMessage, ::ChainActive().Tip()->nTime, gasUsed, 0, 0, isEvmEnabledForBlock, true);
}
if (!res) {
if (res.code == CustomTxErrCodes::NotEnoughBalance) {
Expand Down Expand Up @@ -1132,7 +1132,6 @@ static UniValue clearmempool(const JSONRPCRequest& request)
LOCK(mempool.cs);
mempool.queryHashes(vtxid);
mempool.clear();
mempool.wipeEvmQueueId();
}

{
Expand Down
10 changes: 9 additions & 1 deletion src/masternodes/rpc_accounts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,7 +2136,10 @@ UniValue transferdomain(const JSONRPCRequest& request) {
std::string from = ScriptToString(script);

CrossBoundaryResult result;
auto evmQueueId = mempool.getEvmQueueId();
auto evmQueueId = evm_unsafe_try_create_queue(result);
if (!result.ok) {
throw JSONRPCError(RPC_MISC_ERROR, "Unable to create EVM queue");
}
const auto signedTx = evm_try_create_and_sign_transfer_domain_tx(result, CreateTransferDomainContext{std::move(from),
std::move(to),
nativeAddress,
Expand All @@ -2151,6 +2154,11 @@ UniValue transferdomain(const JSONRPCRequest& request) {
throw JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to create and sign TX: %s", result.reason.c_str()));
}

evm_unsafe_try_remove_queue(result, evmQueueId);
if (!result.ok) {
throw JSONRPCError(RPC_MISC_ERROR, "Unable to destroy EVM queue");
}

std::vector<uint8_t> evmTx(signedTx.size());
std::copy(signedTx.begin(), signedTx.end(), evmTx.begin());
if (isEVMIn) {
Expand Down
2 changes: 1 addition & 1 deletion src/masternodes/rpc_tokens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ UniValue getcustomtx(const JSONRPCRequest& request)
auto isEvmEnabledForBlock = IsEVMEnabled(nHeight, mnview, consensus);

uint64_t gasUsed{};
auto res = ApplyCustomTx(mnview, view, *tx, consensus, nHeight, gasUsed, 0, nullptr, 0, 0, isEvmEnabledForBlock);
auto res = ApplyCustomTx(mnview, view, *tx, consensus, nHeight, gasUsed, 0, nullptr, 0, 0, isEvmEnabledForBlock, false);

result.pushKV("valid", res.ok);
} else {
Expand Down
Loading
Loading