WIP: test encoder

frame/nfts/Cargo.toml

@@ -25,6 +25,7 @@ sp-runtime = { version = "7.0.0", default-features = false, path = "../../primit
 sp-std = { version = "5.0.0", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
+array-bytes = "4.1"
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "7.0.0", path = "../../primitives/core" }
 sp-io = { version = "7.0.0", path = "../../primitives/io" }

frame/nfts/src/lib.rs

@@ -1786,16 +1786,20 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let msg = Encode::encode(&data);
+			use sp_core::hexdisplay::HexDisplay;
+			log::info!("DDEBUG: msg {:?}", HexDisplay::from(&msg));
+			log::info!("DDEBUG: signature {:?}", &signature);
+			log::info!("DDEBUG: signer {:?}", &signer.clone().into_account());
 			ensure!(
 				signature.verify(&*msg, &signer.clone().into_account()),
 				Error::<T, I>::WrongSignature
 			);
 
 			let signer_account = Self::signer_to_account(signer)?;
-			log::info!("signer_account {:?}", &signer_account);
+			log::info!("DDEBUG: signer_account {:?}", &signer_account);
 
-			let PreSignedMint { collection, item, metadata, deadline, only_account } = data;
-			let metadata = Self::construct_metadata(metadata)?;
+			let PreSignedMint { collection, item, /* metadata, */ deadline, only_account } = data;
+			// let metadata = Self::construct_metadata(metadata)?;
 
 			if let Some(account) = only_account {
 				ensure!(account == origin, Error::<T, I>::WrongOrigin);
@@ -1818,14 +1822,16 @@ pub mod pallet {
 				item_config,
 				|_, _| Ok(()),
 			)?;
-
-			Self::do_set_item_metadata(
-				Some(collection_details.owner),
-				collection,
-				item,
-				metadata,
-				Some(origin),
-			)
+			/*if !metadata.len().is_zero() {
+				Self::do_set_item_metadata(
+					Some(collection_details.owner),
+					collection,
+					item,
+					metadata,
+					Some(origin),
+				)?;
+			}*/
+			Ok(())
 		}
 	}
 }

frame/nfts/src/tests.rs

@@ -2503,19 +2503,50 @@ fn add_remove_item_attributes_approval_should_work() {
 #[test]
 fn pre_signed_mints_should_work() {
 	new_test_ext().execute_with(|| {
-		let user1_pair = sp_core::sr25519::Pair::from_string("//Alice///password", None).unwrap();
+		let user1_pair = sp_core::sr25519::Pair::from_string("//Alice", None).unwrap();
 		let user1_signer = MultiSigner::Sr25519(user1_pair.public());
 		let user1 = Nfts::signer_to_account(user1_signer.clone()).unwrap();
-		let mint_data = PreSignedMint {
+		let mint_data: PreSignedMint<u32, u32, u64, u64> = PreSignedMint {
 			collection: 0,
 			item: 0,
-			metadata: bvec![0],
+			// metadata: vec![0],
 			only_account: None,
-			deadline: 1,
+			deadline: 10000000,
 		};
-		let signature = MultiSignature::Sr25519(user1_pair.sign(&Encode::encode(&mint_data)));
-		dbg!(user1);
-
+		let message = Encode::encode(&mint_data);
+
+		use sp_core::hexdisplay::HexDisplay;
+		dbg!(HexDisplay::from(&message));
+		// 0000000000000000008096980000000000
+
+		let signature = MultiSignature::Sr25519(user1_pair.sign(&message));
+		// let a = &array_bytes::hex2bytes_unchecked("00000000000000000080969800")[..];
+		// dbg!(a);
+		// let signature = MultiSignature::Sr25519(user1_pair.sign(&a));
+
+		// use sp_runtime::traits::{IdentifyAccount, Verify};
+		// dbg!(signature.verify(&*message, &user1_signer.clone().into_account()));
+
+		// use sp_core::crypto::Ss58Codec;
+		// dbg!(user1_pair.public().to_ss58check());
+		// dbg!(user1);
+		dbg!(&signature);
+		// dbg!(&user1_signer);
+		dbg!(&user1_pair.public());
+
+		/*
+		2023-01-13 14:20:54 DDEBUG: msg 00000000000000000080969800
+		2023-01-13 14:20:54 DDEBUG: signature MultiSignature::Sr25519(9483ca2df9b4ffe1dae4fa1412377ab6bf00e51e85ca5ebb0a9730861712f62d203d026e61090d5570f50c389563c4b1fd0b819e3c0df8179408184259192685)
+		2023-01-13 14:20:54 DDEBUG: signer d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d (5GrwvaEF...)
+
+		2023-01-13 14:39:51 DDEBUG: msg 00000000000000000080969800
+		2023-01-13 14:39:51 DDEBUG: signature MultiSignature::Sr25519(20a4c1caededa2b23a76105bfc3c483d5ca9b2cfb8d6a470084c28c5219ad95624f54250c795134ba81ad9ac8cb2f08cf2f5c1449dfe5a21e74e18c83bad4e8f)
+		2023-01-13 14:39:51 DDEBUG: signer d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d (5GrwvaEF...)
+
+		2023-01-13 16:08:06 DDEBUG: msg 00000000000000000080969800
+		2023-01-13 16:08:06 DDEBUG: signature MultiSignature::Sr25519(9483ca2df9b4ffe1dae4fa1412377ab6bf00e51e85ca5ebb0a9730861712f62d203d026e61090d5570f50c389563c4b1fd0b819e3c0df8179408184259192685)
+		2023-01-13 16:08:06 DDEBUG: signer d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d (5GrwvaEF...)
+		*/
 		let user2 = 2;
 
 		Balances::make_free_balance_be(&user1, 100);

frame/nfts/src/types.rs

@@ -486,8 +486,8 @@ pub struct PreSignedMint<CollectionId, ItemId, AccountId, Deadline> {
 	pub(super) collection: CollectionId,
 	/// Item's id.
 	pub(super) item: ItemId,
-	/// Additional item's metadata.
-	pub(super) metadata: Vec<u8>,
+	// Additional item's metadata.
+	// pub(super) metadata: Vec<u8>,
 	/// Restrict the claim to a particular account.
 	pub(super) only_account: Option<AccountId>,
 	/// A deadline for the signature.