[backend] update ajuna-pallets and add incrementing-asset-id provider in Casino Jam and in BattleMogs (#7)

Author: clangenb

backend/Cargo.lock

@@ -78,8 +78,7 @@ where
 
 		let mut table_asset = Self::get_owned_achievement_table(owner, table_id)?;
 
-		let mogwai_nonce = mogwai_id_1.saturating_add(*mogwai_id_2) % 31;
-		let mogwai_id = Self::new_asset_id(b"breed_mogwai", mogwai_nonce);
+		let mogwai_id = Self::new_asset_id()?;
 		let next_gen_hash = Sage::random_hash(b"breed_next_gen").0;
 
 		let (rarity, next_gen, max_rarity) = Generation::next_gen(

backend/games/battle_mogs/src/transitions/breed.rs

@@ -30,10 +30,7 @@ use sage_api::{traits::TransitionOutput, TransitionError};
 use frame_support::pallet_prelude::*;
 use parity_scale_codec::Codec;
 use sp_core::H256;
-use sp_runtime::{
-	traits::{AtLeast32BitUnsigned, BlockNumber as BlockNumberT, Member},
-	SaturatedConversion,
-};
+use sp_runtime::traits::{AtLeast32BitUnsigned, BlockNumber as BlockNumberT, Member};
 
 impl<AccountId, BlockNumber, Balance, Sage> BattleMogsTransition<AccountId, BlockNumber, Sage>
 where
@@ -56,7 +53,7 @@ where
 		Self::ensure_not_max_mogwais(owner)?;
 
 		let block_number = Sage::get_current_block_number();
-		let mogwai_id = Self::new_asset_id(b"mogwai_id", block_number.saturated_into());
+		let mogwai_id = Self::new_asset_id()?;
 
 		let random_hash_1 = Sage::random_hash(b"create_mogwai");
 		let random_hash_2 = Sage::random_hash(b"extend_mogwai");

backend/games/battle_mogs/src/transitions/create.rs

@@ -112,9 +112,8 @@ where
 		HashOutput = H256,
 	>,
 {
-	pub(crate) fn new_asset_id(subject: &[u8], nonce: u64) -> BattleMogsId {
-		let hash = Sage::random_hash(subject).0;
-		u64::from_le_bytes(hash[24..32].try_into().unwrap()).saturating_add(nonce)
+	fn new_asset_id() -> Result<BattleMogsId, TransitionError> {
+		Sage::create_next_asset_id().ok_or(TransitionError::CouldNotCreateAssetId)
 	}
 
 	pub(crate) fn ensure_not_max_mogwais(account: &AccountId) -> Result<(), TransitionError> {

backend/games/battle_mogs/src/transitions/mod.rs

@@ -27,10 +27,7 @@ use crate::asset::achievement_table::{AchievementState, AchievementTable};
 use frame_support::pallet_prelude::*;
 use parity_scale_codec::Codec;
 use sp_core::H256;
-use sp_runtime::{
-	traits::{AtLeast32BitUnsigned, BlockNumber as BlockNumberT, Member},
-	SaturatedConversion,
-};
+use sp_runtime::traits::{AtLeast32BitUnsigned, BlockNumber as BlockNumberT, Member};
 
 impl<AccountId, BlockNumber, Balance, Sage> BattleMogsTransition<AccountId, BlockNumber, Sage>
 where
@@ -75,7 +72,7 @@ where
 		};
 
 		let block_number = Sage::get_current_block_number();
-		let table_id = Self::new_asset_id(b"mogwai_id", block_number.saturated_into());
+		let table_id = Self::new_asset_id()?;
 
 		let asset = BattleMogsAsset {
 			id: table_id,

backend/games/battle_mogs/src/transitions/register.rs

@@ -119,16 +119,8 @@ where
 			.map_err(|_| TransitionError::Transition { code: ASSET_COULD_NOT_WITHDRAW_FUNDS })
 	}
 
-	fn generate_asset_id(nonce: u64) -> AssetId {
-		let hash_base = Sage::random_hash(b"create_asset");
-		let current_block_number = Sage::get_current_block_number();
-
-		hash_base
-			.0
-			.into_iter()
-			.fold(0 as AssetId, |acc, value| acc.saturating_add(value as AssetId))
-			.saturating_add(current_block_number.saturated_into())
-			.saturating_add(nonce as AssetId)
+	fn generate_asset_id() -> Result<AssetId, TransitionError> {
+		Sage::create_next_asset_id().ok_or(TransitionError::CouldNotCreateAssetId)
 	}
 
 	fn verify_transition_rules(
@@ -246,9 +238,9 @@ where
 
 				match action {
 					AssetType::Player => {
-						let player_id = Self::generate_asset_id(17);
+						let player_id = Self::generate_asset_id()?;
 						let player = Asset::new_player(player_id, current_block);
-						let tracker_id = Self::generate_asset_id(31);
+						let tracker_id = Self::generate_asset_id()?;
 						let tracker = Asset::new_tracker(tracker_id, current_block);
 
 						sp_std::vec![
@@ -258,7 +250,7 @@ where
 					},
 					AssetType::Machine(machine_type) => match machine_type {
 						MachineType::Bandit => {
-							let machine_id = Self::generate_asset_id(13);
+							let machine_id = Self::generate_asset_id()?;
 							let machine = Asset::new_bandit_machine(machine_id, current_block);
 							sp_std::vec![TransitionOutput::Minted(machine)]
 						},
@@ -462,7 +454,7 @@ where
 
 				machine.seat_linked = machine.seat_linked.saturating_add(1);
 
-				let seat_id = Self::generate_asset_id(3);
+				let seat_id = Self::generate_asset_id()?;
 				let current_block = Sage::get_current_block_number();
 				let seat = Asset::<BlockNumber>::new_seat(
 					seat_id,

backend/games/casino_jam/src/transition/mod.rs

@@ -26,6 +26,7 @@ use ajuna_payment_handler::{
 };
 use ajuna_primitives::{
 	asset_manager::{AssetFundsManager, AssetInspector, AssetManager},
+	next_asset_id_provider::IncrementingAssetIdProvider,
 	sage_api::SageApi,
 	season_manager::{SeasonConfig, SeasonManager},
 };
@@ -122,6 +123,7 @@ pub type SageBattleMogsInstance = pallet_sage::Instance2;
 impl pallet_sage::Config<SageBattleMogsInstance> for Runtime {
 	type PalletId = SageBattleMogsId;
 	type SageGameTransition = BattleMogsGameTransition;
+	type NextAssetIdProvider = IncrementingAssetIdProvider<BattleMogsAssetId>;
 	type SeasonHandler = SageBattleMogsSeasons;
 	type FeeHandler = BattleMogsFeeHandler;
 	type TransferFunds = TransferFungibleAssets<TransferWithdraw, FungiblesAssetId>;

backend/runtime/src/configs/sage/battle_mogs.rs

@@ -26,6 +26,7 @@ use ajuna_payment_handler::{
 };
 use ajuna_primitives::{
 	asset_manager::{AssetFundsManager, AssetInspector, AssetManager},
+	next_asset_id_provider::IncrementingAssetIdProvider,
 	sage_api::SageApi,
 	season_manager::{SeasonConfig, SeasonManager},
 };
@@ -121,6 +122,7 @@ pub type SageCasinoJamInstance = pallet_sage::Instance1;
 impl pallet_sage::Config<SageCasinoJamInstance> for Runtime {
 	type PalletId = SageCasinoJamId;
 	type SageGameTransition = CasinoJamGameTransition;
+	type NextAssetIdProvider = IncrementingAssetIdProvider<CasinoJamAssetId>;
 	type SeasonHandler = SageCasinoJamSeasons;
 	type FeeHandler = CasinoJamFeeHandler;
 	type TransferFunds = TransferFungibleAssets<TransferWithdraw, FungiblesAssetId>;