Cancun support

runtime/moonbase/tests/xcm_tests.rs

@@ -2586,17 +2586,11 @@ fn empty_account_should_not_be_reset() {
 		parachain::EVM::remove_account(&evm_account());
 		// Verify reference count.
 		let account = parachain::System::account(evm_account_id);
-		// TODO: after introducing the suicided fix the value for account.sufficients will remain 1
-		// until the storage is not completely removed, it will have to be decreased to 0 once the
-		// storage can be fully removed
-		assert_eq!(account.sufficients, 1);
+		assert_eq!(account.sufficients, 0);
 		assert_eq!(account.consumers, 0);
 		assert_eq!(account.providers, 1);
 		// We expect the account to be alive in a Zero ED context.
-		// TODO: after introducing the suicided fix the nonce is increased by 1
-		// until the storage is not completely removed, it will have to be decreased to 1 once the
-		// storage can be fully removed
-		assert_eq!(parachain::System::account_nonce(evm_account_id), 2);
+		assert_eq!(parachain::System::account_nonce(evm_account_id), 1);
 	});
 }
 

runtime/moonbeam/tests/xcm_tests.rs

@@ -2310,19 +2310,11 @@ fn empty_account_should_not_be_reset() {
 		parachain::EVM::remove_account(&evm_account());
 		// Verify reference count.
 		let account = parachain::System::account(evm_account_id);
-		// TODO: since the suicided logic was introduced an smart contract account
-		// is not deleted completely until it's data is deleted. Data deletion
-		// will be implemented in a future release
-		// account.sufficients shall be 0
-		assert_eq!(account.sufficients, 1);
+		assert_eq!(account.sufficients, 0);
 		assert_eq!(account.consumers, 0);
 		assert_eq!(account.providers, 1);
 		// We expect the account to be alive in a Zero ED context.
-		// TODO: since the suicided logic was introduced an smart contract account
-		// is not deleted completely until it's data is deleted. Data deletion
-		// will be implemented in a future release
-		// this shall be changed to 1
-		assert_eq!(parachain::System::account_nonce(evm_account_id), 2);
+		assert_eq!(parachain::System::account_nonce(evm_account_id), 1);
 	});
 }
 

runtime/moonriver/tests/xcm_tests.rs

@@ -2620,19 +2620,11 @@ fn empty_account_should_not_be_reset() {
 		parachain::EVM::remove_account(&evm_account());
 		// Verify reference count.
 		let account = parachain::System::account(evm_account_id);
-		// TODO: since the suicided logic was introduced an smart contract account
-		// is not deleted completely until it's data is deleted. Data deletion
-		// will be implemented in a future release
-		// revert account.sufficients to 0
-		assert_eq!(account.sufficients, 1);
+		assert_eq!(account.sufficients, 0);
 		assert_eq!(account.consumers, 0);
 		assert_eq!(account.providers, 1);
 		// We expect the account to be alive in a Zero ED context.
-		// TODO: since the suicided logic was introduced an smart contract account
-		// is not deleted completely until it's data is deleted. Data deletion
-		// will be implemented in a future release
-		// the following needs to be 1
-		assert_eq!(parachain::System::account_nonce(evm_account_id), 2);
+		assert_eq!(parachain::System::account_nonce(evm_account_id), 1);
 	});
 }
 

test/contracts/src/ERC20ExcessGas.sol

@@ -18,7 +18,7 @@ contract ERC20ExcessGas is ERC20WithInitialSupply {
         uint256 amount
     ) public override returns (bool) {
         // Consume gas to over Erc20XcmBridgeTransferGasLimit
-        for (uint i = 0; i < 2000; i++) {
+        for (uint i = 0; i < 2200; i++) {
             _gasHog += i;
         }
 

test/contracts/src/dancun/ProxySuicide.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.24;
+
+contract ProxyDeployer {
+    event ContractDestroyed(address destroyedAddress);
+
+    // Function to deploy a new Suicide contract
+    function deployAndDestroy(address target) public  {
+        Suicide newContract = new Suicide();
+        newContract.destroy(target);
+        emit ContractDestroyed(address(newContract));
+    }
+
+}
+
+contract Suicide {
+    constructor() payable {
+    }
+
+    function destroy(address target) public {
+        selfdestruct(payable(target));
+    }
+}