WIP

CarmineOptions · Dec 30, 2023 · c4dd3bc · c4dd3bc
1 parent 6837449
commit c4dd3bc
Show file tree

Hide file tree

Showing 10 changed files with 590 additions and 17 deletions.
diff --git a/Scarb.lock b/Scarb.lock
@@ -3,12 +3,18 @@ version = 1
 
 [[package]]
 name = "cubit"
-version = "1.2.0"
-source = "git+https://github.com/influenceth/cubit.git#b4590530d5aeae9aabd36740cc2a3d9e6adc5fde"
+version = "1.3.0"
+source = "git+https://github.com/akhercha/cubit.git?branch=chore%2Fcairo_upgrade#d3869a3f0c47e5ed229bbbfe2fce3fc0510cbc8a"
 
 [[package]]
 name = "governance"
 version = "0.2.0"
 dependencies = [
  "cubit",
+ "snforge_std",
 ]
+
+[[package]]
+name = "snforge_std"
+version = "0.1.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry.git#bfe39f12c7a8b872db0ae4c9ad4efe5673f78981"
diff --git a/Scarb.toml b/Scarb.toml
@@ -7,11 +7,12 @@ cairo-version = "2.3.1"
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest
 
 [dependencies]
-cubit = { git = "https://github.com/influenceth/cubit.git", commit = "b4590530d5aeae9aabd36740cc2a3d9e6adc5fde" }
+cubit = { git = "https://github.com/akhercha/cubit.git", branch = "chore/cairo_upgrade" }
 starknet = ">=1.1.0"
-#snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", commit = "acdd4a573cf6a89647f48124e75074674f844f47"}
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", commit = "acdd4a573cf6a89647f48124e75074674f844f47"}
 
 [[target.starknet-contract]]
+casm = true
 
 [[tool.snforge.fork]]
 name = "MAINNET"
@@ -21,4 +22,5 @@ block_id.tag = "Latest"
 [[tool.snforge.fork]]
 name = "GOERLI"
 url = "https://limited-rpc.nethermind.io/goerli-juno"
-block_id.tag = "Latest"
+block_id.tag = "Latest"
+
diff --git a/src/constants.cairo b/src/constants.cairo
@@ -14,7 +14,7 @@ const PROPOSAL_VOTING_SECONDS: u64 = consteval_int!(60 * 60 * 24 * 7);
 // ADDRESSES
 
 const USDC_ADDRESS: felt252 = 0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8;
-const ETH_ADDRESS: felt252 = 0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7;
+const ETH_ADDRESS: felt252 = 0x001020405060703020000000000cc84644ddd6b96f7c741b1562b82f9e004dc7;
 const BTC_ADDRESS: felt252 = 0x03fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac;
 
 // CLASS HASHES

diff --git a/src/deploy_amm.cairo b/src/deploy_amm.cairo
@@ -21,6 +21,8 @@ mod DeployAMM {
         AMM_CLASS_HASH, LP_TOKEN_CLASS_HASH, ETH_ADDRESS, USDC_ADDRESS, BTC_ADDRESS
     };
 
+    use debug::PrintTrait;
+
 
     // Deploys new AMM, sets AMM address storage var to new AMM, adds lptokens, etc etc etc
     fn deploy_amm() {
@@ -55,6 +57,8 @@ mod DeployAMM {
             0,
             FixedTrait::from_unscaled_felt(voladjspd_eth_call_lpt)
         );
+        'deployed call pool with base:'.print();
+        eth_addr.print();
         let eth_put_lpt_addr = deploy_lptoken(
             amm,
             'Carmine ETH/USDC put pool',