Change bahaviour of contract termination in accordance with EIP-6780

prdoc/pr_9699.prdoc

@@ -0,0 +1,16 @@
+title: Rve/revm selfdestruct2
+doc:
+- audience: Runtime Dev
+  description: |-
+    fixes https://github.com/paritytech/polkadot-sdk/issues/9621
+
+    Behavior of `terminate` is changed in accordance with EIP-6780 (and EVM in general):
+    - `terminate` only deletes the code from storage if it is called in the same transaction the contract was created.
+    - `terminate` does not destroy the contract instantly. The contract is registered for destruction, which happens at the end of the transaction.
+crates:
+- name: pallet-revive
+  bump: minor
+- name: pallet-revive-fixtures
+  bump: minor
+- name: pallet-revive-uapi
+  bump: minor

substrate/frame/revive/fixtures/contracts/HostEvmOnly.sol

@@ -7,6 +7,11 @@ contract HostEvmOnly {
             selfdestruct(recipient)
         }
     }
+    function fallback(address payable recipient) public {
+        assembly {
+            selfdestruct(recipient)
+        }
+    }
 
     function extcodecopyOp(address account, uint64 offset, uint64 size) public view returns (bytes memory code) {
         code = new bytes(size);

substrate/frame/revive/fixtures/contracts/self_destruct.rs → substrate/frame/revive/fixtures/contracts/self_destruct_by_precompile.rs

@@ -55,6 +55,23 @@ pub extern "C" fn call() {
 		.unwrap();
 	} else {
 		// Try to terminate and give balance to django.
-		api::terminate(&DJANGO_FALLBACK);
+
+        // Build the calldata: selector + ABI-encoded address
+        let selector = uapi::solidity_selector("terminate(address)");
+        let mut calldata = [0u8; 4 + 32];
+        calldata[0..4].copy_from_slice(&selector);
+        // ABI encode address: right-align into 32 bytes (pad with 12 leading zeros)
+        calldata[4 + 12..4 + 32].copy_from_slice(&DJANGO_FALLBACK);
+
+        let _ = api::call(
+            uapi::CallFlags::ALLOW_REENTRY,
+            &uapi::SYSTEM_PRECOMPILE_ADDR,
+            u64::MAX,
+            u64::MAX,
+            &[u8::MAX; 32],
+            &[0u8; 32],
+            &calldata,
+            None,
+        ).unwrap();
 	}
 }

substrate/frame/revive/fixtures/contracts/self_destruct_by_syscall.rs

@@ -0,0 +1,34 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![no_std]
+#![no_main]
+include!("../panic_handler.rs");
+
+use uapi::{HostFn, HostFnImpl as api};
+
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+	const DJANGO_FALLBACK: [u8; 20] = [4u8; 20];
+	api::terminate(&DJANGO_FALLBACK);
+}

substrate/frame/revive/fixtures/contracts/self_destruct_factory.rs

@@ -0,0 +1,47 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_std]
+#![no_main]
+include!("../panic_handler.rs");
+
+use uapi::{input, u256_bytes, HostFn, HostFnImpl as api};
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+    input!(36, code_hash: [u8],);
+
+    let mut addr = [0u8; 20];
+    let salt = [1u8; 32];
+    api::instantiate(
+        u64::MAX,
+        u64::MAX,
+        &[u8::MAX; 32],
+        &u256_bytes(100_000_000_000u64),
+        code_hash,
+        Some(&mut addr),
+        None,
+        Some(&salt),
+    ).unwrap();
+
+    api::call(
+        uapi::CallFlags::empty(),
+        &addr,
+        u64::MAX,
+        u64::MAX,
+        &[0u8; 32],
+        &[0u8; 32],
+        &[],
+        None,
+    ).unwrap();
+
+    // Return the address of the created (and destroyed) contract
+    api::return_value(uapi::ReturnFlags::empty(), &addr);
+}

substrate/frame/revive/fixtures/contracts/self_destructing_constructor_by_precompile.rs

