Merge branch 'main' of github.com:tangle-network/tangle

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "1.2.5"
+version = "1.2.7"
 authors = ["Tangle Foundation."]
 edition = "2021"
 license = "Unlicense"
@@ -10,6 +10,7 @@ exclude = ["examples"]
 
 [workspace]
 members = [
+    "account-util",
     "primitives",
     "primitives/crypto",
     "primitives/rpc/*",

account-util/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "account-util"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+exclude.workspace = true
+
+[dependencies]
+frame-support = { workspace = true, features = ["std"]  }
+sp-core = { workspace = true, features = ["std"]  }
+sp-runtime = { workspace = true, features = ["std"]  }
+sp-std = { workspace = true, features = ["std"]  }
+pallet-airdrop-claims = { workspace = true, features = ["std"]  }
+pallet-vesting = { workspace = true, features = ["std"]  }
+tangle-primitives = { workspace = true, features = ["std"]  }

account-util/src/lib.rs

@@ -0,0 +1,96 @@
+use tangle_primitives::Balance;
+
+pub const BLOCK_TIME: u128 = 6;
+pub const ONE_YEAR_BLOCKS: u64 = (365 * 24 * 60 * 60 / BLOCK_TIME) as u64;
+
+pub const INVESTOR_ACCOUNTS: [(&str, Balance); 29] = [
+	("5FCviiKcJzVfdwqv451JRQc93ZTSbbC9YfgKMkN3LpNMBjS3", 100000000000000000000000),
+	("0xC02ad7b9a9121fc849196E844DC869D2250DF3A6", 150000000000000000000000),
+	("5HBKM8XL7sr7S7qx6ukugDJUBhm16Ubnz1KuJCdHmHQvtc7Z", 400000000000000000000000),
+	("0x86f99feff4cd3268ccefc760a6bbce2e07aa4d8e", 100000000000000000000000),
+	("5HCJQLeQqCf64C6uy7CSoTND35QNdi1zU66TTM6QPCG9u9BB", 500000000000000000000000),
+	("5DhQMPP69vRBNvZ6w4E9qii1yj56M66YXuPkkvz12yvn5ufN", 2750000000000000000000000),
+	("0x17B74Dcf1E422AF5964056eB836321aE7A820035", 200000000000000000000000),
+	("5Df1Sec4ZmeidskuuPtpt4SSCL6U5St19fsv4sBAwvkwmvin", 100000000000000000000000),
+	("5FerzxKQZoP9wxjRhS1PHA4v27aPQMoZpXmufcQk1JYE5xU8", 100000000000000000000000),
+	("0x75afaece8cf2a7974b1e541648923afd9339b3f8", 150000000000000000000000),
+	("0x5a82d0bad9995b1bfa71de79b5e524decb5bee1c", 1000000000000000000000000),
+	("5Cf5SfzngS9T9fdQSsKt1GJ42BQPP7FqU4trLwgkDD1ZVBN7", 20000000000000000000000),
+	("0x5da7351A4Cb03c33e11F51841bc614d985812821", 20000000000000000000000),
+	("5DDTvr7P2MaUirj3rSvpcF5DLxECiAqpQegdVCzAuwxingVC", 50000000000000000000000),
+	("5CXkTTyNzVuE2fwNBzSwmmtcCntnun5vMDx6Wnn5VjopGUVx", 160000000000000000000000),
+	("5G9Ji4EEiTehMKa9Nfe2rGozZB3XEyRtyvJWt2wYLMRYyAyn", 180000000000000000000000),
+	("5EZcQuvjvuv1K4Ugg2ofLEhAC3NXPbaCAytPR3hmUqBv1Bhe", 200000000000000000000000),
+	("5Fe8pwn27TNBuM1Agz1ivCMykX795woPQkjwiWD4UoSndmQj", 220000000000000000000000),
+	("5HWLv9RvMSZ6FwuQswHCo1nmYxmAqRutqh37Vapx3pmXbVU3", 240000000000000000000000),
+	("5ENgRjBQue32ppyLw1u55Rbe36gDWTJgZmcbSfZwrJAyt2tZ", 781850000000000000000000),
+	("5DhzryWQpJTQfdauBf7yGKpr6LW42ye4oYvEYiVbMcGN7GZt", 879590000000000000000000),
+	("5C52zXiWq7BM5x55soCudf8daW12NTLtMfisBiYd5Pov1Hw1", 977320000000000000000000),
+	("5HbRuwKiUw4g7yh9iNBQ6zFG63sgZyGoZ4ep61CqMYTzk4gU", 1075050000000000000000000),
+	("5HnQ2onP12Vhv3dVUvmKocbWr5sMjunCmjt2MmtxMr5z5dp1", 1172780000000000000000000),
+	("5CAbD6BFcATxi9jVpixNtsLKovQy6RWQMQynHtapqAtKL8vT", 338150000000000000000000),
+	("5DP7RmWdPD6TWbTNgBu6iKzYsm95fHETXyy5tQvEmS6zDhPn", 380410000000000000000000),
+	("5EyDntnRYxgWLuHFRmSnirioDNpMDCUTQ4bwRYV3LGHQoMxo", 422680000000000000000000),
+	("5DkNqZs22mLYXKy7c2vrtstqbcQBU1ArPKw51xvC37eGsuNP", 464950000000000000000000),
+	("5CQJt5A7GmEUhh7S3MtaiBGvNRTY6PFw6KHJFcTVD4ZxBty7", 507220000000000000000000),
+];
+
+pub const TEAM_ACCOUNTS: [(&str, Balance); 11] = [
+	("5H4H4pVXrqs6r1kwdzevPXQnLAU8518hXSi6N25jYGiPrSoD", 10000000000000000000000),
+	("5DoX7xYr8kzLEdZRXzSHJvRahtntVWdAowe3P9KjjWKrRXNV", 150000000000000000000000),
+	("5HBXHgGuu5kuFtiLFxa7r3ygKCDBmddnyAA7AQ5HpLuJqXQb", 200000000000000000000000),
+	("5FjoBt9hjDSb81GuVK9Bqf1NHJcmeKFUnMmyXik1579dP9dW", 30000000000000000000000),
+	("5EbkKKTdRJzP1j3aM3S7q178du6tW7ZVWK9Dtjx9CbTFEpGf", 100000000000000000000000),
+	("5HYMCFxV9C8VGWXd5PAgD59accAsKmopEFfuKFhU2YAE6Xhu", 200000000000000000000000),
+	("5DhQuvKtVi41vPL8nSTFCTY7UJvNUQwEg9wAXRTU37iHBVRj", 15000000000000000000000),
+	("5FEb3bjP4KsFpet1sf81MerFqmTjTx8db2H3WctwvmB75At8", 250000000000000000000000),
+	("5F7UEB6Lo141pHYS1ySPf4UDTkuBEimSZmV9uehYJvXbc4CW", 150000000000000000000000),
+	("5H4RzH7KC1UZYwwNGgxmUEuahzYK21UJibS5jNkupHbLToqw", 30000000000000000000000),
+	("5FH32Ro5cTpLE1FhP3skdi16UuVariyzoQfyK7vvjE2CHEtX", 28721849310000000043843584),
+];
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use core::str::FromStr;
+	use pallet_airdrop_claims::MultiAddress;
+	use sp_core::H160;
+	use sp_runtime::AccountId32;
+
+	#[test]
+	fn test_decoding_accounts_into_account_id_32_bytes() {
+		for (address, _) in INVESTOR_ACCOUNTS {
+			let account_id = if address.starts_with("0x") {
+				MultiAddress::EVM(
+					H160::from_str(address).expect("should be a valid address").into(),
+				)
+				.to_account_id_32()
+			} else {
+				let account = MultiAddress::Native(
+					AccountId32::from_str(address).expect("should be a valid address"),
+				)
+				.to_account_id_32();
+
+				assert_eq!(
+					account,
+					AccountId32::from_str(address).expect("should be a valid address")
+				);
+
+				account
+			};
+
+			let account_id_bytes: [u8; 32] = account_id.into();
+			println!("INVESTOR | {:?}", account_id_bytes);
+		}
+
+		for (address, _) in TEAM_ACCOUNTS {
+			let account_id = MultiAddress::Native(
+				AccountId32::from_str(address).expect("should be a valid address"),
+			)
+			.to_account_id_32();
+
+			let account_id_bytes: [u8; 32] = account_id.into();
+			println!("TEAM | {:?}", account_id_bytes);
+		}
+	}
+}

