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

Discourage sending to Eth address on account layer #2001

Merged
merged 3 commits into from
Jun 9, 2023
Merged

Discourage sending to Eth address on account layer #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f7ec56
Discourage sending to Eth address on account layer
Bushstar May 19, 2023
04c9eae
Merge branch 'feature/evm' into block-eth-addr
Bushstar Jun 9, 2023
47a65b8
Remove unused function and add test
Bushstar Jun 9, 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
22 changes: 22 additions & 0 deletions src/masternodes/rpc_accounts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,10 @@ UniValue utxostoaccount(const JSONRPCRequest& request) {
CUtxosToAccountMessage msg{};
msg.to = DecodeRecipientsDefaultInternal(pwallet, request.params[0].get_obj());

for (const auto& [to, amount] : msg.to) {
RejectEthAddress(to);
}

// encode
CDataStream markedMetadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
markedMetadata << static_cast<unsigned char>(CustomTxType::UtxosToAccount)
Expand Down Expand Up @@ -827,6 +831,11 @@ UniValue accounttoaccount(const JSONRPCRequest& request) {

msg.from = DecodeScript(request.params[0].get_str());

for (const auto& [to, amount] : msg.to) {
RejectEthAddress(to);
}
RejectEthAddress(msg.from);

// encode
CDataStream markedMetadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
markedMetadata << static_cast<unsigned char>(CustomTxType::AccountToAccount)
Expand Down Expand Up @@ -913,6 +922,7 @@ UniValue accounttoutxos(const JSONRPCRequest& request) {
// decode sender and recipients
CAccountToUtxosMessage msg{};
msg.from = DecodeScript(request.params[0].get_str());
RejectEthAddress(msg.from);
const auto to = DecodeRecipients(pwallet->chain(), request.params[1]);
msg.balances = SumAllTransfers(to);
if (msg.balances.balances.empty()) {
Expand Down Expand Up @@ -1920,6 +1930,13 @@ UniValue sendtokenstoaddress(const JSONRPCRequest& request) {
msg.from = DecodeRecipients(pwallet->chain(), request.params[0].get_obj());
}

for (const auto& [to, amount] : msg.to) {
RejectEthAddress(to);
}
for (const auto& [from, amount] : msg.from) {
RejectEthAddress(from);
}

// encode
CDataStream markedMetadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
markedMetadata << static_cast<unsigned char>(CustomTxType::AnyAccountsToAccounts)
Expand Down Expand Up @@ -2406,6 +2423,7 @@ UniValue HandleSendDFIP2201BTCInput(const JSONRPCRequest& request, CWalletCoinsU
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
}
const auto script = GetScriptForDestination(dest);
RejectEthAddress(script);

CSmartContractMessage msg{};
msg.name = contractPair.first;
Expand Down Expand Up @@ -2547,6 +2565,8 @@ UniValue futureswap(const JSONRPCRequest& request) {
msg.owner = GetScriptForDestination(dest);
msg.source = DecodeAmount(pwallet->chain(), request.params[1], "");

RejectEthAddress(msg.owner);

if (!request.params[2].isNull()) {
DCT_ID destTokenID{};

Expand Down Expand Up @@ -2649,6 +2669,8 @@ UniValue withdrawfutureswap(const JSONRPCRequest& request) {
msg.destination = destTokenID.v;
}

RejectEthAddress(msg.owner);

// Encode
CDataStream metadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
metadata << static_cast<unsigned char>(CustomTxType::FutureSwap)
Expand Down
4 changes: 4 additions & 0 deletions src/masternodes/rpc_loan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,8 @@ UniValue takeloan(const JSONRPCRequest& request) {
if (!metaObj["to"].isNull())
takeLoan.to = DecodeScript(metaObj["to"].getValStr());

RejectEthAddress(takeLoan.to);

if (!metaObj["amounts"].isNull())
takeLoan.amounts = DecodeAmounts(pwallet->chain(), metaObj["amounts"], "");
else
Expand Down Expand Up @@ -1265,6 +1267,8 @@ UniValue paybackloan(const JSONRPCRequest& request) {
} else
from = DecodeScript(metaObj["from"].getValStr());

RejectEthAddress(from);

if (!::IsMine(*pwallet, from))
throw JSONRPCError(RPC_INVALID_PARAMETER,
strprintf("Address (%s) is not owned by the wallet", metaObj["from"].getValStr()));
Expand Down
15 changes: 15 additions & 0 deletions src/masternodes/rpc_poolpair.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,11 @@ UniValue addpoolliquidity(const JSONRPCRequest &request) {
}
msg.shareAddress = DecodeScript(request.params[1].get_str());

for (const auto& [from, balance] : msg.from) {
RejectEthAddress(from);
}
RejectEthAddress(msg.shareAddress);

// encode
CDataStream markedMetadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
markedMetadata << static_cast<unsigned char>(CustomTxType::AddPoolLiquidity) << msg;
Expand Down Expand Up @@ -497,6 +502,8 @@ UniValue removepoolliquidity(const JSONRPCRequest &request) {
msg.from = DecodeScript(from);
msg.amount = DecodeAmount(pwallet->chain(), amount, from);

RejectEthAddress(msg.from);

// encode
CDataStream markedMetadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
markedMetadata << static_cast<unsigned char>(CustomTxType::RemovePoolLiquidity) << msg;
Expand Down Expand Up @@ -636,6 +643,7 @@ UniValue createpoolpair(const JSONRPCRequest &request) {
if (!metadataObj["customRewards"].isNull()) {
rewards = DecodeAmounts(pwallet->chain(), metadataObj["customRewards"], "");
}
RejectEthAddress(ownerAddress);

int targetHeight;
DCT_ID idtokenA, idtokenB;
Expand Down Expand Up @@ -815,6 +823,7 @@ UniValue updatepoolpair(const JSONRPCRequest &request) {
std::numeric_limits<CAmount>::max()));
}
}
RejectEthAddress(ownerAddress);

const auto txVersion = GetTransactionVersion(targetHeight);
CMutableTransaction rawTx(txVersion);
Expand Down Expand Up @@ -932,6 +941,9 @@ UniValue poolswap(const JSONRPCRequest &request) {
CheckAndFillPoolSwapMessage(request, poolSwapMsg);
int targetHeight = chainHeight(*pwallet->chain().lock()) + 1;

RejectEthAddress(poolSwapMsg.from);
RejectEthAddress(poolSwapMsg.to);

CDataStream metadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
metadata << static_cast<unsigned char>(CustomTxType::PoolSwap);
metadata << poolSwapMsg;
Expand Down Expand Up @@ -1050,6 +1062,9 @@ UniValue compositeswap(const JSONRPCRequest &request) {
CPoolSwapMessage &poolSwapMsg = poolSwapMsgV2.swapInfo;
CheckAndFillPoolSwapMessage(request, poolSwapMsg);

RejectEthAddress(poolSwapMsg.from);
RejectEthAddress(poolSwapMsg.to);

{
LOCK(cs_main);
// If no direct swap found search for composite swap
Expand Down
2 changes: 2 additions & 0 deletions src/masternodes/rpc_proposals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ UniValue creategovcfp(const JSONRPCRequest &request) {
pm.contextHash = contextHash;
pm.options = 0;

RejectEthAddress(pm.address);

// encode
CDataStream metadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
metadata << static_cast<unsigned char>(CustomTxType::CreateCfp) << pm;
Expand Down
11 changes: 11 additions & 0 deletions src/masternodes/rpc_vault.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,8 @@ UniValue createvault(const JSONRPCRequest& request) {
CVaultMessage vault;
vault.ownerAddress = DecodeScript(request.params[0].getValStr());

RejectEthAddress(vault.ownerAddress);

if (request.params.size() > 1) {
if (!request.params[1].isNull()) {
vault.schemeId = request.params[1].get_str();
Expand Down Expand Up @@ -407,6 +409,8 @@ UniValue closevault(const JSONRPCRequest& request) {

msg.to = DecodeScript(request.params[1].getValStr());

RejectEthAddress(msg.to);

CDataStream metadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
metadata << static_cast<unsigned char>(CustomTxType::CloseVault)
<< msg;
Expand Down Expand Up @@ -713,6 +717,9 @@ UniValue updatevault(const JSONRPCRequest& request) {
}
msg.ownerAddress = DecodeScript(ownerAddress);
}

RejectEthAddress(msg.ownerAddress);

if(!params["loanSchemeId"].isNull()){
auto loanschemeid = params["loanSchemeId"].getValStr();
msg.schemeId = loanschemeid;
Expand Down Expand Up @@ -801,6 +808,7 @@ UniValue deposittovault(const JSONRPCRequest& request) {
// decode vaultId
CVaultId vaultId = ParseHashV(request.params[0], "vaultId");
auto from = DecodeScript(request.params[1].get_str());
RejectEthAddress(from);
CTokenAmount amount = DecodeAmount(pwallet->chain(),request.params[2].get_str(), "amount");

CDepositToVaultMessage msg{vaultId, from, amount};
Expand Down Expand Up @@ -887,6 +895,7 @@ UniValue withdrawfromvault(const JSONRPCRequest& request) {
// decode vaultId
CVaultId vaultId = ParseHashV(request.params[0], "vaultId");
auto to = DecodeScript(request.params[1].get_str());
RejectEthAddress(to);
CTokenAmount amount = DecodeAmount(pwallet->chain(),request.params[2].get_str(), "amount");

CWithdrawFromVaultMessage msg{vaultId, to, amount};
Expand Down Expand Up @@ -1005,6 +1014,8 @@ UniValue placeauctionbid(const JSONRPCRequest& request) {
from = DecodeScript(fromStr);
}

RejectEthAddress(from);

CAuctionBidMessage msg{vaultId, index, from, amount};
CDataStream markedMetadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
markedMetadata << static_cast<unsigned char>(CustomTxType::AuctionBid)
Expand Down
7 changes: 7 additions & 0 deletions src/rpc/rawtransaction_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ CScript DecodeScript(std::string const& str)
return GetScriptForDestination(dest);
}

void RejectEthAddress(const CScript &address) {
CTxDestination dest;
if (ExtractDestination(address, dest) && dest.index() == WitV16KeyEthHashType) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Eth type addresses are not valid");
}
}

int DecodeScriptTxId(const std::string& str, CParserResults result)
{
if (IsHex(str)) {
Expand Down
1 change: 1 addition & 0 deletions src/rpc/rawtransaction_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ResVal<std::pair<CAmount, std::string>> ParseTokenAmount(std::string const & tok
ResVal<CTokenAmount> GuessTokenAmount(interfaces::Chain const & chain,std::string const & tokenAmount);

CScript DecodeScript(std::string const& str);
void RejectEthAddress(const CScript &address);
CTokenAmount DecodeAmount(interfaces::Chain const & chain, UniValue const& amountUni, std::string const& name);
CBalances DecodeAmounts(interfaces::Chain const & chain, UniValue const& amountsUni, std::string const& name);
CAccounts DecodeRecipients(interfaces::Chain const & chain, UniValue const& sendTo);
Expand Down
2 changes: 1 addition & 1 deletion src/script/standard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,5 +351,5 @@ CScript GetScriptForHTLC(const CPubKey& seller, const CPubKey& refund, const std
}

bool IsValidDestination(const CTxDestination& dest) {
return dest.index() != 0;
return dest.index() != NoDestType;
}
1 change: 1 addition & 0 deletions test/functional/feature_evm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ def run_test(self):
assert_equal(len(self.nodes[0].getaccount(ethAddress, {}, True)), 0)

# Check for invalid parameters in transferdomain rpc
assert_raises_rpc_error(-5, "Eth type addresses are not valid", self.nodes[0].accounttoaccount, address, {ethAddress: "1@DFI"})
assert_raises_rpc_error(-8, "Invalid parameters, src argument \"address\" must not be null", self.nodes[0].transferdomain, [{"src": {"amount":"100@DFI", "domain": 2}, "dst":{"address":ethAddress, "amount":"100@DFI", "domain": 3}}])
assert_raises_rpc_error(-8, "Invalid parameters, src argument \"amount\" must not be null", self.nodes[0].transferdomain, [{"src": {"address":address, "domain": 2}, "dst":{"address":ethAddress, "amount":"100@DFI", "domain": 3}}])
assert_raises_rpc_error(-8, "Invalid parameters, src argument \"domain\" must not be null", self.nodes[0].transferdomain, [{"src": {"address":address, "amount":"100@DFI"}, "dst":{"address":ethAddress, "amount":"100@DFI", "domain": 3}}])
Expand Down