From 9ebd1af4514de6b72eb8f48bdfd8ec6d67a4d71b Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Fri, 27 Oct 2023 16:38:36 +0200
Subject: [PATCH 01/10] fix NewCollection event (#128)

---
 .../precompile/laos-evolution/src/lib.rs      |  5 ++---
 .../precompile/laos-evolution/src/tests.rs    | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/evolution-chain/precompile/laos-evolution/src/lib.rs b/evolution-chain/precompile/laos-evolution/src/lib.rs
index 5cab6296e..8c801c502 100644
--- a/evolution-chain/precompile/laos-evolution/src/lib.rs
+++ b/evolution-chain/precompile/laos-evolution/src/lib.rs
@@ -65,11 +65,10 @@ where
 				match LaosEvolution::create_collection(owner.into()) {
 					Ok(collection_id) => {
 						LogsBuilder::new(context.address)
-							.log3(
+							.log2(
 								SELECTOR_LOG_NEW_COLLECTION,
-								H256::from_low_u64_be(collection_id.to_be()),
 								owner,
-								Vec::new(),
+								EvmDataWriter::new().write(collection_id).build(),
 							)
 							.record(handle)?;
 
diff --git a/evolution-chain/precompile/laos-evolution/src/tests.rs b/evolution-chain/precompile/laos-evolution/src/tests.rs
index 4192fadb5..9a4e45c79 100644
--- a/evolution-chain/precompile/laos-evolution/src/tests.rs
+++ b/evolution-chain/precompile/laos-evolution/src/tests.rs
@@ -3,6 +3,8 @@
 //TODO: remove this and fix clippy issues
 #![allow(clippy::redundant_closure_call)]
 
+use core::str::FromStr;
+
 use super::*;
 use frame_support::assert_ok;
 use precompile_utils::{
@@ -78,7 +80,7 @@ fn create_collection_should_return_collection_id() {
 
 #[test]
 fn create_collection_should_generate_log() {
-	impl_precompile_mock_simple!(Mock, Ok(0), None, Ok(0.into()), None);
+	impl_precompile_mock_simple!(Mock, Ok(123), None, Ok(0.into()), None);
 
 	let input = EvmDataWriter::new_with_selector(Action::CreateCollection)
 		.write(Address(H160([1u8; 20])))
@@ -90,10 +92,20 @@ fn create_collection_should_generate_log() {
 	let logs = handle.logs;
 	assert_eq!(logs.len(), 1);
 	assert_eq!(logs[0].address, H160::zero());
-	assert_eq!(logs[0].topics.len(), 3);
+	assert_eq!(logs[0].topics.len(), 2);
 	assert_eq!(logs[0].topics[0], SELECTOR_LOG_NEW_COLLECTION.into());
-	assert_eq!(logs[0].topics[1], H256::from_low_u64_be(0));
-	assert_eq!(logs[0].data, Vec::<u8>::new());
+	assert_eq!(
+		logs[0].topics[1],
+		H256::from_str("0x0000000000000000000000000101010101010101010101010101010101010101")
+			.unwrap()
+	);
+	assert_eq!(
+		logs[0].data,
+		vec![
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 123
+		]
+	);
 }
 
 #[test]

From 2db888de5cb4172c4c575b646bab964eeb907b14 Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Fri, 27 Oct 2023 17:07:34 +0200
Subject: [PATCH 02/10] test + mint uses data field

---
 .../precompile/laos-evolution/src/lib.rs      | 34 +++++++-------
 .../precompile/laos-evolution/src/tests.rs    | 44 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/evolution-chain/precompile/laos-evolution/src/lib.rs b/evolution-chain/precompile/laos-evolution/src/lib.rs
index 8c801c502..e9e872385 100644
--- a/evolution-chain/precompile/laos-evolution/src/lib.rs
+++ b/evolution-chain/precompile/laos-evolution/src/lib.rs
@@ -1,7 +1,7 @@
 //! LAOS precompile module.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{Log, Precompile, PrecompileHandle, PrecompileOutput};
+use fp_evm::{Precompile, PrecompileHandle, PrecompileOutput};
 use pallet_laos_evolution::{traits::LaosEvolution as LaosEvolutionT, Slot, TokenId};
 use parity_scale_codec::Encode;
 use precompile_utils::{
@@ -9,7 +9,7 @@ use precompile_utils::{
 	FunctionModifier, LogExt, LogsBuilder, PrecompileHandleExt,
 };
 
-use sp_core::{H160, H256};
+use sp_core::H160;
 use sp_std::{fmt::Debug, marker::PhantomData, vec::Vec};
 
 /// Solidity selector of the CreateCollection log, which is the Keccak of the Log signature.
@@ -110,8 +110,10 @@ where
 				let slot = input.read::<Slot>()?;
 				let to = input.read::<Address>()?.0;
 				let token_uri_raw = input.read::<Bytes>()?.0;
-				let token_uri =
-					token_uri_raw.try_into().map_err(|_| revert("invalid token uri length"))?;
+				let token_uri = token_uri_raw
+					.clone()
+					.try_into()
+					.map_err(|_| revert("invalid token uri length"))?;
 
 				match LaosEvolution::mint_with_external_uri(
 					caller.into(),
@@ -124,18 +126,18 @@ where
 						let mut token_id_bytes = [0u8; 32];
 						token_id.to_big_endian(&mut token_id_bytes);
 
-						Log {
-							address: context.address,
-							topics: sp_std::vec![
-								H256(SELECTOR_LOG_MINTED_WITH_EXTERNAL_TOKEN_URI),
-								H256::from(H160::zero()),
-								H256::from(to),
-								H256::from_low_u64_be(collection_id),
-								H256(token_id_bytes),
-							],
-							data: Vec::new(),
-						}
-						.record(handle)?;
+						LogsBuilder::new(context.address)
+							.log2(
+								SELECTOR_LOG_MINTED_WITH_EXTERNAL_TOKEN_URI,
+								to,
+								EvmDataWriter::new()
+									.write(collection_id)
+									.write(slot)
+									.write(Bytes(token_uri_raw))
+									.write(token_id)
+									.build(),
+							)
+							.record(handle)?;
 
 						Ok(succeed(EvmDataWriter::new().write(token_id).build()))
 					},
diff --git a/evolution-chain/precompile/laos-evolution/src/tests.rs b/evolution-chain/precompile/laos-evolution/src/tests.rs
index 9a4e45c79..0cda6b647 100644
--- a/evolution-chain/precompile/laos-evolution/src/tests.rs
+++ b/evolution-chain/precompile/laos-evolution/src/tests.rs
@@ -11,7 +11,7 @@ use precompile_utils::{
 	revert, succeed,
 	testing::{create_mock_handle, create_mock_handle_from_input},
 };
-use sp_core::{H160, U256};
+use sp_core::{H160, U256, H256};
 use sp_std::vec::Vec;
 
 type AccountId = H160;
@@ -108,6 +108,48 @@ fn create_collection_should_generate_log() {
 	);
 }
 
+#[test]
+fn mint_with_external_uri_should_generate_log() {
+	impl_precompile_mock_simple!(
+		Mock,
+		Ok(0),
+		Some(H160::from_low_u64_be(0x1234)),
+		Ok(1.into()),
+		None
+	);
+
+	let input = EvmDataWriter::new_with_selector(Action::Mint)
+		.write(U256::from(123)) // collection_id
+		.write(U256::from(9)) // slot
+		.write(Address(H160([1u8; 20]))) // to
+		.write(Bytes("ciao".into())) // token_uri
+		.build();
+	let mut handle = create_mock_handle_from_input(input);
+
+	let result = Mock::execute(&mut handle);
+	assert!(result.is_ok());
+	let logs = handle.logs;
+	assert_eq!(logs.len(), 1);
+	assert_eq!(logs[0].address, H160::zero());
+	assert_eq!(logs[0].topics.len(), 2);
+	assert_eq!(logs[0].topics[0], SELECTOR_LOG_MINTED_WITH_EXTERNAL_TOKEN_URI.into());
+	assert_eq!(
+		logs[0].topics[1],
+		H256::from_str("0x0000000000000000000000000101010101010101010101010101010101010101")
+			.unwrap()
+	);
+	assert_eq!(
+		logs[0].data,
+		vec![
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, // collection id
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, // slot
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
+			99, 105, 97, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
+	);
+}
+
 #[test]
 fn create_collection_on_mock_with_nonzero_value_fails() {
 	impl_precompile_mock_simple!(Mock, Ok(5), None, Ok(0.into()), None);

From 3500f24a5caf6663a4603a836b691828298244f0 Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Fri, 27 Oct 2023 17:13:38 +0200
Subject: [PATCH 03/10] fmt

---
 .../precompile/laos-evolution/src/tests.rs     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/evolution-chain/precompile/laos-evolution/src/tests.rs b/evolution-chain/precompile/laos-evolution/src/tests.rs
index 0cda6b647..1d546302c 100644
--- a/evolution-chain/precompile/laos-evolution/src/tests.rs
+++ b/evolution-chain/precompile/laos-evolution/src/tests.rs
@@ -11,7 +11,7 @@ use precompile_utils::{
 	revert, succeed,
 	testing::{create_mock_handle, create_mock_handle_from_input},
 };
-use sp_core::{H160, U256, H256};
+use sp_core::{H160, H256, U256};
 use sp_std::vec::Vec;
 
 type AccountId = H160;
@@ -141,12 +141,16 @@ fn mint_with_external_uri_should_generate_log() {
 	assert_eq!(
 		logs[0].data,
 		vec![
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, // collection id
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, // slot
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
-			99, 105, 97, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 123, // collection id
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 9, // slot
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 99, 105, 97, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+		]
 	);
 }
 

From 1f1b318179dc8054d5568bf8163fab4aa4ac4b63 Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Fri, 27 Oct 2023 17:34:53 +0200
Subject: [PATCH 04/10] refactoring test

---
 .../precompile/laos-evolution/src/tests.rs    | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/evolution-chain/precompile/laos-evolution/src/tests.rs b/evolution-chain/precompile/laos-evolution/src/tests.rs
index 1d546302c..30842f491 100644
--- a/evolution-chain/precompile/laos-evolution/src/tests.rs
+++ b/evolution-chain/precompile/laos-evolution/src/tests.rs
@@ -11,7 +11,7 @@ use precompile_utils::{
 	revert, succeed,
 	testing::{create_mock_handle, create_mock_handle_from_input},
 };
-use sp_core::{H160, H256, U256};
+use sp_core::{H160, U256, H256};
 use sp_std::vec::Vec;
 
 type AccountId = H160;
@@ -113,8 +113,8 @@ fn mint_with_external_uri_should_generate_log() {
 	impl_precompile_mock_simple!(
 		Mock,
 		Ok(0),
-		Some(H160::from_low_u64_be(0x1234)),
-		Ok(1.into()),
+		None,
+		Ok(U256::from_str("0x010203").unwrap()), // return token id 
 		None
 	);
 
@@ -141,16 +141,12 @@ fn mint_with_external_uri_should_generate_log() {
 	assert_eq!(
 		logs[0].data,
 		vec![
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 123, // collection id
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 9, // slot
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 99, 105, 97, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-		]
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, // collection id
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, // slot
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, // token id
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, // token uri length
+			99, 105, 97, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] // token uri 
 	);
 }
 

From ff07daf460275b5d38fd9b183048a1bb1d482c4f Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Fri, 27 Oct 2023 17:40:44 +0200
Subject: [PATCH 05/10] fmt

---
 .../precompile/laos-evolution/src/tests.rs    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/evolution-chain/precompile/laos-evolution/src/tests.rs b/evolution-chain/precompile/laos-evolution/src/tests.rs
index 30842f491..39399087e 100644
--- a/evolution-chain/precompile/laos-evolution/src/tests.rs
+++ b/evolution-chain/precompile/laos-evolution/src/tests.rs
@@ -11,7 +11,7 @@ use precompile_utils::{
 	revert, succeed,
 	testing::{create_mock_handle, create_mock_handle_from_input},
 };
-use sp_core::{H160, U256, H256};
+use sp_core::{H160, H256, U256};
 use sp_std::vec::Vec;
 
 type AccountId = H160;
@@ -114,7 +114,7 @@ fn mint_with_external_uri_should_generate_log() {
 		Mock,
 		Ok(0),
 		None,
-		Ok(U256::from_str("0x010203").unwrap()), // return token id 
+		Ok(U256::from_str("0x010203").unwrap()), // return token id
 		None
 	);
 
@@ -141,12 +141,18 @@ fn mint_with_external_uri_should_generate_log() {
 	assert_eq!(
 		logs[0].data,
 		vec![
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, // collection id
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, // slot
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, // token id
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, // token uri length
-			99, 105, 97, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] // token uri 
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 123, // collection id
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 9, // slot
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 1, 2, 3, // token id
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 4, // token uri length
+			99, 105, 97, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0
+		] // token uri
 	);
 }
 

From 418b2ff5e957fb0abc486c531e5cd249d2f5e185 Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Mon, 30 Oct 2023 15:26:19 +0100
Subject: [PATCH 06/10] removed merge line

---
 ownership-chain/precompile/laos-evolution/src/tests.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ownership-chain/precompile/laos-evolution/src/tests.rs b/ownership-chain/precompile/laos-evolution/src/tests.rs
index 6f274fcb5..39399087e 100644
--- a/ownership-chain/precompile/laos-evolution/src/tests.rs
+++ b/ownership-chain/precompile/laos-evolution/src/tests.rs
@@ -106,7 +106,6 @@ fn create_collection_should_generate_log() {
 			0, 0, 123
 		]
 	);
-<<<<<<< HEAD:evolution-chain/precompile/laos-evolution/src/tests.rs
 }
 
 #[test]
@@ -155,8 +154,6 @@ fn mint_with_external_uri_should_generate_log() {
 			0, 0, 0, 0, 0
 		] // token uri
 	);
-=======
->>>>>>> main:ownership-chain/precompile/laos-evolution/src/tests.rs
 }
 
 #[test]

From ca1e6ff22aa2132f1d72f673dc5a7f57e69bfc77 Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Mon, 30 Oct 2023 15:56:35 +0100
Subject: [PATCH 07/10] removed code

---
 ownership-chain/precompile/laos-evolution/src/lib.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ownership-chain/precompile/laos-evolution/src/lib.rs b/ownership-chain/precompile/laos-evolution/src/lib.rs
index e9e872385..f508cf5d3 100644
--- a/ownership-chain/precompile/laos-evolution/src/lib.rs
+++ b/ownership-chain/precompile/laos-evolution/src/lib.rs
@@ -123,9 +123,6 @@ where
 					token_uri,
 				) {
 					Ok(token_id) => {
-						let mut token_id_bytes = [0u8; 32];
-						token_id.to_big_endian(&mut token_id_bytes);
-
 						LogsBuilder::new(context.address)
 							.log2(
 								SELECTOR_LOG_MINTED_WITH_EXTERNAL_TOKEN_URI,

From c45b43d78538f9a4c011548f417adf96149b8df8 Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Mon, 30 Oct 2023 15:57:23 +0100
Subject: [PATCH 08/10] unused cast

---
 ownership-chain/precompile/laos-evolution/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ownership-chain/precompile/laos-evolution/src/lib.rs b/ownership-chain/precompile/laos-evolution/src/lib.rs
index f508cf5d3..190942584 100644
--- a/ownership-chain/precompile/laos-evolution/src/lib.rs
+++ b/ownership-chain/precompile/laos-evolution/src/lib.rs
@@ -130,7 +130,7 @@ where
 								EvmDataWriter::new()
 									.write(collection_id)
 									.write(slot)
-									.write(Bytes(token_uri_raw))
+									.write(token_uri_raw)
 									.write(token_id)
 									.build(),
 							)

From a15907dc852821f44cb1471f1169c5394e02a4f5 Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Mon, 30 Oct 2023 16:03:34 +0100
Subject: [PATCH 09/10] back to Bytes

---
 ownership-chain/precompile/laos-evolution/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ownership-chain/precompile/laos-evolution/src/lib.rs b/ownership-chain/precompile/laos-evolution/src/lib.rs
index 190942584..f508cf5d3 100644
--- a/ownership-chain/precompile/laos-evolution/src/lib.rs
+++ b/ownership-chain/precompile/laos-evolution/src/lib.rs
@@ -130,7 +130,7 @@ where
 								EvmDataWriter::new()
 									.write(collection_id)
 									.write(slot)
-									.write(token_uri_raw)
+									.write(Bytes(token_uri_raw))
 									.write(token_id)
 									.build(),
 							)

From 850f667140566fad896c8afefa7d000164e7c7bc Mon Sep 17 00:00:00 2001
From: Alessandro Siniscalchi <asiniscalchi@gmail.com>
Date: Mon, 30 Oct 2023 16:15:40 +0100
Subject: [PATCH 10/10] using ALICE address in tests

---
 ownership-chain/precompile/laos-evolution/src/tests.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ownership-chain/precompile/laos-evolution/src/tests.rs b/ownership-chain/precompile/laos-evolution/src/tests.rs
index 39399087e..e20ad6767 100644
--- a/ownership-chain/precompile/laos-evolution/src/tests.rs
+++ b/ownership-chain/precompile/laos-evolution/src/tests.rs
@@ -17,6 +17,8 @@ use sp_std::vec::Vec;
 type AccountId = H160;
 type AddressMapping = pallet_evm::IdentityAddressMapping;
 
+const ALICE: &str = "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac";
+
 #[test]
 fn check_selectors() {
 	assert_eq!(Action::CreateCollection as u32, 0x2069E953);
@@ -83,7 +85,7 @@ fn create_collection_should_generate_log() {
 	impl_precompile_mock_simple!(Mock, Ok(123), None, Ok(0.into()), None);
 
 	let input = EvmDataWriter::new_with_selector(Action::CreateCollection)
-		.write(Address(H160([1u8; 20])))
+		.write(Address(H160::from_str(ALICE).unwrap()))
 		.build();
 	let mut handle = create_mock_handle_from_input(input);
 
@@ -96,7 +98,7 @@ fn create_collection_should_generate_log() {
 	assert_eq!(logs[0].topics[0], SELECTOR_LOG_NEW_COLLECTION.into());
 	assert_eq!(
 		logs[0].topics[1],
-		H256::from_str("0x0000000000000000000000000101010101010101010101010101010101010101")
+		H256::from_str("0x000000000000000000000000f24ff3a9cf04c71dbc94d0b566f7a27b94566cac")
 			.unwrap()
 	);
 	assert_eq!(
@@ -121,7 +123,7 @@ fn mint_with_external_uri_should_generate_log() {
 	let input = EvmDataWriter::new_with_selector(Action::Mint)
 		.write(U256::from(123)) // collection_id
 		.write(U256::from(9)) // slot
-		.write(Address(H160([1u8; 20]))) // to
+		.write(Address(H160::from_str(ALICE).unwrap())) // to
 		.write(Bytes("ciao".into())) // token_uri
 		.build();
 	let mut handle = create_mock_handle_from_input(input);
@@ -135,7 +137,7 @@ fn mint_with_external_uri_should_generate_log() {
 	assert_eq!(logs[0].topics[0], SELECTOR_LOG_MINTED_WITH_EXTERNAL_TOKEN_URI.into());
 	assert_eq!(
 		logs[0].topics[1],
-		H256::from_str("0x0000000000000000000000000101010101010101010101010101010101010101")
+		H256::from_str("0x000000000000000000000000f24ff3a9cf04c71dbc94d0b566f7a27b94566cac")
 			.unwrap()
 	);
 	assert_eq!(