diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..8f83859f
Binary files /dev/null and b/.DS_Store differ
diff --git a/Cargo.lock b/Cargo.lock
index 34aac50a..7b107b7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -353,7 +353,7 @@ source = "git+https://github.com/jonas089/casper-client-rs?branch=last-stable-fe
 dependencies = [
  "async-trait",
  "base16",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
  "clap",
  "clap_complete",
  "hex-buffer-serde 0.4.0",
@@ -379,7 +379,7 @@ name = "casper-contract"
 version = "3.0.0"
 source = "git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab#0bcc25f4a203be4e78eed679b54127ab1ed848ab"
 dependencies = [
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
  "hex_fmt",
  "wee_alloc",
 ]
@@ -391,7 +391,7 @@ source = "git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed6
 dependencies = [
  "casper-execution-engine",
  "casper-storage",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
  "env_logger",
  "filesize",
  "humantime",
@@ -415,7 +415,7 @@ dependencies = [
  "base16",
  "bincode",
  "casper-storage",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
  "casper-wasm",
  "casper-wasm-utils",
  "casper-wasmi",
@@ -453,7 +453,7 @@ version = "1.4.3"
 source = "git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab#0bcc25f4a203be4e78eed679b54127ab1ed848ab"
 dependencies = [
  "bincode",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
  "datasize",
  "either",
  "lmdb-rkv",
@@ -467,35 +467,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "casper-types"
-version = "3.0.0"
-source = "git+https://github.com/casper-network/casper-node?branch=feat-2.0#c52231d862531c6543364fac99741364802d6223"
-dependencies = [
- "base16",
- "base64 0.13.1",
- "bitflags 1.3.2",
- "blake2",
- "derive_more",
- "ed25519-dalek",
- "hex",
- "hex_fmt",
- "itertools 0.10.5",
- "k256",
- "num",
- "num-derive",
- "num-integer",
- "num-rational",
- "num-traits",
- "rand",
- "serde",
- "serde-map-to-array",
- "serde_bytes",
- "serde_json",
- "tracing",
- "uint",
-]
-
 [[package]]
 name = "casper-types"
 version = "3.0.0"
@@ -678,7 +649,7 @@ name = "contract"
 version = "0.1.0"
 dependencies = [
  "casper-contract",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
  "contract-types 0.1.0",
  "serde-json-wasm",
 ]
@@ -687,16 +658,16 @@ dependencies = [
 name = "contract-types"
 version = "0.1.0"
 dependencies = [
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
  "serde",
 ]
 
 [[package]]
 name = "contract-types"
 version = "0.1.0"
-source = "git+https://github.com/jonas089/kairos-deposit-contract?branch=v2.0#75c0c326c99a9c3ed593dfdd46e275485894586f"
+source = "git+https://github.com/jonas089/kairos-deposit-contract?branch=last-stable-v2.0#c946973130b4174d91f94ca91fe37affca839d34"
 dependencies = [
- "casper-types 3.0.0 (git+https://github.com/casper-network/casper-node?branch=feat-2.0)",
+ "casper-types",
  "serde",
 ]
 
@@ -832,7 +803,7 @@ name = "deposit-session"
 version = "0.1.0"
 dependencies = [
  "casper-contract",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
 ]
 
 [[package]]
@@ -1624,9 +1595,9 @@ name = "kairos-contract-cli"
 version = "0.1.0"
 dependencies = [
  "casper-client",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
  "clap",
- "contract-types 0.1.0 (git+https://github.com/jonas089/kairos-deposit-contract?branch=v2.0)",
+ "contract-types 0.1.0 (git+https://github.com/jonas089/kairos-deposit-contract?branch=last-stable-v2.0)",
  "serde_json",
  "tokio",
 ]
@@ -1751,7 +1722,7 @@ name = "malicious-reader"
 version = "0.1.0"
 dependencies = [
  "casper-contract",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
 ]
 
 [[package]]
@@ -1759,7 +1730,7 @@ name = "malicious-session"
 version = "0.1.0"
 dependencies = [
  "casper-contract",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
 ]
 
 [[package]]
@@ -2892,7 +2863,7 @@ dependencies = [
  "casper-contract",
  "casper-engine-test-support",
  "casper-execution-engine",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
 ]
 
 [[package]]
@@ -3552,7 +3523,7 @@ name = "withdrawal-session"
 version = "0.1.0"
 dependencies = [
  "casper-contract",
- "casper-types 3.0.0 (git+https://github.com/jonas089/casper-node?rev=0bcc25f4a203be4e78eed679b54127ab1ed848ab)",
+ "casper-types",
 ]
 
 [[package]]
diff --git a/kairos-deposit-contract/build-macos-darwin-feat-2.0.sh b/kairos-deposit-contract/build-macos-darwin-feat-2.0.sh
index 8b90192f..b256b91e 100755
--- a/kairos-deposit-contract/build-macos-darwin-feat-2.0.sh
+++ b/kairos-deposit-contract/build-macos-darwin-feat-2.0.sh
@@ -1,24 +1,27 @@
-#rm -rf /Users/chef/.cargo/git/checkouts/casper-node-*
-rm -rf /Users/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release
+user=$1
+version="6f1becc37e1a8f50/0bcc25f"
+
+#rm -rf /Users/$user/.cargo/git/checkouts/casper-node-*
+rm -rf /Users/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release
 rustup target add wasm32-unknown-unknown
 
-mkdir -p /Users/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release
+mkdir -p /Users/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release
 cargo build -p contract --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/deposit-contract.wasm -o ../target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm
 
 cargo build -p deposit-session --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/deposit-session.wasm -o ../target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm /Users/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm /Users/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm /Users/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm /Users/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm
 
 cargo build -p malicious-session --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/malicious-session.wasm -o ../target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm /Users/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm /Users/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm
 
 cargo build -p withdrawal-session --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/withdrawal-session.wasm -o ../target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm /Users/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm /Users/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm
 
 cargo build -p malicious-reader --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/malicious-reader.wasm -o ../target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm /Users/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm /Users/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm
diff --git a/kairos-deposit-contract/build-ubuntu-feat-2.0.sh b/kairos-deposit-contract/build-ubuntu-feat-2.0.sh
index bbd95fe7..abc6cecb 100755
--- a/kairos-deposit-contract/build-ubuntu-feat-2.0.sh
+++ b/kairos-deposit-contract/build-ubuntu-feat-2.0.sh
@@ -1,23 +1,26 @@
-rm -rf /home/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release
+user=$1
+version="6f1becc37e1a8f50/0bcc25f"
+
+rm -rf /home/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release
 rustup target add wasm32-unknown-unknown
 
-mkdir -p /home/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release
+mkdir -p /home/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release
 cargo build -p contract --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/deposit-contract.wasm -o ../target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm
 
 cargo build -p deposit-session --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/deposit-session.wasm -o ../target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm /home/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm /home/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm /home/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/deposit-session-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm /home/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/deposit-contract-optimized.wasm
 
 cargo build -p malicious-session --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/malicious-session.wasm -o ../target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm /home/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm /home/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/malicious-session-optimized.wasm
 
 cargo build -p withdrawal-session --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/withdrawal-session.wasm -o ../target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm /home/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm /home/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/withdrawal-session-optimized.wasm
 
 cargo build -p malicious-reader --release --target wasm32-unknown-unknown
 wasm-opt --strip-debug --signext-lowering ../target/wasm32-unknown-unknown/release/malicious-reader.wasm -o ../target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm
-cp ../target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm /home/chef/.cargo/git/checkouts/casper-node-6f1becc37e1a8f50/0bcc25f/target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm
+cp ../target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm /home/$user/.cargo/git/checkouts/casper-node-$version/target/wasm32-unknown-unknown/release/malicious-reader-optimized.wasm