Chore: Update dependencies + minor fixes

.github/workflows/build.yml

@@ -1,18 +1,14 @@
 name: Build
-
-on: [push, pull_request]
-
-env:
-  SCARB_VERSION: 0.7.0
-
+on:
+  push:
+  pull_request:
 jobs:
-  build:
+  check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Scarb
-        uses: software-mansion/setup-scarb@v1
-      - name: Check cairo format
-        run: scarb fmt --check
-      - name: Build cairo programs
-        run: scarb build
+      - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: "0.7.0"
+      - run: scarb fmt --check
+      - run: scarb build

.github/workflows/test.yml

@@ -1,17 +1,13 @@
 name: Test
-
-on: [push, pull_request]
-
-env:
-  SCARB_VERSION: 0.7.0
-
+on:
+  push:
+  pull_request:
 jobs:
-  test:
+  check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Scarb
-        uses: software-mansion/setup-scarb@v1
-      - name: Run cairo tests
-        run: scarb test
-
+      - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: "0.7.0"
+      - run: scarb test

Scarb.toml

@@ -6,8 +6,8 @@ version = "2.0.0"
 
 [dependencies]
 starknet = ">=2.2.0"
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.7.0-rc.0" }
+openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.7.0" }
 
 [[target.starknet-contract]]
-sierre = true
+sierra = true
 casm = true

src/components/erc2981/interface.cairo

@@ -25,7 +25,7 @@ trait IERC2981<TContractState> {
 }
 
 #[starknet::interface]
-trait IERC2981Legacy<TContractState> {
+trait IERC2981Camel<TContractState> {
     fn defaultRoyalty(self: @TContractState) -> (ContractAddress, u256, u256);
     fn tokenRoyalty(self: @TContractState, tokenId: u256) -> (ContractAddress, u256, u256);
     fn royaltyInfo(

src/components/erc2981/module.cairo

@@ -13,12 +13,12 @@ mod ERC2981 {
 
     #[storage]
     struct Storage {
-        _receiver: ContractAddress,
-        _token_receiver: LegacyMap<u256, ContractAddress>,
-        _fee_numerator: u256,
-        _token_fee_numerator: LegacyMap<u256, u256>,
-        _fee_denominator: u256,
-        _token_fee_denominator: LegacyMap<u256, u256>,
+        ERC2981_receiver: ContractAddress,
+        ERC2981_token_receiver: LegacyMap<u256, ContractAddress>,
+        ERC2981_fee_numerator: u256,
+        ERC2981_token_fee_numerator: LegacyMap<u256, u256>,
+        ERC2981_fee_denominator: u256,
+        ERC2981_token_fee_denominator: LegacyMap<u256, u256>,
     }
 
     #[external(v0)]
@@ -31,7 +31,11 @@ mod ERC2981 {
         /// * `fee_numerator` - The royalty rate numerator.
         /// * `fee_denominator` - The royalty rate denominator.
         fn default_royalty(self: @ContractState) -> (ContractAddress, u256, u256) {
-            (self._receiver.read(), self._fee_numerator.read(), self._fee_denominator.read())
+            (
+                self.ERC2981_receiver.read(),
+                self.ERC2981_fee_numerator.read(),
+                self.ERC2981_fee_denominator.read()
+            )
         }
 
         /// Return the token royalty.
@@ -47,9 +51,9 @@ mod ERC2981 {
         /// * `fee_denominator` - The royalty rate denominator.
         fn token_royalty(self: @ContractState, token_id: u256) -> (ContractAddress, u256, u256) {
             (
-                self._token_receiver.read(token_id),
-                self._token_fee_numerator.read(token_id),
-                self._token_fee_denominator.read(token_id)
+                self.ERC2981_token_receiver.read(token_id),
+                self.ERC2981_token_fee_numerator.read(token_id),
+                self.ERC2981_token_fee_denominator.read(token_id)
             )
         }
 
@@ -70,7 +74,7 @@ mod ERC2981 {
         fn royalty_info(
             self: @ContractState, token_id: u256, sale_price: u256
         ) -> (ContractAddress, u256) {
-            let receiver = self._token_receiver.read(token_id);
+            let receiver = self.ERC2981_token_receiver.read(token_id);
             if !receiver.is_zero() {
                 return self._token_royalty_info(token_id, sale_price);
             }
@@ -104,9 +108,9 @@ mod ERC2981 {
             assert(fee_numerator <= fee_denominator, 'Invalid fee rate');
 
             // [Effect] Store values
-            self._receiver.write(receiver);
-            self._fee_numerator.write(fee_numerator);
-            self._fee_denominator.write(fee_denominator);
+            self.ERC2981_receiver.write(receiver);
+            self.ERC2981_fee_numerator.write(fee_numerator);
+            self.ERC2981_fee_denominator.write(fee_denominator);
         }
 
         /// Set the token royalty rate.
@@ -138,9 +142,9 @@ mod ERC2981 {
             assert(fee_numerator <= fee_denominator, 'Invalid fee rate');
 
             // [Effect] Store values
-            self._token_receiver.write(token_id, receiver);
-            self._token_fee_numerator.write(token_id, fee_numerator);
-            self._token_fee_denominator.write(token_id, fee_denominator);
+            self.ERC2981_token_receiver.write(token_id, receiver);
+            self.ERC2981_token_fee_numerator.write(token_id, fee_numerator);
+            self.ERC2981_token_fee_denominator.write(token_id, fee_denominator);
         }
     }
 

src/presets/erc721_royalty.cairo

@@ -12,7 +12,7 @@ mod ERC721Royalty {
     use openzeppelin::token::erc721::erc721::ERC721;
 
     // Local deps
-    use cairo_erc_2981::components::erc2981::interface::{IERC2981, IERC2981Legacy};
+    use cairo_erc_2981::components::erc2981::interface::{IERC2981, IERC2981Camel};
     use cairo_erc_2981::components::erc2981::module::ERC2981;
 
     #[storage]
@@ -222,7 +222,7 @@ mod ERC721Royalty {
     }
 
     #[external(v0)]
-    impl ERC2981LegacyImpl of IERC2981Legacy<ContractState> {
+    impl ERC2981CamelImpl of IERC2981Camel<ContractState> {
         fn defaultRoyalty(self: @ContractState) -> (ContractAddress, u256, u256) {
             self.default_royalty()
         }