From e20c89396aa4ebae8118d859db1fb31a8c7cbf80 Mon Sep 17 00:00:00 2001
From: Web3 Philosopher <seun@polytope.technology>
Date: Wed, 26 Jun 2024 18:52:27 +0100
Subject: [PATCH] Add request commitment to pallet-asset-gateway events (#247)

---
 evm/src/modules/TokenGateway.sol              | 6 +++---
 modules/ismp/pallets/asset-gateway/src/lib.rs | 5 ++++-
 parachain/runtimes/gargantua/src/lib.rs       | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/evm/src/modules/TokenGateway.sol b/evm/src/modules/TokenGateway.sol
index 3417c2139..f4946e901 100644
--- a/evm/src/modules/TokenGateway.sol
+++ b/evm/src/modules/TokenGateway.sol
@@ -193,7 +193,7 @@ contract TokenGateway is BaseIsmpModule {
 
     // User has received some assets
     event AssetReceived(
-        bytes32 commitment, address indexed from, address indexed beneficiary, uint256 amount, bytes32 indexed assetId
+        bytes32 commitment, bytes32 indexed from, address indexed beneficiary, uint256 amount, bytes32 indexed assetId
     );
 
     // User has sent some assets
@@ -532,7 +532,7 @@ contract TokenGateway is BaseIsmpModule {
         emit AssetReceived({
             commitment: commitment,
             beneficiary: bytes32ToAddress(body.to),
-            from: bytes32ToAddress(body.from),
+            from: body.from,
             amount: body.amount,
             assetId: body.assetId
         });
@@ -563,7 +563,7 @@ contract TokenGateway is BaseIsmpModule {
         emit AssetReceived({
             commitment: commitment,
             beneficiary: bytes32ToAddress(body.to),
-            from: bytes32ToAddress(body.from),
+            from: body.from,
             amount: body.amount,
             assetId: body.assetId
         });
diff --git a/modules/ismp/pallets/asset-gateway/src/lib.rs b/modules/ismp/pallets/asset-gateway/src/lib.rs
index b71a01b9d..687c74cb4 100644
--- a/modules/ismp/pallets/asset-gateway/src/lib.rs
+++ b/modules/ismp/pallets/asset-gateway/src/lib.rs
@@ -118,6 +118,8 @@ pub mod pallet {
 			amount: <T::Assets as fungibles::Inspect<T::AccountId>>::Balance,
 			/// Destination chain
 			dest: StateMachine,
+			/// Request commitment
+			commitment: H256,
 		},
 
 		/// An asset has been received and transferred to the beneficiary's account on the
@@ -253,7 +255,7 @@ where
 
 		let metadata =
 			FeeMetadata { payer: multi_account.substrate_account.clone(), fee: Default::default() };
-		dispatcher
+		let commitment = dispatcher
 			.dispatch_request(DispatchRequest::Post(dispatch_post), metadata)
 			.map_err(|_| Error::<T>::DispatchPostError)?;
 
@@ -262,6 +264,7 @@ where
 			to: multi_account.evm_account,
 			dest: multi_account.dest_state_machine,
 			amount,
+			commitment,
 		});
 
 		Ok(())
diff --git a/parachain/runtimes/gargantua/src/lib.rs b/parachain/runtimes/gargantua/src/lib.rs
index 6ef4ce27a..30f77e174 100644
--- a/parachain/runtimes/gargantua/src/lib.rs
+++ b/parachain/runtimes/gargantua/src/lib.rs
@@ -214,7 +214,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("gargantua"),
 	impl_name: create_runtime_str!("gargantua"),
 	authoring_version: 1,
-	spec_version: 300,
+	spec_version: 310,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,