Carbon Protocol v3 - Components version

.gitignore

@@ -7,6 +7,7 @@ keystore.json
 __pycache__
 env
 .env
+.env.*
 test.*
 
 # starknet 
@@ -26,4 +27,5 @@ build
 .DS_Store
 
 tmp
-.tmp*
+.tmp*
+old*

Scarb.toml

@@ -8,7 +8,8 @@ version = "0.1.0"
 starknet = ">=2.3.1"
 alexandria_storage = { git = "https://github.com/tekkac/alexandria", branch = "feat/interpolation-fast" }
 alexandria_numeric = { git = "https://github.com/tekkac/alexandria", branch = "feat/interpolation-fast" }
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.7.0" }
-token = { git = "https://github.com/dojoengine/origami.git",  rev = "60d8eb7875d4c0367d75a337b0ce607ee5992e4b" }
+openzeppelin = { git = "https://github.com/cloudvenger/cairo-contracts.git", rev = "fd41fdb9d04a701b2353c4cd0a8bd19f3139e88a" }
 
 [[target.starknet-contract]]
+sierra = true
+casm = false

scripts/deploy_project.sh

@@ -1,15 +1,14 @@
 #!/bin/bash
 source ../.env
 
-SIERRA_FILE=../target/dev/carbon_Project.sierra.json
-NAME=0x436172626f6e5f54657374
+SIERRA_FILE=../target/dev/carbon_v3_Project.contract_class.json
+NAME="TokCC"
 SYMBOL="CARBT"
 DECIMALS=6
-OWNER=0x05bB7458b87FaaA41303A69B771ae26235F28b79aBD5FA1C451C43461DFE1438
-SLOT=1
-PROJECT_VALUE=100000000
-TIMES="2 1688169600 1719792000"
-ABSORPTIONS="2 0 2746197000000"
+OWNER=0x01e2F67d8132831f210E19c5Ee0197aA134308e16F7f284bBa2c72E28FC464D2
+PROJECT_VALUE=121099000000
+TIMES="21 1674579600 1706115600 1737738000 1769274000 1800810000 1832346000 1863968400 1895504400 1927040400 1958576400 1990198800 2021734800 2053270800 2084806800 2116429200 2147965200 2179501200 2211037200 2242659600 2274195600 2305731600"
+ABSORPTIONS="21 0 29609535 47991466 88828605 118438140 370922507 623406874 875891241 1128375608 1380859976 2076175721 2771491466 3466807212 4162122957 4857438703 5552754448 6248070193 6943385939 7638701684 8000000000 8000000000"
 TON_EQUIVALENT=1000000
 
 # build the solution
@@ -45,7 +44,7 @@ deploy() {
     class_hash=$(declare | tail -n 1)
     sleep 5
 
-    output=$(starkli deploy $class_hash "$NAME" str:"$SYMBOL" "$DECIMALS" "$OWNER" --keystore-password $KEYSTORE_PASSWORD --watch 2>&1)
+    output=$(starkli deploy $class_hash str:"$NAME" str:"$SYMBOL" "$OWNER" --keystore-password $KEYSTORE_PASSWORD --watch 2>&1)
 
     if [[ $output == *"Error"* ]]; then
         echo "Error: $output"
@@ -57,26 +56,23 @@ deploy() {
 }
 
 setup() {
-    contract=$(deploy)
-    sleep 5
-
-    output=$(starkli invoke $contract set_project_value u256:$SLOT u256:$PROJECT_VALUE --keystore-password $KEYSTORE_PASSWORD --watch 2>&1)
-    if [[ $output == *"Error"* ]]; then
-        echo "Error: $output"
-        exit 1
-    fi
+    #contract=$(deploy)
+    #sleep 5
+    contract="0x0348de44e0109e364e15c85407950a6ed39393a49396ca83c02516c4390f81e8"
 
-    output=$(starkli invoke $contract set_certifier u256:$SLOT $OWNER --keystore-password $KEYSTORE_PASSWORD --watch 2>&1)
+    output=$(starkli invoke $contract set_project_value u256:$PROJECT_VALUE --keystore-password $KEYSTORE_PASSWORD --watch 2>&1)
     if [[ $output == *"Error"* ]]; then
         echo "Error: $output"
         exit 1
     fi
+    echo "Success: $output"
 
-    output=$(starkli invoke $contract set_absorptions u256:$SLOT $TIMES $ABSORPTIONS $TON_EQUIVALENT --keystore-password $KEYSTORE_PASSWORD --watch 2>&1)
+    output=$(starkli invoke $contract set_absorptions $TIMES $ABSORPTIONS $TON_EQUIVALENT --keystore-password $KEYSTORE_PASSWORD --watch 2>&1)
     if [[ $output == *"Error"* ]]; then
         echo "Error: $output"
         exit 1
     fi
+    echo "Success: $output"
 
     echo $contract
 }

src/components/absorber.cairo

@@ -0,0 +1,4 @@
+mod module;
+mod interface;
+
+use module::AbsorberComponent;

src/components/absorber/interface.cairo

@@ -34,10 +34,7 @@ trait IAbsorber<TContractState> {
 
     /// Setup the absorption curve parameters.
     fn set_absorptions(
-        ref self: TContractState,
-        times: Span<u64>,
-        absorptions: Span<u64>,
-        ton_equivalent: u64
+        ref self: TContractState, times: Span<u64>, absorptions: Span<u64>, ton_equivalent: u64
     );
 
     /// Setup the project value for the given slot.