Misc

serai-dex · Jul 18, 2024 · b040dce · b040dce
1 parent 4104650
commit b040dce
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/substrate/client/tests/genesis_liquidity.rs b/substrate/client/tests/genesis_liquidity.rs
@@ -85,16 +85,22 @@ async fn test_genesis_liquidity(serai: Serai) {
     provide_batch(&serai, batch).await;
   }
 
-  // wait until genesis ends..
-  tokio::time::timeout(tokio::time::Duration::from_secs(3 * 10 * 6), async {
-    while serai.latest_finalized_block().await.unwrap().number() < 10 {
-      tokio::time::sleep(Duration::from_secs(6)).await;
-    }
-  })
+  // wait until genesis ends
+  let genesis_blocks = 10; // TODO
+  let block_time = 6; // TODO
+  tokio::time::timeout(
+    tokio::time::Duration::from_secs(3 * (genesis_blocks * block_time)),
+    async {
+      while serai.latest_finalized_block().await.unwrap().number() < 10 {
+        tokio::time::sleep(Duration::from_secs(6)).await;
+      }
+    },
+  )
   .await
   .unwrap();
 
-  // set prices
+  // set values relative to each other
+  // TODO: Random values here
   let values = Values { monero: 184100, ether: 4785000, dai: 1500 };
   set_values(&serai, &values).await;
   let values_map = HashMap::from([
@@ -177,7 +183,7 @@ async fn test_genesis_liquidity(serai: Serai) {
 }
 
 async fn set_values(serai: &Serai, values: &Values) {
-  // prepare a Musig tx to set the initial prices
+  // prepare a Musig tx to oraclize the relative values
   let pair = insecure_pair_from_name("Alice");
   let public = pair.public();
   // we publish the tx in set 4

diff --git a/substrate/genesis-liquidity/pallet/Cargo.toml b/substrate/genesis-liquidity/pallet/Cargo.toml
@@ -18,7 +18,6 @@ ignored = ["scale", "scale-info"]
 [lints]
 workspace = true
 
-
 [dependencies]
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"] }

diff --git a/substrate/genesis-liquidity/pallet/src/lib.rs b/substrate/genesis-liquidity/pallet/src/lib.rs
@@ -84,7 +84,7 @@ pub mod pallet {
       let final_block = MONTHS;
 
       // Distribute the genesis sri to pools after a month
-      if n.saturated_into::<u64>() >= final_block &&
+      if (n.saturated_into::<u64>() >= final_block) &&
         Self::oraclization_is_done() &&
         GenesisComplete::<T>::get().is_none()
       {
@@ -410,8 +410,8 @@ pub mod pallet {
     ) -> DispatchResult {
       ensure_none(origin)?;
 
-      // set the prices
-      Oracle::<T>::set(Coin::Bitcoin, Some(10u64.pow(8)));
+      // set their relative values
+      Oracle::<T>::set(Coin::Bitcoin, Some(10u64.pow(Coin::Bitcoin.decimals())));
       Oracle::<T>::set(Coin::Monero, Some(values.monero));
       Oracle::<T>::set(Coin::Ether, Some(values.ether));
       Oracle::<T>::set(Coin::Dai, Some(values.dai));

diff --git a/substrate/genesis-liquidity/primitives/src/lib.rs b/substrate/genesis-liquidity/primitives/src/lib.rs
@@ -21,7 +21,7 @@ use validator_sets_primitives::ValidatorSet;
 pub const INITIAL_GENESIS_LP_SHARES: u64 = 10_000;
 
 // This is the account to hold and manage the genesis liquidity.
-pub const GENESIS_LIQUIDITY_ACCOUNT: SeraiAddress = system_address(b"Genesis-liquidity-account");
+pub const GENESIS_LIQUIDITY_ACCOUNT: SeraiAddress = system_address(b"GenesisLiquidity-account");
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Zeroize))]