@@ -0,0 +1,50 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![no_std]
+#![no_main]
+include!("../panic_handler.rs");
+
+use uapi::{HostFn, HostFnImpl as api};
+
+const DJANGO_FALLBACK: [u8; 20] = [4u8; 20];
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {
+	// Build the calldata: selector + ABI-encoded address
+	let selector = uapi::solidity_selector("terminate(address)");
+	let mut calldata = [0u8; 4 + 32];
+	calldata[0..4].copy_from_slice(&selector);
+	// ABI encode address: right-align into 32 bytes (pad with 12 leading zeros)
+	calldata[4 + 12..4 + 32].copy_from_slice(&DJANGO_FALLBACK);
+
+	let _ = api::call(
+		uapi::CallFlags::ALLOW_REENTRY,
+		&uapi::SYSTEM_PRECOMPILE_ADDR,
+		u64::MAX,
+		u64::MAX,
+		&[u8::MAX; 32],
+		&[0u8; 32],
+		&calldata,
+		None,
+	).unwrap();
+}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {}

substrate/frame/revive/fixtures/contracts/terminate_and_send_to_argument.rs

@@ -29,5 +29,21 @@ pub extern "C" fn deploy() {}
 #[polkavm_derive::polkavm_export]
 pub extern "C" fn call() {
 	input!(beneficiary: &[u8; 20],);
-	api::terminate(&beneficiary);
+	// Build the calldata: selector + ABI-encoded address
+	let selector = uapi::solidity_selector("terminate(address)");
+	let mut calldata = [0u8; 4 + 32];
+	calldata[0..4].copy_from_slice(&selector);
+	// ABI encode address: right-align into 32 bytes (pad with 12 leading zeros)
+	calldata[4 + 12..4 + 32].copy_from_slice(beneficiary);
+
+	let _ = api::call(
+		uapi::CallFlags::ALLOW_REENTRY,
+		&uapi::SYSTEM_PRECOMPILE_ADDR,
+		u64::MAX,
+		u64::MAX,
+		&[u8::MAX; 32],
+		&[0u8; 32],
+		&calldata,
+		None,
+	).unwrap();
 }

substrate/frame/revive/src/benchmarking.rs

@@ -51,7 +51,10 @@ use frame_support::{
 	self, assert_ok,
 	migrations::SteppedMigration,
 	storage::child,
-	traits::{fungible::InspectHold, Hooks},
+	traits::{
+		fungible::{InspectHold, UnbalancedHold},
+		Hooks,
+	},
 	weights::{Weight, WeightMeter},
 };
 use frame_system::RawOrigin;
@@ -1221,7 +1224,49 @@ mod benchmarks {
 		}
 
 		assert!(matches!(result, Err(crate::vm::pvm::TrapReason::Termination)));
-		assert_eq!(PristineCode::<T>::get(code_hash).is_none(), delete_code);
+
+		Ok(())
+	}
+
+	#[benchmark(pov_mode = Measured)]
+	fn seal_terminate_logic() -> Result<(), BenchmarkError> {
+		let beneficiary = account::<T::AccountId>("beneficiary", 0, 0);
+
+		build_runtime!(_runtime, instance, _memory: [vec![0u8; 0], ]);
+		let code_hash = instance.info()?.code_hash;
+
+		assert!(PristineCode::<T>::get(code_hash).is_some());
+
+		// Set storage deposit to zero so terminate_logic can proceed.
+		T::Currency::set_balance_on_hold(
+			&HoldReason::StorageDepositReserve.into(),
+			&instance.account_id,
+			0u32.into(),
+		)
+		.unwrap();
+
+		T::Currency::set_balance(&instance.account_id, Pallet::<T>::min_balance() * 2u32.into());
+
+		let result;
+		#[block]
+		{
+			result = crate::storage::meter::terminate_logic_for_benchmark::<T>(
+				&instance.account_id,
+				&beneficiary,
+			);
+		}
+		result.unwrap();
+
+		// Check that the contract is removed
+		assert!(PristineCode::<T>::get(code_hash).is_none());
+
+		// Check that the balance has been transferred away
+		let balance = <T as Config>::Currency::total_balance(&instance.account_id);
+		assert_eq!(balance, 0u32.into());
+
+		// Check that the beneficiary received the balance
+		let balance = <T as Config>::Currency::balance(&beneficiary);
+		assert_eq!(balance, Pallet::<T>::min_balance() * 2u32.into());
 
 		Ok(())
 	}