From e55f316633cce301c089fe1f8831af32d0319272 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Fri, 13 Oct 2023 00:44:42 +1100
Subject: [PATCH] Fix & docs update.

---
 chain-extensions/xvm/src/lib.rs       | 2 +-
 runtime/local/src/chain_extensions.rs | 4 ++--
 runtime/local/src/lib.rs              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chain-extensions/xvm/src/lib.rs b/chain-extensions/xvm/src/lib.rs
index 67fa1fabb2..ba1ebcedda 100644
--- a/chain-extensions/xvm/src/lib.rs
+++ b/chain-extensions/xvm/src/lib.rs
@@ -95,7 +95,7 @@ where
                 // things on behalf of the caller via XVM.
                 let source = env.ext().address().clone();
 
-                // Claim a default account if needed.
+                // Claim the default evm address if needed.
                 let mut actual_weight = Weight::zero();
                 if value > 0 && UA::to_h160(&source).is_none() {
                     let weight_of_claim = <T as pallet_unified_accounts::Config>::WeightInfo::claim_default_evm_address();
diff --git a/runtime/local/src/chain_extensions.rs b/runtime/local/src/chain_extensions.rs
index 9bd7609c5f..db0a59c063 100644
--- a/runtime/local/src/chain_extensions.rs
+++ b/runtime/local/src/chain_extensions.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Astar. If not, see <http://www.gnu.org/licenses/>.
 
-use super::{Runtime, Xvm};
+use super::{Runtime, UnifiedAccounts, Xvm};
 
 /// Registered WASM contracts chain extensions.
 pub use pallet_chain_extension_assets::AssetsExtension;
@@ -31,7 +31,7 @@ impl RegisteredChainExtension<Runtime> for DappsStakingExtension<Runtime> {
     const ID: u16 = 00;
 }
 
-impl RegisteredChainExtension<Runtime> for XvmExtension<Runtime, Xvm> {
+impl RegisteredChainExtension<Runtime> for XvmExtension<Runtime, Xvm, UnifiedAccounts> {
     const ID: u16 = 01;
 }
 
diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs
index b372b6bdbf..6cb0b371ef 100644
--- a/runtime/local/src/lib.rs
+++ b/runtime/local/src/lib.rs
@@ -844,7 +844,7 @@ impl pallet_contracts::Config for Runtime {
     type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
     type ChainExtension = (
         DappsStakingExtension<Self>,
-        XvmExtension<Self, Xvm>,
+        XvmExtension<Self, Xvm, UnifiedAccounts>,
         AssetsExtension<Self, pallet_chain_extension_assets::weights::SubstrateWeight<Self>>,
     );
     type Schedule = Schedule;