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

Resolve lints #2343

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Resolve lints #2343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/ain-evm/src/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ impl BlockService {

#[cfg(test)]
mod tests {
use super::*;
// use super::*;

// #[test]
// fn test_base_fee_equal() {
Expand Down
6 changes: 3 additions & 3 deletions lib/ain-evm/src/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ impl EVMServices {
} = EVMServices::counter_contract(dvm_block_number, current_block_number)?;
executor.update_storage(address, storage)?;
}
for (idx, queue_item) in queue.transactions.clone().into_iter().enumerate() {
for (_idx, queue_item) in queue.transactions.clone().into_iter().enumerate() {
match queue_item.tx {
QueueTx::SignedTx(signed_tx) => {
let nonce = executor.get_nonce(&signed_tx.sender);
Expand Down Expand Up @@ -649,13 +649,13 @@ impl EVMServices {

fn create_deploy_contract_tx(
token_id: u64,
block_number: U256,
_block_number: U256,
base_fee: &U256,
bytecode: Vec<u8>,
) -> Result<(SignedTx, ReceiptV3)> {
let tx = TransactionV2::Legacy(LegacyTransaction {
nonce: U256::from(token_id),
gas_price: base_fee.clone(),
gas_price: *base_fee,
gas_limit: U256::from(u64::MAX),
action: TransactionAction::Create,
value: U256::zero(),
Expand Down
77 changes: 45 additions & 32 deletions test/functional/feature_dst20.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,65 +113,78 @@ def test_dst20_migration_txs(self):
block = self.nodes[0].eth_getBlockByNumber("latest")
all_tokens = self.nodes[0].listtokens()
# Keep only DAT non-DFI tokens
loanTokens = [token for token in all_tokens.values() if token['isDAT'] == True and token['symbol'] != 'DFI']
assert_equal(len(block['transactions']), len(loanTokens))
loanTokens = [
token
for token in all_tokens.values()
if token["isDAT"] == True and token["symbol"] != "DFI"
]
assert_equal(len(block["transactions"]), len(loanTokens))

# check USDT migration
usdt_tx = block['transactions'][0]
usdt_tx = block["transactions"][0]
receipt = self.nodes[0].eth_getTransactionReceipt(usdt_tx)
tx1 = self.nodes[0].eth_getTransactionByHash(usdt_tx)
assert_equal(self.w0.to_checksum_address(receipt['contractAddress']), self.contract_address_usdt)
assert_equal(receipt['from'], tx1['from'])
assert_equal(receipt['gasUsed'], '0x0')
assert_equal(receipt['logs'], [])
assert_equal(receipt['status'], '0x1')
assert_equal(receipt['to'], None)
assert_equal(
self.w0.to_checksum_address(receipt["contractAddress"]),
self.contract_address_usdt,
)
assert_equal(receipt["from"], tx1["from"])
assert_equal(receipt["gasUsed"], "0x0")
assert_equal(receipt["logs"], [])
assert_equal(receipt["status"], "0x1")
assert_equal(receipt["to"], None)

assert_equal(
self.nodes[0].w3.to_hex(
self.nodes[0].w3.eth.get_code(self.contract_address_usdt)
)
, tx1['input']
),
tx1["input"],
)

# check BTC migration
btc_tx = block['transactions'][1]
btc_tx = block["transactions"][1]
receipt = self.nodes[0].eth_getTransactionReceipt(btc_tx)
tx2 = self.nodes[0].eth_getTransactionByHash(btc_tx)
assert_equal(self.w0.to_checksum_address(receipt['contractAddress']), self.contract_address_btc)
assert_equal(receipt['from'], tx2['from'])
assert_equal(receipt['gasUsed'], '0x0')
assert_equal(receipt['logs'], [])
assert_equal(receipt['status'], '0x1')
assert_equal(receipt['to'], None)
assert_equal(
self.w0.to_checksum_address(receipt["contractAddress"]),
self.contract_address_btc,
)
assert_equal(receipt["from"], tx2["from"])
assert_equal(receipt["gasUsed"], "0x0")
assert_equal(receipt["logs"], [])
assert_equal(receipt["status"], "0x1")
assert_equal(receipt["to"], None)

assert_equal(
self.nodes[0].w3.to_hex(
self.nodes[0].w3.eth.get_code(self.contract_address_btc)
)
, tx2['input']
),
tx2["input"],
)

# check ETH migration
eth_tx = block['transactions'][2]
eth_tx = block["transactions"][2]
receipt = self.nodes[0].eth_getTransactionReceipt(eth_tx)
tx3 = self.nodes[0].eth_getTransactionByHash(eth_tx)
assert_equal(self.w0.to_checksum_address(receipt['contractAddress']), self.contract_address_eth)
assert_equal(receipt['from'], tx3['from'])
assert_equal(receipt['gasUsed'], '0x0')
assert_equal(receipt['logs'], [])
assert_equal(receipt['status'], '0x1')
assert_equal(receipt['to'], None)
assert_equal(
self.w0.to_checksum_address(receipt["contractAddress"]),
self.contract_address_eth,
)
assert_equal(receipt["from"], tx3["from"])
assert_equal(receipt["gasUsed"], "0x0")
assert_equal(receipt["logs"], [])
assert_equal(receipt["status"], "0x1")
assert_equal(receipt["to"], None)

assert_equal(
self.nodes[0].w3.to_hex(
self.nodes[0].w3.eth.get_code(self.contract_address_eth)
)
, tx3['input']
),
tx3["input"],
)

assert_equal(tx1['input'], tx2['input'])
assert_equal(tx2['input'], tx3['input'])
assert_equal(tx1["input"], tx2["input"])
assert_equal(tx2["input"], tx3["input"])

self.rollback_to(block_height)

Expand All @@ -189,7 +202,6 @@ def test_pre_evm_token(self):
assert (
self.nodes[0].w3.to_hex(
self.nodes[0].w3.eth.get_code(self.contract_address_usdt)

)
!= self.reserved_bytecode
)
Expand Down Expand Up @@ -846,5 +858,6 @@ def run_test(self):
self.test_different_tokens()
self.test_loan_token()


if __name__ == "__main__":
DST20().main()
120 changes: 80 additions & 40 deletions test/functional/feature_evm_transferdomain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,44 @@


def transfer_domain(node, fromAddr, toAddr, amount, fromDomain, toDomain):
return node.transferdomain([
{
"src": {"address": fromAddr, "amount": amount, "domain": fromDomain},
"dst": {
"address": toAddr,
"amount": amount,
"domain": toDomain,
}
}])
return node.transferdomain(
[
{
"src": {"address": fromAddr, "amount": amount, "domain": fromDomain},
"dst": {
"address": toAddr,
"amount": amount,
"domain": toDomain,
},
}
]
)


class EVMTest(DefiTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.setup_clean_chain = True
node_args = [
"-txordering=2",
"-dummypos=0",
"-txnotokens=0",
"-amkheight=50",
"-bayfrontheight=51",
"-eunosheight=80",
"-fortcanningheight=82",
"-fortcanninghillheight=84",
"-fortcanningroadheight=86",
"-fortcanningcrunchheight=88",
"-fortcanningspringheight=90",
"-fortcanninggreatworldheight=94",
"-fortcanningepilogueheight=96",
"-grandcentralheight=101",
"-nextnetworkupgradeheight=150",
"-subsidytest=1",
"-txindex=1",
"-txordering=2",
"-dummypos=0",
"-txnotokens=0",
"-amkheight=50",
"-bayfrontheight=51",
"-eunosheight=80",
"-fortcanningheight=82",
"-fortcanninghillheight=84",
"-fortcanningroadheight=86",
"-fortcanningcrunchheight=88",
"-fortcanningspringheight=90",
"-fortcanninggreatworldheight=94",
"-fortcanningepilogueheight=96",
"-grandcentralheight=101",
"-nextnetworkupgradeheight=150",
"-subsidytest=1",
"-txindex=1",
]
self.extra_args = [ node_args, node_args ]
self.extra_args = [node_args, node_args]

def setup(self):
self.address = self.nodes[0].get_genesis_keys().ownerAuthAddress
Expand Down Expand Up @@ -148,7 +152,9 @@ def invalid_before_fork_and_disabled(self):
assert_raises_rpc_error(
-32600,
"called before NextNetworkUpgrade height",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3)
lambda: transfer_domain(
self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3
),
)

# Move to fork height
Expand All @@ -157,7 +163,9 @@ def invalid_before_fork_and_disabled(self):
assert_raises_rpc_error(
-32600,
"Cannot create tx, transfer domain is not enabled",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3)
lambda: transfer_domain(
self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3
),
)

# Activate EVM
Expand All @@ -170,7 +178,9 @@ def invalid_before_fork_and_disabled(self):
assert_raises_rpc_error(
-32600,
"Cannot create tx, transfer domain is not enabled",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3)
lambda: transfer_domain(
self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3
),
)

# Activate transferdomain
Expand All @@ -193,12 +203,16 @@ def invalid_before_fork_and_disabled(self):
assert_raises_rpc_error(
-32600,
"DVM to EVM is not currently enabled",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3)
lambda: transfer_domain(
self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3
),
)
assert_raises_rpc_error(
-32600,
"EVM to DVM is not currently enabled",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "100@DFI", 3, 2)
lambda: transfer_domain(
self.nodes[0], self.address, self.eth_address, "100@DFI", 3, 2
),
)

self.nodes[0].setgov(
Expand All @@ -214,12 +228,16 @@ def invalid_before_fork_and_disabled(self):
assert_raises_rpc_error(
-32600,
"transferdomain for DST20 from DVM to EVM is not enabled",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "1@BTC", 2, 3)
lambda: transfer_domain(
self.nodes[0], self.address, self.eth_address, "1@BTC", 2, 3
),
)
assert_raises_rpc_error(
-32600,
"transferdomain for DST20 from EVM to DVM is not enabled",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "1@BTC", 3, 2)
lambda: transfer_domain(
self.nodes[0], self.address, self.eth_address, "1@BTC", 3, 2
),
)

