Add ERC1155

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: software-mansion/setup-scarb@v1
       with:
-        scarb-version: "2.4.4"
+        scarb-version: "2.5.3"
     - name: Markdown lint
       uses: DavidAnson/markdownlint-cli2-action@5b7c9f74fec47e6b15667b2cc23c63dff11e449e # v9
       with:

Scarb.toml

@@ -2,7 +2,7 @@
 name = "openzeppelin"
 version = "0.8.1"
 edition = "2023_01"
-cairo-version = "2.4.4"
+cairo-version = "2.5.3"
 authors = ["OpenZeppelin Community <[email protected]>"]
 description = "OpenZeppelin Contracts written in Cairo for StarkNet, a decentralized ZK Rollup"
 documentation = "https://docs.openzeppelin.com/contracts-cairo"
@@ -12,7 +12,7 @@ license-file = "LICENSE"
 keywords = ["openzeppelin", "starknet", "cairo", "contracts", "security", "standards"]
 
 [dependencies]
-starknet = "2.4.4"
+starknet = "2.5.3"
 
 [lib]
 

src/account/utils.cairo

@@ -28,5 +28,5 @@ fn execute_calls(mut calls: Array<Call>) -> Array<Span<felt252>> {
 
 fn execute_single_call(call: Call) -> Span<felt252> {
     let Call{to, selector, calldata } = call;
-    starknet::call_contract_syscall(to, selector, calldata.span()).unwrap()
+    starknet::call_contract_syscall(to, selector, calldata).unwrap()
 }

src/presets.cairo

@@ -1,9 +1,11 @@
 mod account;
+mod erc1155;
 mod erc20;
 mod erc721;
 mod eth_account;
 
 use account::Account;
+use erc1155::ERC1155;
 use erc20::ERC20;
 use erc721::ERC721;
 use eth_account::EthAccountUpgradeable;

src/presets/account.cairo

@@ -4,7 +4,7 @@
 /// # Account Preset
 ///
 /// OpenZeppelin's basic account which can change its public key and declare, deploy, or call contracts.
-#[starknet::contract]
+#[starknet::contract(account)]
 mod Account {
     use openzeppelin::account::AccountComponent;
     use openzeppelin::introspection::src5::SRC5Component;

src/presets/erc1155.cairo

@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts for Cairo v0.8.1 (presets/erc1155.cairo)
+
+/// # ERC1155 Preset
+///
+/// The ERC1155 contract offers a batch-mint mechanism that
+/// can only be executed once upon contract construction.
+#[starknet::contract]
+mod ERC1155 {
+    use openzeppelin::introspection::src5::SRC5Component;
+    use openzeppelin::token::erc1155::ERC1155Component;
+    use starknet::ContractAddress;
+
+    component!(path: ERC1155Component, storage: erc1155, event: ERC1155Event);
+    component!(path: SRC5Component, storage: src5, event: SRC5Event);
+
+    // ERC1155
+    #[abi(embed_v0)]
+    impl ERC1155Impl = ERC1155Component::ERC1155Impl<ContractState>;
+    #[abi(embed_v0)]
+    impl ERC1155MetadataImpl = ERC1155Component::ERC1155MetadataImpl<ContractState>;
+    #[abi(embed_v0)]
+    impl ERC1155CamelOnly = ERC1155Component::ERC1155CamelOnlyImpl<ContractState>;
+    impl ERC1155InternalImpl = ERC1155Component::InternalImpl<ContractState>;
+
+    // SRC5
+    #[abi(embed_v0)]
+    impl SRC5Impl = SRC5Component::SRC5Impl<ContractState>;
+
+    #[storage]
+    struct Storage {
+        #[substorage(v0)]
+        erc1155: ERC1155Component::Storage,
+        #[substorage(v0)]
+        src5: SRC5Component::Storage
+    }
+
+    #[event]
+    #[derive(Drop, starknet::Event)]
+    enum Event {
+        #[flat]
+        ERC1155Event: ERC1155Component::Event,
+        #[flat]
+        SRC5Event: SRC5Component::Event
+    }
+
+    /// Sets the token `name`, `symbol` and `URI`.
+    /// Mints the `values` for `token_ids` tokens to `recipient`.
+    #[constructor]
+    fn constructor(
+        ref self: ContractState,
+        name: ByteArray,
+        symbol: ByteArray,
+        token_uri: ByteArray,
+        recipient: ContractAddress,
+        token_ids: Span<u256>,
+        values: Span<u256>
+    ) {
+        self.erc1155.initializer(name, symbol, token_uri);
+        self.erc1155.safe_batch_mint(recipient, token_ids, values, array![].span());
+    }
+}

src/presets/eth_account.cairo

@@ -5,7 +5,7 @@
 ///
 /// OpenZeppelin's account which can change its public key and declare,
 /// deploy, or call contracts, using Ethereum signing keys.
-#[starknet::contract]
+#[starknet::contract(account)]
 mod EthAccountUpgradeable {
     use openzeppelin::account::EthAccountComponent;
     use openzeppelin::account::interface::EthPublicKey;
@@ -68,7 +68,7 @@ mod EthAccountUpgradeable {
         self.eth_account.initializer(public_key);
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl UpgradeableImpl of IUpgradeable<ContractState> {
         fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {
             self.eth_account.assert_only_self();

src/tests/access/test_accesscontrol.cairo

@@ -11,7 +11,6 @@ use openzeppelin::tests::mocks::accesscontrol_mocks::DualCaseAccessControlMock;
 use openzeppelin::tests::utils::constants::{
     ADMIN, AUTHORIZED, OTHER, OTHER_ADMIN, ROLE, OTHER_ROLE, ZERO
 };
-use openzeppelin::tests::utils::debug::DebugContractAddress;
 use openzeppelin::tests::utils;
 use starknet::ContractAddress;
 use starknet::testing;

src/tests/access/test_dual_ownable.cairo

@@ -8,7 +8,6 @@ use openzeppelin::tests::mocks::ownable_mocks::{
     CamelOwnableMock, CamelOwnablePanicMock, SnakeOwnableMock, SnakeOwnablePanicMock
 };
 use openzeppelin::tests::utils::constants::{OWNER, NEW_OWNER};
-use openzeppelin::tests::utils::debug::DebugContractAddress;
 use openzeppelin::tests::utils;
 use openzeppelin::utils::serde::SerializedAppend;
 use starknet::testing::set_contract_address;

src/tests/access/test_ownable.cairo

@@ -4,7 +4,6 @@ use openzeppelin::access::ownable::OwnableComponent;
 use openzeppelin::access::ownable::interface::{IOwnable, IOwnableCamelOnly};
 use openzeppelin::tests::mocks::ownable_mocks::DualCaseOwnableMock;
 use openzeppelin::tests::utils::constants::{ZERO, OTHER, OWNER};
-use openzeppelin::tests::utils::debug::DebugContractAddress;
 use openzeppelin::tests::utils;
 use starknet::ContractAddress;
 use starknet::storage::StorageMemberAccessTrait;

src/tests/account/test_account.cairo

@@ -245,7 +245,7 @@ fn test_execute_with_version(version: Option<felt252>) {
     calldata.append_serde(recipient);
     calldata.append_serde(amount);
     let call = Call {
-        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata
+        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata.span()
     };
     let mut calls = array![];
     calls.append(call);
@@ -334,7 +334,7 @@ fn test_multicall() {
     calldata1.append_serde(recipient1);
     calldata1.append_serde(amount1);
     let call1 = Call {
-        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata1
+        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata1.span()
     };
 
     // Craft call2
@@ -343,7 +343,7 @@ fn test_multicall() {
     calldata2.append_serde(recipient2);
     calldata2.append_serde(amount2);
     let call2 = Call {
-        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata2
+        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata2.span()
     };
 
     // Bundle calls and exeute

src/tests/account/test_dual_account.cairo

@@ -135,7 +135,7 @@ fn test_dual_is_valid_signature_exists_and_panics() {
 
 #[test]
 fn test_dual_supports_interface() {
-    let (snake_dispatcher, target) = setup_snake();
+    let (snake_dispatcher, _) = setup_snake();
     let supports_isrc5 = snake_dispatcher.supports_interface(ISRC5_ID);
     assert!(supports_isrc5);
 }

src/tests/account/test_dual_eth_account.cairo

@@ -143,7 +143,7 @@ fn test_dual_is_valid_signature_exists_and_panics() {
 
 #[test]
 fn test_dual_supports_interface() {
-    let (snake_dispatcher, target) = setup_snake();
+    let (snake_dispatcher, _) = setup_snake();
     assert!(snake_dispatcher.supports_interface(ISRC5_ID), "Should implement ISRC5");
 }
 

src/tests/account/test_eth_account.cairo

@@ -276,7 +276,7 @@ fn test_execute_with_version(version: Option<felt252>) {
     calldata.append_serde(recipient);
     calldata.append_serde(amount);
     let call = Call {
-        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata
+        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata.span()
     };
     let mut calls = array![];
     calls.append(call);
@@ -349,7 +349,7 @@ fn test_multicall() {
     calldata1.append_serde(recipient1);
     calldata1.append_serde(amount1);
     let call1 = Call {
-        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata1
+        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata1.span()
     };
 
     // Craft call2
@@ -358,7 +358,7 @@ fn test_multicall() {
     calldata2.append_serde(recipient2);
     calldata2.append_serde(amount2);
     let call2 = Call {
-        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata2
+        to: erc20.contract_address, selector: selectors::transfer, calldata: calldata2.span()
     };
 
     // Bundle calls and exeute

src/tests/account/test_secp256k1.cairo

@@ -40,7 +40,6 @@ fn test_pack_big_secp256k1_points() {
 #[test]
 fn test_unpack_big_secp256k1_points() {
     let (big_point_1, big_point_2) = get_points();
-    let curve_size = Secp256k1Impl::get_curve_size();
 
     // Check point 1
 
@@ -60,12 +59,12 @@ fn test_unpack_big_secp256k1_points() {
     let (x, y) = StorePacking::unpack((xlow, xhigh_and_parity)).get_coordinates().unwrap();
 
     assert_eq!(x, expected_x);
+    assert_eq!(y, expected_y);
 }
 
 #[test]
 fn test_secp256k1_serialization() {
     let (big_point_1, big_point_2) = get_points();
-    let curve_size = Secp256k1Impl::get_curve_size();
 
     let mut serialized_point = array![];
     let mut expected_serialization = array![];
@@ -88,7 +87,6 @@ fn test_secp256k1_serialization() {
 #[test]
 fn test_secp256k1_deserialization() {
     let (big_point_1, big_point_2) = get_points();
-    let curve_size = Secp256k1Impl::get_curve_size();
 
     // Check point 1
 

src/tests/mocks.cairo

@@ -1,5 +1,7 @@
 mod accesscontrol_mocks;
 mod account_mocks;
+mod erc1155_mocks;
+mod erc1155_receiver_mocks;
 mod erc20_mocks;
 mod erc721_mocks;
 mod erc721_receiver_mocks;

src/tests/mocks/account_mocks.cairo

@@ -1,4 +1,4 @@
-#[starknet::contract]
+#[starknet::contract(account)]
 mod DualCaseAccountMock {
     use openzeppelin::account::AccountComponent;
     use openzeppelin::introspection::src5::SRC5Component;
@@ -45,7 +45,7 @@ mod DualCaseAccountMock {
     }
 }
 
-#[starknet::contract]
+#[starknet::contract(account)]
 mod SnakeAccountMock {
     use openzeppelin::account::AccountComponent;
     use openzeppelin::introspection::src5::SRC5Component;
@@ -88,7 +88,7 @@ mod SnakeAccountMock {
     }
 }
 
-#[starknet::contract]
+#[starknet::contract(account)]
 mod CamelAccountMock {
     use openzeppelin::account::AccountComponent;
     use openzeppelin::introspection::src5::SRC5Component;
@@ -132,13 +132,15 @@ mod CamelAccountMock {
         self.account.initializer(publicKey);
     }
 
-    #[external(v0)]
+    #[abi(per_item)]
     #[generate_trait]
     impl ExternalImpl of ExternalTrait {
+        #[external(v0)]
         fn __execute__(self: @ContractState, mut calls: Array<Call>) -> Array<Span<felt252>> {
             self.account.__execute__(calls)
         }
 
+        #[external(v0)]
         fn __validate__(self: @ContractState, mut calls: Array<Call>) -> felt252 {
             self.account.__validate__(calls)
         }