Merge branch 'master' into ahmad-foreign-assets-migration

.github/workflows/docs.yml

@@ -1,6 +1,7 @@
 name: Publish Rust Docs
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -10,7 +11,7 @@ jobs:
     name: Deploy docs
     runs-on: bare-metal
     permissions:
-      contents: read
+      contents: write
     steps:
       # The protobuf compiler should be pre-installed on bare-metal
       #- name: Install tooling

runtime/moonbase/src/xcm_config.rs

@@ -286,11 +286,10 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type UniversalLocation = UniversalLocation;
 	type Barrier = XcmBarrier;
 	type Weigher = XcmWeigher;
-	// We use two traders
-	// When we receive the relative representation of the self-reserve asset,
-	// we use UsingComponents and the local way of handling fees
-	// When we receive a non-reserve asset, we use AssetManager to fetch how many
-	// units per second we should charge
+	// As trader we use the XcmWeightTrader pallet.
+	// For each foreign asset, the fee is computed based on its relative price (also
+	// stored in the XcmWeightTrader pallet) against the native asset.
+	// For the native asset fee is computed using WeightToFee implementation.
 	type Trader = pallet_xcm_weight_trader::Trader<Runtime>;
 	type ResponseHandler = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;

runtime/moonbeam/src/xcm_config.rs

@@ -19,9 +19,9 @@
 
 use super::{
 	governance, AccountId, AssetId, AssetManager, Balance, Balances, EmergencyParaXcm,
-	Erc20XcmBridge, MaintenanceMode, MessageQueue, OpenTechCommitteeInstance, ParachainInfo,
-	ParachainSystem, Perbill, PolkadotXcm, Runtime, RuntimeBlockWeights, RuntimeCall, RuntimeEvent,
-	RuntimeOrigin, Treasury, XcmpQueue,
+	Erc20XcmBridge, EvmForeignAssets, MaintenanceMode, MessageQueue, OpenTechCommitteeInstance,
+	ParachainInfo, ParachainSystem, Perbill, PolkadotXcm, Runtime, RuntimeBlockWeights,
+	RuntimeCall, RuntimeEvent, RuntimeOrigin, Treasury, XcmpQueue,
 };
 
 use super::moonbeam_weights;
@@ -158,6 +158,7 @@ pub type LocalAssetTransactor = XcmCurrencyAdapter<
 // We use all transactors
 pub type AssetTransactors = (
 	LocalAssetTransactor,
+	EvmForeignAssets,
 	ForeignFungiblesTransactor,
 	Erc20XcmBridge,
 );
@@ -275,11 +276,10 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type UniversalLocation = UniversalLocation;
 	type Barrier = XcmBarrier;
 	type Weigher = XcmWeigher;
-	// We use two traders
-	// When we receive the relative representation of the self-reserve asset,
-	// we use UsingComponents and the local way of handling fees
-	// When we receive a non-reserve asset, we use AssetManager to fetch how many
-	// units per second we should charge
+	// As trader we use the XcmWeightTrader pallet.
+	// For each foreign asset, the fee is computed based on its relative price (also
+	// stored in the XcmWeightTrader pallet) against the native asset.
+	// For the native asset fee is computed using WeightToFee implementation.
 	type Trader = pallet_xcm_weight_trader::Trader<Runtime>;
 	type ResponseHandler = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;

runtime/moonriver/src/xcm_config.rs

@@ -19,9 +19,9 @@
 
 use super::{
 	governance, AccountId, AssetId, AssetManager, Balance, Balances, EmergencyParaXcm,
-	Erc20XcmBridge, MaintenanceMode, MessageQueue, OpenTechCommitteeInstance, ParachainInfo,
-	ParachainSystem, Perbill, PolkadotXcm, Runtime, RuntimeBlockWeights, RuntimeCall, RuntimeEvent,
-	RuntimeOrigin, Treasury, XcmpQueue,
+	Erc20XcmBridge, EvmForeignAssets, MaintenanceMode, MessageQueue, OpenTechCommitteeInstance,
+	ParachainInfo, ParachainSystem, Perbill, PolkadotXcm, Runtime, RuntimeBlockWeights,
+	RuntimeCall, RuntimeEvent, RuntimeOrigin, Treasury, XcmpQueue,
 };
 
 use super::moonriver_weights;
@@ -166,6 +166,7 @@ pub type LocalAssetTransactor = XcmCurrencyAdapter<
 // we import https://github.com/open-web3-stack/open-runtime-module-library/pull/708
 pub type AssetTransactors = (
 	LocalAssetTransactor,
+	EvmForeignAssets,
 	ForeignFungiblesTransactor,
 	Erc20XcmBridge,
 );
@@ -283,11 +284,10 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type UniversalLocation = UniversalLocation;
 	type Barrier = XcmBarrier;
 	type Weigher = XcmWeigher;
-	// We use two traders
-	// When we receive the relative representation of the self-reserve asset,
-	// we use UsingComponents and the local way of handling fees
-	// When we receive a non-reserve asset, we use AssetManager to fetch how many
-	// units per second we should charge
+	// As trader we use the XcmWeightTrader pallet.
+	// For each foreign asset, the fee is computed based on its relative price (also
+	// stored in the XcmWeightTrader pallet) against the native asset.
+	// For the native asset fee is computed using WeightToFee implementation.
 	type Trader = pallet_xcm_weight_trader::Trader<Runtime>;
 	type ResponseHandler = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;

test/contracts/src/SelfDestruct.sol

@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.24;
+
+contract SelfDestructable {
+    constructor() {
+        selfdestruct(payable(address(0)));
+    }
+}
+
+contract SelfDestructAfterCreate2 {
+    uint constant SALT = 1;
+
+    address public deployed1;
+    address public deployed2;
+
+    function step1() public {
+        bytes memory bytecode = type(SelfDestructable).creationCode;
+        address contractAddress;
+        uint contractSize;
+        assembly {
+            contractAddress := create2(0, add(bytecode, 32), mload(bytecode), SALT)
+            contractSize := extcodesize(contractAddress)
+        }
+        require(contractSize == 0, "Contract size should be zero");
+        deployed1 = contractAddress;
+    }
+
+
+    function step2() public {
+        bytes memory bytecode = type(SelfDestructable).creationCode;
+        address contractAddress;
+        uint contractSize;
+        assembly {
+            contractAddress := create2(0, add(bytecode, 32), mload(bytecode), SALT)
+            contractSize := extcodesize(contractAddress)
+        }
+        require(contractSize == 0, "Contract size should be zero");
+        deployed2 = contractAddress;
+        require(deployed1 == deployed2, "Addresses not equal");
+    }
+
+    function cannotRecreateInTheSameCall() public {
+        bytes memory bytecode = type(SelfDestructable).creationCode;
+        address contractAddress1;
+        address contractAddress2;
+        assembly {
+            contractAddress1 := create2(0, add(bytecode, 32), mload(bytecode), SALT)
+            contractAddress2 := create2(0, add(bytecode, 32), mload(bytecode), SALT)
+        }
+        require(contractAddress1 != address(0), "First address must not be null");
+        require(contractAddress2 == address(0), "Second address must be null");
+    }
+}