update to v0.7.0-alpha.0 (#62)

dojoengine · May 1, 2024 · 53c06b6 · 53c06b6
1 parent 501dcd4
commit 53c06b6
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: Origami CI
 on: [push, pull_request]
 
 env:
-  DOJO_VERSION: v0.6.0
+  DOJO_VERSION: v0.7.0-alpha.0
   SCARB_VERSION: v2.6.4
 
 jobs:

diff --git a/Scarb.lock b/Scarb.lock
@@ -16,7 +16,7 @@ source = "git+https://github.com/influenceth/cubit.git#9402f710716b12c21cd1e481c
 [[package]]
 name = "dojo"
 version = "0.6.0"
-source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0#fc5ad790c1993713e59f3fc65739160f132f29f0"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.7.0-alpha.0#2b2dc1bf35e4568bda7341f17267a931b49148b0"
 dependencies = [
  "dojo_plugin",
 ]

diff --git a/Scarb.toml b/Scarb.toml
@@ -17,6 +17,6 @@ authors = ["[email protected]"]
 
 [workspace.dependencies]
 cubit = { git = "https://github.com/influenceth/cubit.git" }
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.6.0" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.7.0-alpha.0" }
 origami = { path = "crates" }
 token = { path = "token" }
diff --git a/token/src/components/tests/mocks/erc20/erc20_balance_mock.cairo b/token/src/components/tests/mocks/erc20/erc20_balance_mock.cairo
@@ -31,7 +31,7 @@ trait IERC20BalanceMockInit<TState> {
     fn initializer(ref self: TState, initial_supply: u256, recipient: ContractAddress,);
 }
 
-#[dojo::contract]
+#[dojo::contract(allow_ref_self)]
 mod erc20_balance_mock {
     use starknet::ContractAddress;
     use token::components::token::erc20::erc20_allowance::erc20_allowance_component;

diff --git a/token/src/components/tests/mocks/erc20/erc20_bridgeable_mock.cairo b/token/src/components/tests/mocks/erc20/erc20_bridgeable_mock.cairo
@@ -12,7 +12,7 @@ trait IERC20BridgeableMockInit<TState> {
     );
 }
 
-#[dojo::contract]
+#[dojo::contract(allow_ref_self)]
 mod erc20_bridgeable_mock {
     use starknet::ContractAddress;
     use starknet::{get_caller_address, get_contract_address};

diff --git a/token/src/lib.cairo b/token/src/lib.cairo
@@ -1,27 +1,27 @@
-// mod components {
-//     mod introspection {
-//         mod src5;
-//     }
+mod components {
+    mod introspection {
+        mod src5;
+    }
 
-//     mod security {
-//         mod initializable;
-//     }
+    mod security {
+        mod initializable;
+    }
 
-//     mod token {
-//         mod erc20 {
-//             mod erc20_allowance;
-//             mod erc20_balance;
-//             mod erc20_bridgeable;
-//             mod erc20_burnable;
-//             mod erc20_metadata;
-//             mod erc20_mintable;
-//         }
+    mod token {
+        mod erc20 {
+            mod erc20_allowance;
+            mod erc20_balance;
+            mod erc20_bridgeable;
+            mod erc20_burnable;
+            mod erc20_metadata;
+            mod erc20_mintable;
+        }
 
-//         mod erc721 {}
-//     }
+        mod erc721 {}
+    }
 
-//     mod tests;
-// }
+    mod tests;
+}
 
 mod erc20 {
     mod interface;
@@ -50,13 +50,13 @@ mod erc1155 {
     mod tests;
 }
 
-// mod presets {
-//     mod erc20 {
-//         mod bridgeable;
-//         #[cfg(test)]
-//         mod tests_bridgeable;
-//     }
-// }
+mod presets {
+    mod erc20 {
+        mod bridgeable;
+        #[cfg(test)]
+        mod tests_bridgeable;
+    }
+}
 
 #[cfg(test)]
 mod tests {

diff --git a/token/src/presets/erc20/bridgeable.cairo b/token/src/presets/erc20/bridgeable.cairo
@@ -71,7 +71,7 @@ trait IERC20BridgeableInitializer<TState> {
     );
 }
 
-#[dojo::contract]
+#[dojo::contract(allow_ref_self)]
 mod ERC20Bridgeable {
     use integer::BoundedInt;
     use starknet::ContractAddress;