# Activate DAT transferdomain
Expand Down Expand Up @@ -377,12 +395,16 @@ def invalid_values_dvm_evm(self):
assert_raises_rpc_error(
-32600,
'Dst address must be an ERC55 address in case of "EVM" domain',
lambda: transfer_domain(self.nodes[0], self.address, self.address, "100@DFI", 2, 3)
lambda: transfer_domain(
self.nodes[0], self.address, self.address, "100@DFI", 2, 3
),
)
assert_raises_rpc_error(
-32600,
"Cannot transfer inside same domain",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 2)
lambda: transfer_domain(
self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 2
),
)
assert_raises_rpc_error(
-32600,
Expand Down Expand Up @@ -438,17 +460,33 @@ def invalid_values_dvm_evm(self):
assert_raises_rpc_error(
-32600,
"Non-DAT or LP tokens are not supported for transferdomain",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "1@" + self.symbolUSER, 2, 3)
lambda: transfer_domain(
self.nodes[0],
self.address,
self.eth_address,
"1@" + self.symbolUSER,
2,
3,
),
)
assert_raises_rpc_error(
-32600,
"Non-DAT or LP tokens are not supported for transferdomain",
lambda: transfer_domain(self.nodes[0], self.address, self.eth_address, "1@" + self.symbolBTCDFI, 2, 3)
lambda: transfer_domain(
self.nodes[0],
self.address,
self.eth_address,
"1@" + self.symbolBTCDFI,
2,
3,
),
)

def valid_transfer_dvm_evm(self):
# Transfer 100 DFI from DVM to EVM
tx1 = transfer_domain(self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3)
tx1 = transfer_domain(
self.nodes[0], self.address, self.eth_address, "100@DFI", 2, 3
)
self.nodes[0].generate(1)

# Check tx1 fields
Expand Down Expand Up @@ -633,7 +671,9 @@ def valid_transfer_evm_dvm(self):
self.valid_transfer_dvm_evm()

# Transfer 100 DFI from EVM to DVM
tx = transfer_domain(self.nodes[0], self.eth_address, self.address, "100@DFI", 3, 2)
tx = transfer_domain(
self.nodes[0], self.eth_address, self.address, "100@DFI", 3, 2
)
self.nodes[0].generate(1)

# Check tx fields
Expand Down