Bump dojo rc1 (#114)

.github/workflows/ci.yml

@@ -7,8 +7,8 @@ on:
   pull_request:
 
 env:
-  DOJO_VERSION: v1.0.0-alpha.19
-  SCARB_VERSION: 2.7.0
+  DOJO_VERSION: v1.0.0-rc.1
+  SCARB_VERSION: 2.8.4
 
 jobs:
   check:
@@ -99,25 +99,3 @@ jobs:
       - name: Test
         run: sozo test --package origami_security
         shell: bash
-
-  token:
-    needs: [check, build]
-    runs-on: ubuntu-latest
-    name: Test origami_token
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup
-      - name: Test
-        run: sozo test --package origami_token
-        shell: bash
-
-  governance:
-    needs: [check, build]
-    runs-on: ubuntu-latest
-    name: Test origami_governance
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup
-      - name: Test
-        run: sozo test --package origami_governance
-        shell: bash

.tool-versions

@@ -1 +1 @@
-scarb 2.7.0
+scarb 2.8.4

Scarb.lock

@@ -4,53 +4,34 @@ version = 1
 [[package]]
 name = "cubit"
 version = "1.3.0"
-source = "git+https://github.com/dojoengine/cubit?branch=update_to_2.7.0#075bf5a317452cd59aaf5bd1c044689220361c66"
-
-[[package]]
-name = "dojo"
-version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.19#ef696ea9bbaa22d3f6db392d9692b4821578c23c"
+source = "git+https://github.com/bal7hazar/cubit?branch=cairo-2.8.4#6bce623d5c735c097be47a4045c0e0432bad38e7"
 
 [[package]]
 name = "origami_algebra"
-version = "1.0.0-alpha.19"
+version = "1.0.0-rc.1"
 dependencies = [
  "cubit",
 ]
 
 [[package]]
 name = "origami_defi"
-version = "1.0.0-alpha.19"
+version = "1.0.0-rc.1"
 dependencies = [
  "cubit",
 ]
 
-[[package]]
-name = "origami_governance"
-version = "1.0.0-alpha.19"
-dependencies = [
- "dojo",
-]
-
 [[package]]
 name = "origami_map"
-version = "1.0.0-alpha.19"
+version = "1.0.0-rc.1"
 
 [[package]]
 name = "origami_random"
-version = "1.0.0-alpha.19"
+version = "1.0.0-rc.1"
 
 [[package]]
 name = "origami_rating"
-version = "1.0.0-alpha.19"
+version = "1.0.0-rc.1"
 
 [[package]]
 name = "origami_security"
-version = "1.0.0-alpha.19"
-
-[[package]]
-name = "origami_token"
-version = "1.0.0-alpha.19"
-dependencies = [
- "dojo",
-]
+version = "1.0.0-rc.1"

Scarb.toml

@@ -6,17 +6,15 @@ members = [
     "crates/random",
     "crates/rating",
     "crates/security",
-    "crates/token",
-    "crates/governance",
 ]
 
 [workspace.package]
-version = "1.0.0-alpha.19"
+version = "1.0.0-rc.1"
 
 [workspace.dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.19" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.1" }
 # dojo = { path = "../dojo/crates/dojo-core" }
-cubit = { git = "https://github.com/dojoengine/cubit", branch = "update_to_2.7.0" }
-starknet = "^2.7.0"
-cairo_test = "^2.7.0"
+cubit = { git = "https://github.com/bal7hazar/cubit", branch = "cairo-2.8.4" }
+starknet = "^2.8.4"
+cairo_test = "^2.8.4"
 # Scripts are not supported for virtual workspaces.

crates/defi/src/auction/gda.cairo

@@ -158,7 +158,7 @@ mod tests {
     mod discrete {
         // Local imports
 
-        use super::{Fixed, FixedTrait};
+        use super::FixedTrait;
         use super::{assert_approx_equal, TOLERANCE};
         use super::super::{DiscreteGDA, DiscreteGDATrait};
 

crates/defi/src/auction/helpers.cairo

@@ -14,7 +14,7 @@ pub fn from_days_fp(x: Fixed) -> Fixed {
 mod tests {
     // External imports
 
-    use cubit::f128::types::fixed::{Fixed, FixedTrait};
+    use cubit::f128::types::fixed::FixedTrait;
 
     // Local imports
 

crates/defi/src/auction/vrgda.cairo

@@ -1,6 +1,6 @@
 // External imports
 
-use cubit::f128::math::ops::{ln, abs, exp};
+use cubit::f128::math::ops::ln;
 use cubit::f128::types::fixed::{Fixed, FixedTrait};
 
 // Based on https://www.paradigm.xyz/2022/08/vrgda
@@ -153,8 +153,7 @@ mod tests {
     mod linear {
         // Local imports
 
-        use cubit::f128::types::fixed::{Fixed, FixedTrait, HALF_u128};
-        use super::{to_days_fp, from_days_fp};
+        use cubit::f128::types::fixed::{FixedTrait, HALF_u128};
         use super::assert_rel_approx_eq;
         use super::super::{LinearVRGDA, VRGDATrait};
 
@@ -197,7 +196,6 @@ mod tests {
         // Local imports
 
         use super::{Fixed, FixedTrait};
-        use super::{to_days_fp, from_days_fp};
         use super::assert_rel_approx_eq;
         use super::super::{LogisticVRGDA, VRGDATrait};