Upgrade to dojo 2.2

Scarb.toml

@@ -1,7 +1,7 @@
 [package]
 name = "briq_protocol"
 version = "2.0.0"
-cairo-version = "2.1.1"
+cairo-version = "2.2.0"
 
 [cairo]
 sierra-replace-ids = true

src/attributes/attribute_group.cairo

@@ -91,6 +91,26 @@ impl AttributeGroupImpl of AttributeGroupTrait {
     }
 }
 
+#[derive(Drop, PartialEq, starknet::Event)]
+struct AttributeGroupCreated {
+    attribute_group_id: u64,
+    owner: ContractAddress,
+    system: felt252,
+}
+
+#[derive(Drop, PartialEq, starknet::Event)]
+struct AttributeGroupUpdated {
+    attribute_group_id: u64,
+    owner: ContractAddress,
+    system: felt252,
+}
+
+#[event]
+#[derive(Drop, PartialEq, starknet::Event)]
+enum Event {
+    AttributeGroupCreated: AttributeGroupCreated,
+    AttributeGroupUpdated: AttributeGroupUpdated,
+}
 
 #[derive(Clone, Drop, Serde)]
 struct CreateAttributeGroupParams {
@@ -122,13 +142,9 @@ mod create_attribute_group {
         CreateAttributeGroupParams, AttributeGroupOwner, AttributeGroupTrait, AttributeGroup
     };
 
-    #[derive(Drop, starknet::Event)]
-    struct AttributeGroupCreated {
-        attribute_group_id: u64,
-        owner: ContractAddress,
-        system: felt252,
-
-    }
+    use super::{AttributeGroupCreated};
+    #[event]
+    use super::Event;
 
     fn execute(ctx: Context, data: CreateAttributeGroupParams) {
          // TODO: check ctx.origin is actually the origin
@@ -204,12 +220,9 @@ mod update_attribute_group {
         UpdateAttributeGroupParams, AttributeGroupOwner, AttributeGroupTrait, AttributeGroup
     };
 
-    #[derive(Drop, starknet::Event)]
-    struct AttributeGroupUpdated {
-        attribute_group_id: u64,
-        owner: ContractAddress,
-        system: felt252,
-    }
+    use super::{AttributeGroupUpdated};
+    #[event]
+    use super::Event;
 
     fn execute(ctx: Context, data: UpdateAttributeGroupParams) {
         // TODO: check ctx.origin is actually the origin

src/attributes/attributes.cairo

@@ -20,20 +20,27 @@ use briq_protocol::attributes::attribute_group::{
 
 use debug::PrintTrait;
 
-#[derive(Drop, starknet::Event)]
+#[derive(Drop, PartialEq, starknet::Event)]
 struct AttributeAssigned {
     set_token_id: ContractAddress,
     attribute_group_id: u64,
     attribute_id: u64
 }
 
-#[derive(Drop, starknet::Event)]
+#[derive(Drop, PartialEq, starknet::Event)]
 struct AttributeRemoved {
     set_token_id: ContractAddress,
     attribute_group_id: u64,
     attribute_id: u64
 }
 
+#[event]
+#[derive(Drop, PartialEq, starknet::Event)]
+enum Event {
+    AttributeAssigned: AttributeAssigned,
+    AttributeRemoved: AttributeRemoved,
+}
+
 #[derive(Drop, Serde)]
 struct AttributeAssignData {
     set_owner: ContractAddress,

src/briq_booklet.cairo

@@ -30,7 +30,7 @@ mod briq_booklet {
         ERC1155SafeBatchTransferFromParams, ERC1155MintParams, ERC1155BurnParams
     };
     use dojo_erc::erc_common::utils::{
-        to_calldata, ToCallDataTrait, system_calldata, PartialEqArray
+        to_calldata, ToCallDataTrait, system_calldata
     };
 
     use briq_protocol::world_config::AdminTrait;

src/briq_factory/systems.cairo

@@ -16,13 +16,19 @@ use briq_protocol::briq_factory::constants::{
 
 use briq_protocol::briq_factory::components::{BriqFactoryStore, BriqFactoryTrait};
 
-#[derive(Drop, starknet::Event)]
+#[derive(Drop, PartialEq, starknet::Event)]
 struct BriqsBought {
     buyer: ContractAddress,
     amount: u32,
     price: u128
 }
 
+#[event]
+#[derive(Drop, starknet::Event)]
+enum Event {
+    BriqsBought: BriqsBought,
+}
+
 #[derive(Drop, Serde)]
 struct BriqFactoryBuyParams {
     material: u64,
@@ -43,6 +49,8 @@ mod BriqFactoryMint {
     use super::{
         BriqsBought, BriqFactoryTrait, BriqFactoryBuyParams, DECIMALS, MIN_PURCHASE, BRIQ_MATERIAL
     };
+    #[event]
+    use super::Event;
     use briq_protocol::world_config::AdminTrait;
 
 

src/briq_token.cairo

@@ -9,7 +9,6 @@ mod BriqToken {
     use starknet::{ContractAddress, ClassHash, get_caller_address, get_contract_address};
     use traits::{Into, TryInto};
     use zeroable::Zeroable;
-    use briq_protocol::utils::PartialEqArray;
     use briq_protocol::world_config::AdminTrait;
 
     use serde::Serde;

src/migrate.cairo

@@ -16,7 +16,7 @@ mod migrate_assets {
     use dojo::world::Context;
     use super::MigrateAssetsParams;
 
-    use core::pedersen;
+    use core::pedersen::pedersen;
     use core::ecdsa::check_ecdsa_signature;
     use traits::Into;
     use starknet::ContractAddress;

src/set_nft/systems.cairo

@@ -5,6 +5,7 @@ use array::SpanTrait;
 use option::{Option, OptionTrait};
 use zeroable::Zeroable;
 
+use core::pedersen::pedersen;
 use dojo::world::{Context, IWorldDispatcher, IWorldDispatcherTrait};
 
 use dojo_erc::erc1155::components::{OperatorApproval, ERC1155Balance, ERC1155BalanceTrait};

src/tests/test_migrate.cairo

@@ -14,16 +14,10 @@ use dojo_erc::erc721::interface::IERC721DispatcherTrait;
 use dojo_erc::erc1155::interface::{IERC1155DispatcherTrait};
 use dojo_erc::erc1155::components::ERC1155BalanceTrait;
 
-
 use briq_protocol::tests::test_utils::{
     WORLD_ADMIN, DEFAULT_OWNER, ZERO, DefaultWorld, deploy_default_world, mint_briqs, impersonate
 };
-use briq_protocol::attributes::attribute_group::{CreateAttributeGroupData, AttributeGroupOwner};
-use briq_protocol::shape_verifier::RegisterShapeVerifierData;
-use briq_protocol::types::{FTSpec, ShapeItem, ShapePacking, PackedShapeItem, AttributeItem};
 use briq_protocol::world_config::get_world_config;
-use briq_protocol::utils::IntoContractAddressU256;
-use briq_protocol::cumulative_balance::{CUM_BALANCE_TOKEN, CB_ATTRIBUTES, CB_BRIQ};
 
 use debug::PrintTrait;
 

src/utils.cairo

@@ -1,37 +1,6 @@
 use traits::{Into, TryInto, Default, PartialEq};
 use array::ArrayTrait;
 use starknet::ContractAddress;
-// TODO : remove when included in corelib
-
-impl PartialEqArray<T, impl TPEq: PartialEq<T>> of PartialEq<Array<T>> {
-    fn eq(lhs: @Array<T>, rhs: @Array<T>) -> bool {
-        if lhs.len() != rhs.len() {
-            return false;
-        };
-
-        let mut is_eq = true;
-        let mut i = 0;
-        loop {
-            if lhs.len() == i {
-                break;
-            };
-            if lhs.at(i) != rhs.at(i) {
-                is_eq = false;
-                break;
-            };
-
-            i += 1;
-        };
-
-        is_eq
-    }
-
-    fn ne(lhs: @Array<T>, rhs: @Array<T>) -> bool {
-        !PartialEqArray::eq(lhs, rhs)
-    }
-}
-
-
 
 impl IntoContractAddressU256 of Into::<ContractAddress, u256> {
     fn into(self: ContractAddress) -> u256 {