⬆️ Upgrade dojo to v0.7.2 (#77)

* ⬆️ Upgrade dojo to v0.7.2 * 💄 Code format * remove allow_ref_self * remove useless code --------- Co-authored-by: notV4l <[email protected]>
dojoengine · Jun 20, 2024 · c537966 · c537966
1 parent ab4fde3
commit c537966
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,8 +3,8 @@ name: Origami CI
 on: [push, pull_request]
 
 env:
-  DOJO_VERSION: v0.7.1
-  SCARB_VERSION: v2.6.4
+  DOJO_VERSION: v0.7.2
+  SCARB_VERSION: nightly-2024-06-08
 
 jobs:
   check:

diff --git a/Scarb.lock b/Scarb.lock
@@ -15,8 +15,8 @@ source = "git+https://github.com/notV4l/cubit.git?branch=cairo_2.7#cadb27aa62509
 
 [[package]]
 name = "dojo"
-version = "0.7.1"
-source = "git+https://github.com/dojoengine/dojo?tag=v0.7.1#c4a1feadf1d5c5ecf9593b50c1a2ca2856ae2313"
+version = "0.7.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.7.2#3da5cad9fdd39b81551e0668015d88262e6c5fc4"
 dependencies = [
  "dojo_plugin",
 ]
@@ -60,7 +60,7 @@ dependencies = [
 
 [[package]]
 name = "origami"
-version = "0.7.0"
+version = "0.7.2"
 dependencies = [
  "cubit",
  "dojo",

diff --git a/Scarb.toml b/Scarb.toml
@@ -11,14 +11,14 @@ members = [
 ]
 
 [workspace.package]
-version = "0.7.1"
+version = "0.7.2"
 description = "Community-maintained libraries for Cairo"
 homepage = "https://github.com/dojoengine/origami"
 authors = ["[email protected]"]
 
 [workspace.dependencies]
 # cubit = { git = "https://github.com/influenceth/cubit.git" }
 cubit = { git = "https://github.com/notV4l/cubit.git", branch = "cairo_2.7" }
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.7.1" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.7.2" }
 origami = { path = "crates" }
 token = { path = "token" }
diff --git a/examples/hex_map/src/actions.cairo b/examples/hex_map/src/actions.cairo
@@ -67,16 +67,11 @@ mod actions {
     #[abi(embed_v0)]
     impl ActionsImpl of IActions<ContractState> {
         // ContractState is defined by system decorator expansion
-        fn spawn(ref world: IWorldDispatcher) { // Access the world dispatcher for reading.
-            let world = self.world_dispatcher.read();
-
+        fn spawn(ref world: IWorldDispatcher) {
             set!(world, (Position { player: get_caller_address(), vec: Vec2 { x: 10, y: 10 } }));
         }
         // Moves player in the provided direction.
         fn move(ref world: IWorldDispatcher, direction: Direction) {
-            // Access the world dispatcher for reading.
-            let world = self.world_dispatcher.read();
-
             // Get the address of the current caller, possibly the player's address.
             let player = get_caller_address();
 

diff --git a/examples/matchmaker/src/helpers/bitmap.cairo b/examples/matchmaker/src/helpers/bitmap.cairo
@@ -60,10 +60,6 @@ impl Bitmap of BitmapTrait {
 
     /// The index of the most significant bit of the number,
     /// where the least significant bit is at index 0 and the most significant bit is at index 255
-    /// Source:
-    ///
-    /// 
-    /// https://github.com/lambdaclass/yet-another-swap/blob/main/crates/yas_core/src/libraries/bit_math.cairo
     /// # Arguments * `x` - The value for which to compute the most significant bit, must be greater
     /// than 0.
     /// # Returns
@@ -111,10 +107,6 @@ impl Bitmap of BitmapTrait {
 
     /// The index of the least significant bit of the number,
     /// where the least significant bit is at index 0 and the most significant bit is at index 255
-    /// Source:
-    ///
-    /// 
-    /// https://github.com/lambdaclass/yet-another-swap/blob/main/crates/yas_core/src/libraries/bit_math.cairo
     /// # Arguments * `x` - The value for which to compute the least significant bit, must be
     /// greater than 0.
     /// # Returns

diff --git a/governance/src/systems/timelock/contract.cairo b/governance/src/systems/timelock/contract.cairo
@@ -24,7 +24,7 @@ mod timelock {
             assert!(
                 delay <= MAXIMUM_DELAY, "Timelock::initialize: Delay must not exceed maximum delay."
             );
-            let world = self.world_dispatcher.read();
+
             let contract = get_contract_address();
             let curr_params = get!(world, contract, TimelockParams);
             assert!(

diff --git a/token/src/components/introspection/src5.cairo b/token/src/components/introspection/src5.cairo
@@ -1,4 +1,5 @@
-/// adaptation of https://github.com/OpenZeppelin/cairo-contracts/blob/main/src/introspection/src5.cairo for dojo
+/// adaptation of
+/// https://github.com/OpenZeppelin/cairo-contracts/blob/main/src/introspection/src5.cairo for dojo
 
 use starknet::ContractAddress;
 

diff --git a/token/src/components/security/initializable.cairo b/token/src/components/security/initializable.cairo
@@ -1,4 +1,6 @@
-/// adaptation of https://github.com/OpenZeppelin/cairo-contracts/blob/main/src/security/initializable.cairo for dojo
+/// adaptation of
+/// https://github.com/OpenZeppelin/cairo-contracts/blob/main/src/security/initializable.cairo for
+/// dojo
 
 use starknet::ContractAddress;
 

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(allow_ref_self)]
+#[dojo::contract]
 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(allow_ref_self)]
+#[dojo::contract]
 mod erc20_bridgeable_mock {
     use starknet::ContractAddress;
     use starknet::{get_caller_address, get_contract_address};

diff --git a/token/src/components/tests/mocks/erc721/erc721_balance_mock.cairo b/token/src/components/tests/mocks/erc721/erc721_balance_mock.cairo
@@ -39,7 +39,7 @@ trait IERC721BalanceMockInit<TState> {
     fn initializer(ref self: TState, recipient: ContractAddress, token_id: u256);
 }
 
-#[dojo::contract(allow_ref_self)]
+#[dojo::contract]
 mod erc721_balance_mock {
     use starknet::ContractAddress;
     use token::components::token::erc721::erc721_approval::erc721_approval_component;

diff --git a/token/src/components/tests/mocks/erc721/erc721_receiver_mock.cairo b/token/src/components/tests/mocks/erc721/erc721_receiver_mock.cairo
@@ -13,7 +13,7 @@ trait IERC721ReceiverMockInit<TState> {
     fn initializer(ref self: TState);
 }
 
-#[dojo::contract(allow_ref_self)]
+#[dojo::contract]
 mod erc721_receiver_mock {
     use token::components::introspection::src5::src5_component;
     use token::components::token::erc721::erc721_receiver::erc721_receiver_component;

diff --git a/token/src/components/tests/token/erc20/test_erc20_allowance.cairo b/token/src/components/tests/token/erc20/test_erc20_allowance.cairo
@@ -88,7 +88,7 @@ fn test_erc20_allowance_approve_to_zero() {
 }
 
 //
-//  spend_allowance 
+//  spend_allowance
 //
 
 #[test]

diff --git a/token/src/components/tests/token/erc20/test_erc20_balance.cairo b/token/src/components/tests/token/erc20/test_erc20_balance.cairo
@@ -208,7 +208,7 @@ fn test_transfer_from() {
     assert_event_approval(erc20_balance_mock.contract_address, OWNER(), SPENDER(), 0);
     assert_only_event_transfer(erc20_balance_mock.contract_address, OWNER(), RECIPIENT(), VALUE);
 
-    // drop StoreSetRecord ERC20AllowanceModel 
+    // drop StoreSetRecord ERC20AllowanceModel
     utils::drop_event(world.contract_address);
     assert_event_approval(world.contract_address, OWNER(), SPENDER(), 0);
     // drop StoreSetRecord ERC20BalanceModel x2
@@ -258,7 +258,7 @@ fn test_transfer_from_from_zero_address() {
 
 
 //
-// transferFrom 
+// transferFrom
 //
 
 #[test]
@@ -277,7 +277,7 @@ fn test_transferFrom() {
     assert_event_approval(erc20_balance_mock.contract_address, OWNER(), SPENDER(), 0);
     assert_only_event_transfer(erc20_balance_mock.contract_address, OWNER(), RECIPIENT(), VALUE);
 
-    // drop StoreSetRecord ERC20AllowanceModel 
+    // drop StoreSetRecord ERC20AllowanceModel
     utils::drop_event(world.contract_address);
     assert_event_approval(world.contract_address, OWNER(), SPENDER(), 0);
     // drop StoreSetRecord ERC20BalanceModel x2

diff --git a/token/src/components/tests/token/erc20/test_erc20_bridgeable.cairo b/token/src/components/tests/token/erc20/test_erc20_bridgeable.cairo
@@ -55,7 +55,7 @@ fn setup() -> erc20_bridgeable_mock::ContractState {
 }
 
 //
-// initializer 
+// initializer
 //
 
 #[test]

diff --git a/token/src/components/tests/token/erc721/test_erc721_balance.cairo b/token/src/components/tests/token/erc721/test_erc721_balance.cairo
@@ -241,7 +241,7 @@ fn test_transfer_from() {
         erc721_balance_mock.contract_address, OWNER(), RECIPIENT(), TOKEN_ID
     );
 
-    // // drop StoreSetRecord ERC721TokenApprovalModel 
+    // // drop StoreSetRecord ERC721TokenApprovalModel
     utils::drop_event(world.contract_address);
     // // drop StoreSetRecord ERC721BalanceModel x3 - incl mint
     utils::drop_event(world.contract_address);
@@ -289,7 +289,7 @@ fn test_safe_transfer_from() {
         TOKEN_ID
     );
 
-    // // drop StoreSetRecord ERC721TokenApprovalModel 
+    // // drop StoreSetRecord ERC721TokenApprovalModel
     utils::drop_event(world.contract_address);
     // // drop StoreSetRecord ERC721BalanceModel x3 - incl mint
     utils::drop_event(world.contract_address);
@@ -307,7 +307,7 @@ fn test_safe_transfer_from() {
 }
 
 //
-// transferFrom 
+// transferFrom
 //
 
 #[test]
@@ -328,7 +328,7 @@ fn test_transferFrom() {
         erc721_balance_mock.contract_address, OWNER(), RECIPIENT(), TOKEN_ID
     );
 
-    // // drop StoreSetRecord ERC721TokenApprovalModel 
+    // // drop StoreSetRecord ERC721TokenApprovalModel
     utils::drop_event(world.contract_address);
     // // drop StoreSetRecord ERC721BalanceModel x3 - incl mint
     utils::drop_event(world.contract_address);
@@ -364,7 +364,7 @@ fn test_safeTransferFrom() {
         TOKEN_ID
     );
 
-    // // drop StoreSetRecord ERC721TokenApprovalModel 
+    // // drop StoreSetRecord ERC721TokenApprovalModel
     utils::drop_event(world.contract_address);
     // // drop StoreSetRecord ERC721BalanceModel x3 - incl mint
     utils::drop_event(world.contract_address);

diff --git a/token/src/components/token/erc721/erc721_enumerable.cairo b/token/src/components/token/erc721/erc721_enumerable.cairo
@@ -3,7 +3,7 @@ use starknet::ContractAddress;
 ///
 /// Model
 ///
-/// 
+///
 
 #[dojo::model]
 #[derive(Copy, Drop, Serde)]

diff --git a/token/src/erc1155/tests.cairo b/token/src/erc1155/tests.cairo
@@ -693,7 +693,7 @@ fn test__burn_more_than_balance() {
 
 
 //
-// Helpers 
+// Helpers
 //
 
 fn assert_state_before_transfer(

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(allow_ref_self)]
+#[dojo::contract]
 mod ERC20Bridgeable {
     use integer::BoundedInt;
     use starknet::ContractAddress;

diff --git a/token/src/presets/erc20/tests_bridgeable.cairo b/token/src/presets/erc20/tests_bridgeable.cairo
@@ -101,7 +101,7 @@ fn setup() -> (IWorldDispatcher, IERC20BridgeablePresetDispatcher) {
 
 
 //
-// initializer 
+// initializer
 //
 
 #[test]
@@ -141,7 +141,7 @@ fn test_approve() {
 
 
 //
-// transfer 
+// transfer
 //
 
 #[test]
@@ -186,7 +186,7 @@ fn test_transfer_from() {
     assert_event_approval(erc20_bridgeable.contract_address, OWNER(), SPENDER(), 0);
     assert_only_event_transfer(erc20_bridgeable.contract_address, OWNER(), RECIPIENT(), VALUE);
 
-    // drop StoreSetRecord ERC20AllowanceModel 
+    // drop StoreSetRecord ERC20AllowanceModel
     utils::drop_event(world.contract_address);
     assert_event_approval(world.contract_address, OWNER(), SPENDER(), 0);
     // drop StoreSetRecord ERC20BalanceModel x2

diff --git a/token/src/presets/erc721/enumerable_mintable_burnable.cairo b/token/src/presets/erc721/enumerable_mintable_burnable.cairo
@@ -72,7 +72,7 @@ trait IERC721EnumMintBurn<TState> {
     fn burn(ref self: TState, token_id: u256);
 }
 
-#[dojo::contract(allow_ref_self)]
+#[dojo::contract]
 mod ERC721EnumMintBurn {
     use starknet::ContractAddress;
     use starknet::{get_contract_address, get_caller_address};

diff --git a/token/src/presets/erc721/mintable_burnable.cairo b/token/src/presets/erc721/mintable_burnable.cairo
@@ -52,7 +52,7 @@ trait IERC721MintableBurnableMintBurn<TState> {
     fn burn(ref self: TState, token_id: u256);
 }
 
-#[dojo::contract(allow_ref_self)]
+#[dojo::contract]
 mod ERC721MintableBurnable {
     use starknet::ContractAddress;
     use starknet::{get_caller_address, get_contract_address};

diff --git a/token/src/presets/erc721/tests_enumerable_mintable_burnable.cairo b/token/src/presets/erc721/tests_enumerable_mintable_burnable.cairo
@@ -124,7 +124,7 @@ fn setup() -> (IWorldDispatcher, IERC721EnumMintBurnPresetDispatcher) {
 }
 
 //
-// initializer 
+// initializer
 //
 
 #[test]

diff --git a/token/src/presets/erc721/tests_mintable_burnable.cairo b/token/src/presets/erc721/tests_mintable_burnable.cairo
@@ -101,7 +101,7 @@ fn setup() -> (IWorldDispatcher, IERC721MintableBurnablePresetDispatcher) {
 }
 
 //
-// initializer 
+// initializer
 //
 
 #[test]
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,7 @@ fn test_erc20_allowance_approve_to_zero() { @@
     }
     //
-    //  spend_allowance
+    //  spend_allowance
     //
     #[test]
@@ Expand Down @@