node/tests/evm_restaking.rs

@@ -189,7 +189,8 @@ async fn deploy_tangle_lrt(
 
 // Mock values for consistent testing
 const EIGHTEEN_DECIMALS: u128 = 1_000_000_000_000_000_000_000;
-const MOCK_DEPOSIT_CAP: u128 = 1000 * EIGHTEEN_DECIMALS; // 1M tokens with 18 decimals
+const MOCK_DEPOSIT_CAP: u128 = 1_000_000 * EIGHTEEN_DECIMALS; // 1M tokens with 18 decimals
+const MOCK_DEPOSIT: u128 = 100_000 * EIGHTEEN_DECIMALS; // 100k tokens with 18 decimals
 const MOCK_APY: u8 = 10; // 10% APY
 
 /// Setup the E2E test environment.
@@ -297,7 +298,7 @@ where
 						api::runtime_types::pallet_rewards::types::RewardConfigForAssetVault {
 							apy: api::runtime_types::sp_arithmetic::per_things::Percent(MOCK_APY),
 							deposit_cap: MOCK_DEPOSIT_CAP,
-							incentive_cap: 0,
+							incentive_cap: 1,
 							boost_multiplier: Some(1),
 						},
 				},
@@ -935,7 +936,7 @@ fn mad_rewards() {
 		let cfg_addr = api::storage().rewards().reward_config_storage(vault_id);
 		let cfg = t.subxt.storage().at_latest().await?.fetch(&cfg_addr).await?.unwrap();
 
-		let deposit = U256::from(tnt) * U256::from(2);
+		let deposit = U256::from(MOCK_DEPOSIT);
 
 		// Setup a LRT Vault for Alice.
 		let lrt_address = deploy_tangle_lrt(
@@ -951,16 +952,16 @@ fn mad_rewards() {
 		let bob = TestAccount::Bob;
 		let bob_provider = alloy_provider_with_wallet(&t.provider, bob.evm_wallet());
 		// Mint WETH for Bob
-		let usdc_amount = deposit;
-		let usdc = MockERC20::new(t.usdc, &bob_provider);
-		usdc.mint(bob.address(), usdc_amount).send().await?.get_receipt().await?;
-
-		// // Approve LRT contract to spend WETH
-		// let deposit_amount = weth_amount;
-		// let approve_result =
-		// 	weth.approve(lrt_address, deposit_amount).send().await?.get_receipt().await?;
-		// assert!(approve_result.status());
-		// info!("Approved {} WETH for deposit in LRT", format_ether(deposit_amount));
+		let weth_amount = deposit;
+		let weth = MockERC20::new(t.weth, &bob_provider);
+		weth.mint(bob.address(), weth_amount).send().await?.get_receipt().await?;
+
+		// Approve LRT contract to spend WETH
+		let deposit_amount = weth_amount;
+		let approve_result =
+			weth.approve(lrt_address, deposit_amount).send().await?.get_receipt().await?;
+		assert!(approve_result.status());
+		info!("Approved {} WETH for deposit in LRT", format_ether(deposit_amount));
 
 		// // Deposit WETH to LRT
 		// let lrt = TangleLiquidRestakingVault::new(lrt_address, &bob_provider);

pallets/multi-asset-delegation/src/functions/deposit.rs

@@ -23,6 +23,7 @@ use frame_support::{
 };
 use sp_core::H160;
 use tangle_primitives::services::{Asset, EvmAddressMapping};
+use tangle_primitives::traits::RewardsManager;
 use tangle_primitives::types::rewards::LockMultiplier;
 
 impl<T: Config> Pallet<T> {
@@ -102,6 +103,9 @@ impl<T: Config> Pallet<T> {
 				let new_deposit = Deposit::new(amount, lock_multiplier, now);
 				metadata.deposits.insert(asset_id, new_deposit);
 			}
+
+			let _ = T::RewardsManager::record_deposit(&who, asset_id, amount, lock_multiplier);
+
 			Ok(())
 		})?;
 
@@ -145,6 +149,8 @@ impl<T: Config> Pallet<T> {
 				.map_err(|_| Error::<T>::MaxWithdrawRequestsExceeded)?;
 			metadata.withdraw_requests = withdraw_requests;
 
+			let _ = T::RewardsManager::record_withdrawal(&who, asset_id, amount);
+
 			Ok(())
 		})
 	}