Solana players reg (#18)

* Adapt to new contract update

* Update players reg len constant

* Adapt to contract update

* Remove a log

* Bugfixes

---------

Co-authored-by: DogLooksGood <doglooksgood@gmail.com>

Author: DogLooksGood

transactor/src/component/event_loop/event_handler.rs

@@ -163,9 +163,9 @@ async fn do_send_settlements(
             game_context.settle_version(),
         );
 
-        if game_context.game_id() == 0 {
-            settle_details.print("do_send_settlements".to_string());
-        }
+        // if game_context.game_id() == 0 {
+        //     settle_details.print("do_send_settlements".to_string());
+        // }
 
         ports
             .send(EventFrame::Settle {

transport/src/error.rs

@@ -180,6 +180,12 @@ pub enum TransportError {
 
     #[error("Cannot get object: {0}")]
     GetObjectError(String),
+
+    #[error("Game account players not found")]
+    GameAccountPlayersNotFound,
+
+    #[error("Failed to deserialize players reg")]
+    PlayersRegDeserializationError,
 }
 
 pub type TransportResult<T> = std::result::Result<T, TransportError>;

transport/src/solana.rs

@@ -13,24 +13,26 @@ pub enum RaceInstruction {
     /// Accounts expected:
     /// 0. `[signer]` The account of transactor
     /// 1. `[writable]` The game account, hold all necessary info about the game
-    /// 2. `[writable]` The temp stake account
-    /// 3. `[]` The mint account
-    /// 4. `[]` The token program
-    /// 5. `[]` The bundled data account
-    /// 6. `[]` The recipient account
-    /// 7. `[]` The system program
+    /// 2. `[writable]` The players account, hold all player registrations
+    /// 3. `[writable]` The temp stake account
+    /// 4. `[]` The mint account
+    /// 5. `[]` The token program
+    /// 6. `[]` The bundled data account
+    /// 7. `[]` The recipient account
+    /// 8. `[]` The system program
     CreateGameAccount { params: IxCreateGameAccountParams },
 
     /// # [1] Close a game
     ///
     /// Accounts expected:
     /// 0. `[signer]` The account of game owner
     /// 1. `[writable]` The account of game account
-    /// 2. `[writable]` The stake account of game
-    /// 3. `[]` PDA account
-    /// 4. `[]` The account to receive tokens
-    /// 5. `[]` Token program
-    /// 6. `[]` The system program
+    /// 2. `[writable]` The players account, hold all player registrations
+    /// 3. `[writable]` The stake account of game
+    /// 4. `[]` PDA account
+    /// 5. `[]` The account to receive tokens
+    /// 6. `[]` Token program
+    /// 7. `[]` The system program
     /// Rest are the bonus stake account and receiver(owner)'s ATA
     CloseGameAccount,
 

transport/src/solana/types/instruction.rs

@@ -3,9 +3,11 @@ mod server;
 mod profile;
 mod recipient;
 mod registry;
+mod players;
 
 pub use game::*;
 pub use server::*;
 pub use profile::*;
 pub use recipient::*;
 pub use registry::*;
+pub use players::*;

transport/src/solana/types/state.rs

@@ -6,26 +6,7 @@ use race_core::{
     types::{EntryLock, EntryType, GameAccount, VoteType},
 };
 use solana_sdk::pubkey::Pubkey;
-
-#[cfg_attr(test, derive(PartialEq, Eq))]
-#[derive(Default, BorshDeserialize, BorshSerialize, Clone, Debug)]
-pub struct PlayerJoin {
-    pub addr: Pubkey,
-    pub position: u16,
-    pub access_version: u64,
-    pub verify_key: String,
-}
-
-impl From<PlayerJoin> for race_core::types::PlayerJoin {
-    fn from(value: PlayerJoin) -> Self {
-        Self {
-            addr: value.addr.to_string(),
-            position: value.position,
-            access_version: value.access_version,
-            verify_key: value.verify_key,
-        }
-    }
-}
+use crate::solana::types::state::players::PlayerJoin;
 
 #[cfg_attr(test, derive(PartialEq, Eq))]
 #[derive(Default, BorshDeserialize, BorshSerialize, Clone, Debug)]
@@ -137,8 +118,8 @@ pub struct GameState {
     pub settle_version: u64,
     // game size
     pub max_players: u16,
-    // game players
-    pub players: Vec<PlayerJoin>,
+    // the address to players reg account
+    pub players_reg_account: Pubkey,
     // player deposits
     pub deposits: Vec<PlayerDeposit>,
     // game servers (max: 10)
@@ -166,7 +147,7 @@ pub struct GameState {
 }
 
 impl GameState {
-    pub fn into_account<S: Into<String>>(self, addr: S) -> Result<GameAccount, Error> {
+    pub fn into_account<S: Into<String>>(self, addr: S, players: Vec<PlayerJoin>) -> Result<GameAccount, Error> {
         let GameState {
             title,
             bundle_addr,
@@ -176,7 +157,6 @@ impl GameState {
             access_version,
             settle_version,
             max_players,
-            players,
             servers,
             data_len,
             data,

transport/src/solana/types/state/game.rs

@@ -0,0 +1,69 @@
+use solana_sdk::pubkey::Pubkey;
+use borsh::{BorshSerialize, BorshDeserialize};
+
+#[cfg_attr(test, derive(PartialEq, Eq))]
+#[derive(BorshDeserialize, BorshSerialize, Clone, Debug)]
+pub struct PlayerJoin {
+    pub addr: Pubkey,
+    pub position: u16,
+    pub access_version: u64,
+    pub verify_key: [u8; 128], // size: 4, data: 128
+}
+
+impl From<PlayerJoin> for race_core::types::PlayerJoin {
+    fn from(value: PlayerJoin) -> Self {
+        Self {
+            addr: value.addr.to_string(),
+            position: value.position,
+            access_version: value.access_version,
+            verify_key: String::try_from_slice(&value.verify_key).unwrap_or("".to_string())
+        }
+    }
+}
+
+#[cfg_attr(test, derive(PartialEq, Eq))]
+#[derive(BorshDeserialize, BorshSerialize, Clone, Debug)]
+pub struct PlayersReg {
+    pub access_version: u64,
+    pub settle_version: u64,
+    pub size: usize,
+    pub position_flags: [u8; 128],
+    pub players: Vec<PlayerJoin>,
+}
+
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[derive(BorshDeserialize, BorshSerialize)]
+    struct S {
+        s: usize,
+        ns: [u8; 8],
+    }
+
+    #[test]
+    fn test_deser_players_reg() {
+        let v = [2, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+        let players_reg = PlayersReg::try_from_slice(&v).unwrap();
+        assert_eq!(players_reg.access_version, 2);
+        assert_eq!(players_reg.settle_version, 1);
+    }
+
+    #[test]
+    fn test_deser_player_join() {
+        let v = [0u8; 170];
+        let player_join = PlayerJoin::try_from_slice(&v).unwrap();
+        assert_eq!(player_join.access_version, 0);
+    }
+
+    #[test]
+    fn test_deser_fixed_array() {
+        let s = S {
+            s: 1,
+            ns: [0, 1, 2, 3, 4, 5, 6, 7]
+        };
+        let v = borsh::to_vec(&s).unwrap();
+        assert_eq!(v, vec![1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7]);
+    }
+}

transport/src/solana/types/state/players.rs

@@ -1674,8 +1674,9 @@ mod tests {
                 settle_version: 0,
                 status: DepositStatus::Accepted
             }],
+            stake: 0,
             servers: vec![],
-            balance: 100,
+            balances: vec![],
             data_len: 5,
             data: vec![8,1,2,3,4],
             votes: vec![],
@@ -1985,7 +1986,6 @@ mod tests {
         assert_eq!(game_obj.max_players, 10);
         assert_eq!(game_obj.transactor_addr, None);
         assert_eq!(game_obj.players, vec![]);
-        assert_eq!(game_obj.balance, 0);
         assert_eq!(game_obj.entry_type, EntryType::Ticket {amount: 100});
         assert_eq!(game_obj.entry_lock, EntryLock::Open);
 
@@ -2145,7 +2145,7 @@ mod tests {
         let params = SettleParams {
             addr: "".to_string(),
             settles: vec![],
-            transfers: vec![],
+            transfer: None,
             awards: vec![],
             checkpoint: CheckpointOnChain { root: vec![], size: 0, access_version: 0 },
             access_version: 0,