Next step 4. Active branch

Cargo.toml

@@ -10,21 +10,20 @@ server = ["dep:tokio","dep:salvo","dep:exec"]
 used_linker = []
 
 [dependencies]
-clvm_tools_rs = { git = "https://github.com/Chia-Network/clvm_tools_rs.git", rev = "ec75759377791c9b785123d2d3e2457d08ac6621" }
-clvmr = { version = "=0.3.2", features = ["pre-eval"] }
+clvmr = { version = "=0.12.0", features = ["pre-eval"] }
 serde_json = "1.0"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
-clvm-traits = "0.7.0"
+clvm-traits = "0.20.0"
 blst = "=0.3.13"
 subtle = "2.5.0"
 num-bigint = "0.4.4"
 num-traits = "0.2.15"
 chia-bls = "=0.9.0"
-clvm-utils = "0.7.0"
+clvm-utils = "0.20.0"
 lazy_static = "1.4.0"
 ff = { version = "0.13.0", features = ["derive"] }
-bson = "2.11.0"
+bson = "2.13.0"
 sha2 = "0.10.8"
 indoc = "2.0.5"
 serde = "1.0.203"
@@ -46,8 +45,8 @@ exec = "0.3.1"
 [build-dependencies]
 serde = "1.0.203"
 toml = "0.8.14"
-clvm_tools_rs = { git = "https://github.com/Chia-Network/clvm_tools_rs.git", rev = "ec75759377791c9b785123d2d3e2457d08ac6621" }
-clvmr = { version = "=0.3.2", features = ["pre-eval"] }
+clvm_tools_rs = { git = "https://github.com/Chia-Network/clvm_tools_rs.git", rev = "f5f6ebd339b4782d9b3c65db8796af554d341bd8" }
+clvmr = { version = "=0.12.0", features = ["pre-eval"] }
 
 [lib]
 name = "chia_gaming"

src/channel_handler/game.rs

@@ -3,7 +3,7 @@ use std::rc::Rc;
 use clvm_traits::{ClvmEncoder, ToClvm};
 use clvmr::run_program;
 
-use clvm_tools_rs::classic::clvm::sexp::proper_list;
+use crate::utils::proper_list;
 
 use log::debug;
 
@@ -36,7 +36,9 @@ impl Game {
         game_hex_file: &str,
     ) -> Result<Game, Error> {
         let poker_generator = read_hex_puzzle(allocator, game_hex_file)?;
-        let nil = allocator.encode_atom(&[]).into_gen()?;
+        let nil = allocator
+            .encode_atom(clvm_traits::Atom::Borrowed(&[]))
+            .into_gen()?;
         let poker_generator_clvm = poker_generator.to_clvm(allocator).into_gen()?;
         debug!("running start");
         let template_clvm = run_program(
@@ -72,17 +74,17 @@ impl Game {
             .expect("should be an atom");
         let required_size_factor = Amount::new(
             atom_from_clvm(allocator, template_list[3])
-                .and_then(u64_from_atom)
+                .and_then(|a| u64_from_atom(&a))
                 .expect("should be an atom"),
         );
         let initial_max_move_size = atom_from_clvm(allocator, template_list[4])
-            .and_then(usize_from_atom)
+            .and_then(|a| usize_from_atom(&a))
             .expect("should be an atom");
         let validation_prog = Rc::new(Program::from_nodeptr(allocator, template_list[5])?);
         let initial_validation_program = ValidationProgram::new(allocator, validation_prog);
         let initial_validation_program_hash =
             if let Some(a) = atom_from_clvm(allocator, template_list[6]) {
-                Hash::from_slice(a)
+                Hash::from_slice(&a)
             } else {
                 return Err(Error::StrErr(
                     "not an atom for initial_validation_hash".to_string(),
@@ -91,7 +93,7 @@ impl Game {
         let initial_state_node = template_list[7];
         let initial_state = Rc::new(Program::from_nodeptr(allocator, initial_state_node)?);
         let initial_mover_share_proportion = atom_from_clvm(allocator, template_list[8])
-            .and_then(usize_from_atom)
+            .and_then(|a| usize_from_atom(&a))
             .expect("should be an atom");
         Ok(Game {
             id: game_id,
@@ -130,7 +132,7 @@ impl Game {
                 my_contribution_this_game: our_contribution.clone(),
                 their_contribution_this_game: their_contribution.clone(),
                 initial_validation_program: self.initial_validation_program.clone(),
-                initial_state: self.initial_state.clone(),
+                initial_state: self.initial_state.clone().into(),
                 initial_move: vec![],
                 initial_max_move_size: self.initial_max_move_size,
                 initial_mover_share: mover_share,
@@ -143,7 +145,7 @@ impl Game {
                 my_contribution_this_game: their_contribution.clone(),
                 their_contribution_this_game: our_contribution.clone(),
                 initial_validation_program: self.initial_validation_program.clone(),
-                initial_state: self.initial_state.clone(),
+                initial_state: self.initial_state.clone().into(),
                 initial_move: vec![],
                 initial_max_move_size: self.initial_max_move_size,
                 initial_mover_share: waiter_share,