diff --git a/README.md b/README.md
index 1e1e9063f..bd32c4f7f 100644
--- a/README.md
+++ b/README.md
@@ -43,14 +43,14 @@ Edit `scarb.toml` and add:
 
 ```toml
 [dependencies]
-openzeppelin = "0.17.0"
+openzeppelin = "0.18.0"
 ```
 
 The previous example would import the entire library. We can also add each package as a separate dependency to improve the building time by not including modules that won't be used:
 
 ```toml
 [dependencies]
-openzeppelin_token = "0.17.0"
+openzeppelin_token = "0.18.0"
 ```
 
 Build the project to download it:
diff --git a/Scarb.lock b/Scarb.lock
index d1a995644..6ee9f976f 100644
--- a/Scarb.lock
+++ b/Scarb.lock
@@ -3,7 +3,7 @@ version = 1
 
 [[package]]
 name = "openzeppelin"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
@@ -23,7 +23,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_access"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_test_common",
@@ -34,7 +34,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_test_common",
@@ -45,7 +45,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_finance"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_test_common",
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_governance"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
@@ -70,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_test_common",
  "snforge_std",
@@ -78,14 +78,14 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_merkle_tree"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "snforge_std",
 ]
 
 [[package]]
 name = "openzeppelin_presets"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_security"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_test_common",
  "openzeppelin_testing",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_test_common"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
@@ -127,14 +127,14 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_testing"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "snforge_std",
 ]
 
 [[package]]
 name = "openzeppelin_token"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_account",
  "openzeppelin_introspection",
@@ -146,7 +146,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_upgrades"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_test_common",
  "openzeppelin_testing",
@@ -155,7 +155,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_utils"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_test_common",
  "openzeppelin_testing",
diff --git a/Scarb.toml b/Scarb.toml
index 8106757db..a16da9a73 100644
--- a/Scarb.toml
+++ b/Scarb.toml
@@ -22,7 +22,7 @@ version.workspace = true
 keywords.workspace = true
 
 [workspace.package]
-version = "0.17.0"
+version = "0.18.0"
 edition = "2024_07"
 cairo-version = "2.8.4"
 scarb-version = "2.8.4"
diff --git a/docs/antora.yml b/docs/antora.yml
index 0272f3629..0348166e7 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -1,6 +1,6 @@
 name: contracts-cairo
 title: Contracts for Cairo
-version: 0.17.0
+version: 0.18.0
 nav:
   - modules/ROOT/nav.adoc
 asciidoc:
diff --git a/docs/modules/ROOT/pages/api/access.adoc b/docs/modules/ROOT/pages/api/access.adoc
index 41e518bff..300814594 100644
--- a/docs/modules/ROOT/pages/api/access.adoc
+++ b/docs/modules/ROOT/pages/api/access.adoc
@@ -20,7 +20,7 @@ assigned each to multiple accounts.
 
 [.contract]
 [[OwnableComponent]]
-=== `++OwnableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/access/src/ownable/ownable.cairo[{github-icon},role=heading-link]
+=== `++OwnableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/access/src/ownable/ownable.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_access::ownable::OwnableComponent;
@@ -255,7 +255,7 @@ Emitted when the ownership is transferred.
 
 [.contract]
 [[IAccessControl]]
-=== `++IAccessControl++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/access/src/accesscontrol/interface.cairo[{github-icon},role=heading-link]
+=== `++IAccessControl++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/access/src/accesscontrol/interface.cairo[{github-icon},role=heading-link]
 
 :grant_role: xref:#IAccessControl-grant_role[grant_role]
 :revoke_role: xref:#IAccessControl-revoke_role[revoke_role]
@@ -388,7 +388,7 @@ Emitted when `account` is revoked `role`.
 
 [.contract]
 [[AccessControlComponent]]
-=== `++AccessControlComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/access/src/accesscontrol/accesscontrol.cairo[{github-icon},role=heading-link]
+=== `++AccessControlComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/access/src/accesscontrol/accesscontrol.cairo[{github-icon},role=heading-link]
 
 :assert_only_role: xref:#AccessControlComponent-assert_only_role
 :grant_role: xref:#AccessControlComponent-grant_role[grant_role]
diff --git a/docs/modules/ROOT/pages/api/account.adoc b/docs/modules/ROOT/pages/api/account.adoc
index 3f289d98a..2c6643bf5 100644
--- a/docs/modules/ROOT/pages/api/account.adoc
+++ b/docs/modules/ROOT/pages/api/account.adoc
@@ -14,7 +14,7 @@ include::../utils/_common.adoc[]
 
 [.contract]
 [[ISRC6]]
-=== `++ISRC6++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/account/src/interface.cairo[{github-icon},role=heading-link]
+=== `++ISRC6++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/account/src/interface.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_account::interface::ISRC6;
@@ -67,7 +67,7 @@ Returns the short string `'VALID'` if valid, otherwise it reverts.
 
 [.contract]
 [[AccountComponent]]
-=== `++AccountComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/account/src/account.cairo[{github-icon},role=heading-link]
+=== `++AccountComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/account/src/account.cairo[{github-icon},role=heading-link]
 
 :OwnerAdded: xref:AccountComponent-OwnerAdded[OwnerAdded]
 :OwnerRemoved: xref:AccountComponent-OwnerRemoved[OwnerRemoved]
@@ -317,7 +317,7 @@ Emitted when a `public_key` is removed.
 
 [.contract]
 [[EthAccountComponent]]
-=== `++EthAccountComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/account/src/eth_account.cairo[{github-icon},role=heading-link]
+=== `++EthAccountComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/account/src/eth_account.cairo[{github-icon},role=heading-link]
 
 :OwnerAdded: xref:EthAccountComponent-OwnerAdded[OwnerAdded]
 :OwnerRemoved: xref:EthAccountComponent-OwnerRemoved[OwnerRemoved]
@@ -572,7 +572,7 @@ Emitted when a `public_key` is removed.
 
 [.contract]
 [[ISRC9_V2]]
-=== `++ISRC9_V2++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/account/src/extensions/src9/interface.cairo[{github-icon},role=heading-link]
+=== `++ISRC9_V2++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/account/src/extensions/src9/interface.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_account::extensions::src9::ISRC9_V2;
@@ -622,7 +622,7 @@ Get the status of a given nonce. `true` if the nonce is available to use.
 
 [.contract]
 [[SRC9Component]]
-=== `++SRC9Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/account/src/extensions/src9/src9.cairo[{github-icon},role=heading-link]
+=== `++SRC9Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/account/src/extensions/src9/src9.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_account::extensions::SRC9Component;
@@ -698,7 +698,7 @@ Initializes the account by registering the `ISRC9_V2` interface Id.
 
 [.contract]
 [[AccountUpgradeable]]
-=== `++AccountUpgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/presets/src/account.cairo[{github-icon},role=heading-link]
+=== `++AccountUpgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/presets/src/account.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_presets::AccountUpgradeable;
@@ -759,7 +759,7 @@ Requirements:
 
 [.contract]
 [[EthAccountUpgradeable]]
-=== `++EthAccountUpgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/presets/src/eth_account.cairo[{github-icon},role=heading-link]
+=== `++EthAccountUpgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/presets/src/eth_account.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_presets::EthAccountUpgradeable;
diff --git a/docs/modules/ROOT/pages/api/erc1155.adoc b/docs/modules/ROOT/pages/api/erc1155.adoc
index 5c3afac71..eda7a36f2 100644
--- a/docs/modules/ROOT/pages/api/erc1155.adoc
+++ b/docs/modules/ROOT/pages/api/erc1155.adoc
@@ -16,7 +16,7 @@ TIP: For an overview of ERC1155, read our xref:erc1155.adoc[ERC1155 guide].
 
 [.contract]
 [[IERC1155]]
-=== `++IERC1155++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc1155/interface.cairo[{github-icon},role=heading-link]
+=== `++IERC1155++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc1155/interface.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -126,7 +126,7 @@ Emitted when the token URI is updated to `value` for the `id` token.
 
 [.contract]
 [[IERC1155MetadataURI]]
-=== `++IERC1155MetadataURI++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc1155/interface.cairo[{github-icon},role=heading-link]
+=== `++IERC1155MetadataURI++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc1155/interface.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -156,7 +156,7 @@ Returns the Uniform Resource Identifier (URI) for the `token_id` token.
 
 [.contract]
 [[ERC1155Component]]
-=== `++ERC1155Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc1155/erc1155.cairo[{github-icon},role=heading-link]
+=== `++ERC1155Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc1155/erc1155.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -543,7 +543,7 @@ See <<IERC1155-URI,IERC1155::URI>>.
 
 [.contract]
 [[IERC1155Receiver]]
-=== `++IERC1155Receiver++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc1155/interface.cairo[{github-icon},role=heading-link]
+=== `++IERC1155Receiver++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc1155/interface.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -583,7 +583,7 @@ via <<IERC1155-safe_batch_transfer_from,IERC1155::safe_batch_transfer_from>> by
 
 [.contract]
 [[ERC1155ReceiverComponent]]
-=== `++ERC1155ReceiverComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc1155/erc1155_receiver.cairo[{github-icon},role=heading-link]
+=== `++ERC1155ReceiverComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc1155/erc1155_receiver.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -660,7 +660,7 @@ Registers the `IERC1155Receiver` interface ID as supported through introspection
 
 [.contract]
 [[ERC1155Upgradeable]]
-=== `++ERC1155Upgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/presets/src/erc1155.cairo[{github-icon},role=heading-link]
+=== `++ERC1155Upgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/presets/src/erc1155.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_presets::ERC1155;
diff --git a/docs/modules/ROOT/pages/api/erc20.adoc b/docs/modules/ROOT/pages/api/erc20.adoc
index daefb5e90..92a78a9ce 100644
--- a/docs/modules/ROOT/pages/api/erc20.adoc
+++ b/docs/modules/ROOT/pages/api/erc20.adoc
@@ -16,7 +16,7 @@ TIP: For an overview of ERC20, read our {erc20-guide}.
 
 [.contract]
 [[IERC20]]
-=== `++IERC20++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc20/interface.cairo[{github-icon},role=heading-link]
+=== `++IERC20++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc20/interface.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -114,7 +114,7 @@ Emitted when the allowance of a `spender` for an `owner` is set.
 
 [.contract]
 [[IERC20Metadata]]
-=== `++IERC20Metadata++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc20/interface.cairo#L19[{github-icon},role=heading-link]
+=== `++IERC20Metadata++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc20/interface.cairo#L19[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -162,7 +162,7 @@ NOTE: This information is only used for _display_ purposes: it in no way affects
 
 [.contract]
 [[ERC20Component]]
-=== `++ERC20Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc20/erc20.cairo[{github-icon},role=heading-link]
+=== `++ERC20Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc20/erc20.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -460,7 +460,7 @@ See <<IERC20-Approval,IERC20::Approval>>.
 
 [.contract]
 [[ERC20Upgradeable]]
-=== `++ERC20Upgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/presets/src/erc20.cairo[{github-icon},role=heading-link]
+=== `++ERC20Upgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/presets/src/erc20.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_presets::ERC20Upgradeable;
diff --git a/docs/modules/ROOT/pages/api/erc721.adoc b/docs/modules/ROOT/pages/api/erc721.adoc
index 0126a2979..cbe06e1f5 100644
--- a/docs/modules/ROOT/pages/api/erc721.adoc
+++ b/docs/modules/ROOT/pages/api/erc721.adoc
@@ -16,7 +16,7 @@ TIP: For an overview of ERC721, read our xref:erc721.adoc[ERC721 guide].
 
 [.contract]
 [[IERC721]]
-=== `++IERC721++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc721/interface.cairo#L13-L31[{github-icon},role=heading-link]
+=== `++IERC721++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc721/interface.cairo#L13-L31[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -135,7 +135,7 @@ Emitted when `token_id` token is transferred from `from` to `to`.
 
 [.contract]
 [[IERC721Metadata]]
-=== `++IERC721Metadata++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc721/interface.cairo#L54-L59[{github-icon},role=heading-link]
+=== `++IERC721Metadata++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc721/interface.cairo#L54-L59[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -181,7 +181,7 @@ If the URI is not set for `token_id`, the return value will be an empty `ByteArr
 
 [.contract]
 [[ERC721Component]]
-=== `++ERC721Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc721/erc721.cairo#L7[{github-icon},role=heading-link]
+=== `++ERC721Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc721/erc721.cairo#L7[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -693,7 +693,7 @@ See <<IERC721-Transfer,IERC721::Transfer>>.
 
 [.contract]
 [[IERC721Receiver]]
-=== `++IERC721Receiver++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc721/interface.cairo#L70-L79[{github-icon},role=heading-link]
+=== `++IERC721Receiver++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc721/interface.cairo#L70-L79[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -724,7 +724,7 @@ Whenever an IERC721 `token_id` token is transferred to this non-account contract
 
 [.contract]
 [[ERC721ReceiverComponent]]
-=== `++ERC721ReceiverComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc721/erc721_receiver.cairo[{github-icon},role=heading-link]
+=== `++ERC721ReceiverComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc721/erc721_receiver.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -790,7 +790,7 @@ Registers the `IERC721Receiver` interface ID as supported through introspection.
 
 [.contract]
 [[IERC721Enumerable]]
-=== `++IERC721Enumerable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc721/extensions/erc721_enumerable/interface.cairo[{github-icon},role=heading-link]
+=== `++IERC721Enumerable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc721/extensions/erc721_enumerable/interface.cairo[{github-icon},role=heading-link]
 
 Interface for the optional enumerable functions in {eip721}.
 
@@ -832,7 +832,7 @@ Use along with xref:#IERC721-balance_of[IERC721::balance_of] to enumerate all of
 
 [.contract]
 [[ERC721EnumerableComponent]]
-=== `++ERC721EnumerableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/erc721/extensions/erc721_enumerable.cairo[{github-icon},role=heading-link]
+=== `++ERC721EnumerableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/erc721/extensions/erc721_enumerable.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_token::erc721::extensions::ERC721EnumerableComponent;
@@ -975,7 +975,7 @@ This has 0(1) time complexity but alters the indexed order by swapping `token_id
 
 [.contract]
 [[ERC721Upgradeable]]
-=== `++ERC721Upgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/presets/src/erc721.cairo[{github-icon},role=heading-link]
+=== `++ERC721Upgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/presets/src/erc721.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_presets::ERC721Upgradeable;
diff --git a/docs/modules/ROOT/pages/api/finance.adoc b/docs/modules/ROOT/pages/api/finance.adoc
index f8c5761ac..833044dfe 100755
--- a/docs/modules/ROOT/pages/api/finance.adoc
+++ b/docs/modules/ROOT/pages/api/finance.adoc
@@ -12,7 +12,7 @@ This crate includes primitives for financial systems.
 
 [.contract]
 [[IVesting]]
-=== `++IVesting++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/finance/src/vesting/interface.cairo[{github-icon},role=heading-link]
+=== `++IVesting++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/finance/src/vesting/interface.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -104,7 +104,7 @@ Emitted when vested tokens are released to the beneficiary.
 
 [.contract]
 [[VestingComponent]]
-=== `++VestingComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/finance/src/vesting/vesting.cairo[{github-icon},role=heading-link]
+=== `++VestingComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/finance/src/vesting/vesting.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -236,7 +236,7 @@ Returns the vested amount that's calculated using the {vesting-schedule} trait i
 
 [.contract]
 [[LinearVestingSchedule]]
-=== `++LinearVestingSchedule++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/finance/src/vesting/vesting.cairo[{github-icon},role=heading-link]
+=== `++LinearVestingSchedule++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/finance/src/vesting/vesting.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -251,7 +251,7 @@ is directly proportional to the time passed since the start of the vesting sched
 
 [.contract]
 [[VestingWallet]]
-=== `++VestingWallet++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/presets/src/vesting.cairo[{github-icon},role=heading-link]
+=== `++VestingWallet++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/presets/src/vesting.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin::presets::VestingWallet;
diff --git a/docs/modules/ROOT/pages/api/governance.adoc b/docs/modules/ROOT/pages/api/governance.adoc
index 69415a386..426c97edc 100644
--- a/docs/modules/ROOT/pages/api/governance.adoc
+++ b/docs/modules/ROOT/pages/api/governance.adoc
@@ -21,7 +21,7 @@ In a governance system, `TimelockControllerComponent` is in charge of introducin
 
 [.contract]
 [[ITimelock]]
-=== `++ITimelock++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/governance/src/timelock/interface.cairo[{github-icon},role=heading-link]
+=== `++ITimelock++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/governance/src/timelock/interface.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -247,7 +247,7 @@ Emitted when the minimum delay for future operations is modified.
 
 [.contract]
 [[TimelockControllerComponent]]
-=== `++TimelockControllerComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/governance/src/timelock/timelock_controller.cairo[{github-icon},role=heading-link]
+=== `++TimelockControllerComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/governance/src/timelock/timelock_controller.cairo[{github-icon},role=heading-link]
 
 include::../utils/_common.adoc[]
 
@@ -611,7 +611,7 @@ The `VotesComponent` provides a flexible system for tracking and delegating voti
 
 [.contract]
 [[IVotes]]
-=== `++IVotes++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/governance/src/votes/interface.cairo[{github-icon},role=heading-link]
+=== `++IVotes++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/governance/src/votes/interface.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -676,7 +676,7 @@ Delegates votes from `delegator` to `delegatee` through a SNIP12 message signatu
 
 [.contract]
 [[VotesComponent]]
-=== `++VotesComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/governance/src/votes/votes.cairo[{github-icon},role=heading-link]
+=== `++VotesComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/governance/src/votes/votes.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -904,7 +904,7 @@ Emitted when a token transfer or delegate change results in changes to a delegat
 
 [.contract]
 [[VotingUnitsTrait]]
-=== `++VotingUnitsTrait++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/governance/src/votes/votes.cairo[{github-icon},role=heading-link]
+=== `++VotingUnitsTrait++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/governance/src/votes/votes.cairo[{github-icon},role=heading-link]
 
 ```cairo
 pub trait VotingUnitsTrait<TState> {
diff --git a/docs/modules/ROOT/pages/api/introspection.adoc b/docs/modules/ROOT/pages/api/introspection.adoc
index 5ff7f0ea5..0730ab4cc 100644
--- a/docs/modules/ROOT/pages/api/introspection.adoc
+++ b/docs/modules/ROOT/pages/api/introspection.adoc
@@ -10,7 +10,7 @@ This crate handles https://en.wikipedia.org/wiki/Type_introspection[type introsp
 
 [.contract]
 [[ISRC5]]
-=== `++ISRC5++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/introspection/src/interface.cairo#L7[{github-icon},role=heading-link]
+=== `++ISRC5++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/introspection/src/interface.cairo#L7[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_introspection::interface::ISRC5;
@@ -44,7 +44,7 @@ on how to compute this ID.
 
 [.contract]
 [[SRC5Component]]
-=== `++SRC5Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/introspection/src/src5.cairo[{github-icon},role=heading-link]
+=== `++SRC5Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/introspection/src/src5.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_introspection::src5::SRC5Component;
diff --git a/docs/modules/ROOT/pages/api/merkle-tree.adoc b/docs/modules/ROOT/pages/api/merkle-tree.adoc
index d9aef334f..f909ff2eb 100644
--- a/docs/modules/ROOT/pages/api/merkle-tree.adoc
+++ b/docs/modules/ROOT/pages/api/merkle-tree.adoc
@@ -23,14 +23,14 @@ NOTE: `openzeppelin_merkle_tree` doesn't have dependencies outside of `corelib`,
 ====
 To use it as a standalone package, you can add it in your `Scarb.toml` as follows:
 
-`openzeppelin_merkle_tree = "0.17.0"`
+`openzeppelin_merkle_tree = "0.18.0"`
 ====
 
 == Modules
 
 [.contract]
 [[merkle_proof]]
-=== `++merkle_proof++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/merkle_tree/src/merkle_proof.cairo[{github-icon},role=heading-link]
+=== `++merkle_proof++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/merkle_tree/src/merkle_proof.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_merkle_tree::merkle_proof;
@@ -144,7 +144,7 @@ NOTE: This function expects a `CommutativeHasher` implementation. See xref:#hash
 
 [.contract]
 [[hashes]]
-=== `++hashes++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/merkle_tree/src/hashes.cairo[{github-icon},role=heading-link]
+=== `++hashes++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/merkle_tree/src/hashes.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_merkle_tree::hashes;
diff --git a/docs/modules/ROOT/pages/api/security.adoc b/docs/modules/ROOT/pages/api/security.adoc
index 7d7a621d2..3c19dda82 100644
--- a/docs/modules/ROOT/pages/api/security.adoc
+++ b/docs/modules/ROOT/pages/api/security.adoc
@@ -8,7 +8,7 @@ This crate provides components to handle common security-related tasks.
 
 [.contract]
 [[InitializableComponent]]
-=== `++InitializableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/security/src/initializable.cairo[{github-icon},role=heading-link]
+=== `++InitializableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/security/src/initializable.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_security::InitializableComponent;
@@ -58,7 +58,7 @@ Requirements:
 
 [.contract]
 [[PausableComponent]]
-=== `++PausableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/security/src/pausable.cairo[{github-icon},role=heading-link]
+=== `++PausableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/security/src/pausable.cairo[{github-icon},role=heading-link]
 
 :Paused: xref:PausableComponent-Paused[Paused]
 :Unpaused: xref:PausableComponent-Unpaused[Unpaused]
@@ -163,7 +163,7 @@ Emitted when the contract is unpaused by `account`.
 
 [.contract]
 [[ReentrancyGuardComponent]]
-=== `++ReentrancyGuardComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/security/src/reentrancyguard.cairo[{github-icon},role=heading-link]
+=== `++ReentrancyGuardComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/security/src/reentrancyguard.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_security::ReentrancyGuardComponent;
diff --git a/docs/modules/ROOT/pages/api/testing.adoc b/docs/modules/ROOT/pages/api/testing.adoc
index 8e2447648..eae3cfbce 100644
--- a/docs/modules/ROOT/pages/api/testing.adoc
+++ b/docs/modules/ROOT/pages/api/testing.adoc
@@ -15,7 +15,7 @@ be added as a separate dependency in `Scarb.toml`:
 
 ```
 [dev-dependencies]
-openzeppelin_testing = "0.17.0"
+openzeppelin_testing = "0.18.0"
 ```
 
 == Test Utilities
diff --git a/docs/modules/ROOT/pages/api/token_common.adoc b/docs/modules/ROOT/pages/api/token_common.adoc
index 0b57b096c..add8c374f 100644
--- a/docs/modules/ROOT/pages/api/token_common.adoc
+++ b/docs/modules/ROOT/pages/api/token_common.adoc
@@ -12,7 +12,7 @@ This module provides extensions and utilities that are common to multiple token
 
 [.contract]
 [[IERC2981]]
-=== `++IERC2981++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/common/erc2981/interface.cairo[{github-icon},role=heading-link]
+=== `++IERC2981++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/common/erc2981/interface.cairo[{github-icon},role=heading-link]
 
 [.hljs-theme-dark]
 ```cairo
@@ -46,7 +46,7 @@ unit of exchange.
 
 [.contract]
 [[ERC2981Component]]
-=== `++ERC2981Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/token/src/common/erc2981/erc2981.cairo[{github-icon},role=heading-link]
+=== `++ERC2981Component++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/token/src/common/erc2981/erc2981.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_token::common::erc2981::ERC2981Component;
diff --git a/docs/modules/ROOT/pages/api/udc.adoc b/docs/modules/ROOT/pages/api/udc.adoc
index 06bd59471..58717593b 100644
--- a/docs/modules/ROOT/pages/api/udc.adoc
+++ b/docs/modules/ROOT/pages/api/udc.adoc
@@ -8,7 +8,7 @@ Reference of the Universal Deployer Contract (UDC) interface and preset.
 
 [.contract]
 [[IUniversalDeployer]]
-=== `++IUniversalDeployer++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/utils/src/deployments/interface.cairo[{github-icon},role=heading-link]
+=== `++IUniversalDeployer++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/utils/src/deployments/interface.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_utils::interfaces::IUniversalDeployer;
@@ -51,7 +51,7 @@ Emitted when `deployer` deploys a contract through the Universal Deployer Contra
 
 [.contract]
 [[UniversalDeployer]]
-=== `++UniversalDeployer++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/presets/src/universal_deployer.cairo[{github-icon},role=heading-link]
+=== `++UniversalDeployer++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/presets/src/universal_deployer.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_presets::UniversalDeployer;
diff --git a/docs/modules/ROOT/pages/api/upgrades.adoc b/docs/modules/ROOT/pages/api/upgrades.adoc
index b0e291e34..9f67d84c9 100644
--- a/docs/modules/ROOT/pages/api/upgrades.adoc
+++ b/docs/modules/ROOT/pages/api/upgrades.adoc
@@ -9,7 +9,7 @@ This crate provides interfaces and utilities related to upgradeability.
 
 [.contract]
 [[IUpgradeable]]
-=== `++IUpgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/upgrades/src/interface.cairo[{github-icon},role=heading-link]
+=== `++IUpgradeable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/upgrades/src/interface.cairo[{github-icon},role=heading-link]
 
 :Upgraded: xref:UpgradeableComponent-Upgraded[Upgraded]
 
@@ -38,7 +38,7 @@ NOTE: This function is usually protected by an xref:access.adoc[Access Control]
 
 [.contract]
 [[IUpgradeAndCall]]
-=== `++IUpgradeAndCall++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/upgrades/src/interface.cairo[{github-icon},role=heading-link]
+=== `++IUpgradeAndCall++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/upgrades/src/interface.cairo[{github-icon},role=heading-link]
 
 :Upgraded: xref:UpgradeableComponent-Upgraded[Upgraded]
 
@@ -67,7 +67,7 @@ NOTE: This function is usually protected by an xref:access.adoc[Access Control]
 
 [.contract]
 [[UpgradeableComponent]]
-=== `++UpgradeableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/upgrades/src/upgradeable.cairo[{github-icon},role=heading-link]
+=== `++UpgradeableComponent++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/upgrades/src/upgradeable.cairo[{github-icon},role=heading-link]
 
 ```cairo
 use openzeppelin_upgrades::upgradeable::UpgradeableComponent;
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
index 9c673c5c8..5a920a131 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -58,7 +58,7 @@ Install the library by declaring it as a dependency in the project's `Scarb.toml
 [,text]
 ----
 [dependencies]
-openzeppelin = "0.17.0"
+openzeppelin = "0.18.0"
 ----
 
 WARNING: Make sure the tag matches the target release.
diff --git a/docs/modules/ROOT/pages/presets.adoc b/docs/modules/ROOT/pages/presets.adoc
index 90f154313..1f7395468 100644
--- a/docs/modules/ROOT/pages/presets.adoc
+++ b/docs/modules/ROOT/pages/presets.adoc
@@ -57,7 +57,7 @@ TIP: {starkli} class-hash command can be used to compute the class hash from a S
 
 :setup_project: xref:index.adoc#set_up_your_project[setting up a project]
 :install_lib: xref:index.adoc#install the_library[installing the Contracts for Cairo library]
-:presets_dir: link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/presets/src[presets directory]
+:presets_dir: link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/presets/src[presets directory]
 
 These preset contracts are ready-to-deploy which means they should already be declared on the Sepolia network.
 Simply deploy the preset class hash and add the appropriate constructor arguments.
diff --git a/docs/modules/ROOT/pages/upgrades.adoc b/docs/modules/ROOT/pages/upgrades.adoc
index b981d9aa0..99bd9cfb1 100644
--- a/docs/modules/ROOT/pages/upgrades.adoc
+++ b/docs/modules/ROOT/pages/upgrades.adoc
@@ -1,7 +1,7 @@
 :contract_classes: https://docs.starknet.io/documentation/architecture_and_concepts/Smart_Contracts/contract-classes/[Contract Classes]
 :class_hash: https://docs.starknet.io/documentation/architecture_and_concepts/Smart_Contracts/class-hash/[class hash]
 :replace_class_syscall: https://docs.starknet.io/documentation/architecture_and_concepts/Smart_Contracts/system-calls-cairo1/#replace_class[replace_class]
-:upgradeable: https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.17.0/packages/upgrades/src/upgradeable.cairo[Upgradeable]
+:upgradeable: https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.18.0/packages/upgrades/src/upgradeable.cairo[Upgradeable]
 :ownable: xref:access.adoc#ownership_and_ownable[Ownable]
 :i_upgradeable: xref:api/upgrades.adoc#IUpgradeable[IUpgradeable]
 :library_calls: https://docs.starknet.io/documentation/architecture_and_concepts/Smart_Contracts/system-calls-cairo1/#library_call[library calls]
diff --git a/docs/modules/ROOT/pages/utils/_class_hashes.adoc b/docs/modules/ROOT/pages/utils/_class_hashes.adoc
index 369b18d47..434bc9996 100644
--- a/docs/modules/ROOT/pages/utils/_class_hashes.adoc
+++ b/docs/modules/ROOT/pages/utils/_class_hashes.adoc
@@ -1,14 +1,14 @@
 // Version
-:class-hash-cairo-version: https://crates.io/crates/cairo-lang-compiler/2.8.2[cairo 2.8.2]
+:class-hash-cairo-version: https://crates.io/crates/cairo-lang-compiler/2.8.4[cairo 2.8.4]
 
 // Class Hashes
-:ERC20Upgradeable-class-hash: 0x073d71c37e20c569186445d2c497d2195b4c0be9a255d72dbad86662fcc63ae6
-:ERC721Upgradeable-class-hash: 0x0080896d748e41d74501743b310b302f99ee69cff91b93b5ba8488431b42ea5b
-:ERC1155Upgradeable-class-hash: 0x0704e79532206d47e9b453bd5784ba21bd946a49227f7478a89ca7ffb72ad36e
-:AccountUpgradeable-class-hash: 0x06d4b80c0f3c3ea9e98252403a83f8a6bacf7f7362e9ac0a8824854dca31f8a8
-:EthAccountUpgradeable-class-hash: 0x06cc43e9a4a0036cd09d8a997c61df18d7e4fa9459c907a4664b4e56b679d187
-:UniversalDeployer-class-hash: 0x042b05f5d6e6359415b3da6902e8be480e695db0990826e107f1f45fabd03a78
-:VestingWallet-class-hash: 0x07e018b5ddc3fe3452060aad622545a6b30564049998ceab9f0783c12926eab6
+:ERC20Upgradeable-class-hash: 0x044491e887497a0dec63a0f3e02bab88abb8cc7594eb9317baa6b847c8c79233
+:ERC721Upgradeable-class-hash: 0x03ee93221a8ca78ffca36eefcbe9eb8a601e854ce5e68086cdcf30d631090e7e
+:ERC1155Upgradeable-class-hash: 0x032e3666516e3c138011121baaf898e372f9b23eaae313ad8a401c9b9620d5ae
+:AccountUpgradeable-class-hash: 0x04a444ef8caf8fa0db05da60bf0ad9bae264c73fa7e32c61d245406f5523174b
+:EthAccountUpgradeable-class-hash: 0x04bc5fe3c036a449c3e2302581aaf3c863d49a3911aa80765cf7c33886114154
+:UniversalDeployer-class-hash: 0x04cc44533e6a2f0612ba6b7c6cabfebf13e0d5f294504fffc2403ec0a4d1cf9d
+:VestingWallet-class-hash: 0x02f9206089b6256db631acef1f8ca9f60da133a363600f89b4219f6d92632afa
 
 // Presets page
 :presets-page: xref:presets.adoc[Sierra class hash]
diff --git a/docs/modules/ROOT/pages/wizard.adoc b/docs/modules/ROOT/pages/wizard.adoc
index df85de98b..73cdef6be 100644
--- a/docs/modules/ROOT/pages/wizard.adoc
+++ b/docs/modules/ROOT/pages/wizard.adoc
@@ -10,5 +10,5 @@ NOTE: We strongly recommend checking the xref:components.adoc[Components] sectio
 ++++
 <script async src="https://wizard.openzeppelin.com/build/embed.js"></script>
 
-<oz-wizard style="display: block; min-height: 40rem;" data-lang="cairo" version="0.17.0"></oz-wizard>
+<oz-wizard style="display: block; min-height: 40rem;" data-lang="cairo" version="0.18.0"></oz-wizard>
 ++++
diff --git a/packages/access/README.md b/packages/access/README.md
index 3efaee70f..bc2aea8dc 100644
--- a/packages/access/README.md
+++ b/packages/access/README.md
@@ -1,6 +1,6 @@
 ## Access Control
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/access](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/access)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/access](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/access)
 
 This crate provides ways to restrict who can access the functions of a contract or when they can do it.
 
@@ -12,9 +12,9 @@ and assigned each to multiple accounts.
 
 ### Interfaces
 
-- [`IAccessControl`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/access#IAccessControl)
+- [`IAccessControl`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/access#IAccessControl)
 
 ### Components
 
-- [`OwnableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/access#OwnableComponent)
-- [`AccessControlComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/access#AccessControlComponent)
+- [`OwnableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/access#OwnableComponent)
+- [`AccessControlComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/access#AccessControlComponent)
diff --git a/packages/access/src/accesscontrol/accesscontrol.cairo b/packages/access/src/accesscontrol/accesscontrol.cairo
index d634918a3..a24eb726a 100644
--- a/packages/access/src/accesscontrol/accesscontrol.cairo
+++ b/packages/access/src/accesscontrol/accesscontrol.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (access/accesscontrol/accesscontrol.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (access/accesscontrol/accesscontrol.cairo)
 
 /// # AccessControl Component
 ///
diff --git a/packages/access/src/accesscontrol/interface.cairo b/packages/access/src/accesscontrol/interface.cairo
index a7c6a4e95..c74209003 100644
--- a/packages/access/src/accesscontrol/interface.cairo
+++ b/packages/access/src/accesscontrol/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (access/accesscontrol/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (access/accesscontrol/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/access/src/ownable/interface.cairo b/packages/access/src/ownable/interface.cairo
index e3b888089..dc7689bc5 100644
--- a/packages/access/src/ownable/interface.cairo
+++ b/packages/access/src/ownable/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (access/ownable/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (access/ownable/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/access/src/ownable/ownable.cairo b/packages/access/src/ownable/ownable.cairo
index 1d9164e12..bc37d47ff 100644
--- a/packages/access/src/ownable/ownable.cairo
+++ b/packages/access/src/ownable/ownable.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (access/ownable/ownable.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (access/ownable/ownable.cairo)
 
 /// # Ownable Component
 ///
diff --git a/packages/account/README.md b/packages/account/README.md
index 54eae9778..2c026c914 100644
--- a/packages/account/README.md
+++ b/packages/account/README.md
@@ -1,6 +1,6 @@
 ## Account
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account)
 
 This crate provides components to implement account contracts that can be used for interacting with the network.
 
@@ -12,11 +12,11 @@ This crate provides components to implement account contracts that can be used f
 
 ### Interfaces
 
-- [`ISRC6`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account#ISRC6)
-- [`ISRC9_V2`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account#ISRC9_V2)
+- [`ISRC6`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account#ISRC6)
+- [`ISRC9_V2`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account#ISRC9_V2)
 
 ### Components
 
-- [`AccountComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account#AccountComponent)
-- [`EthAccountComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account#EthAccountComponent)
-- [`SRC9Component`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account#SRC9Component)
+- [`AccountComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account#AccountComponent)
+- [`EthAccountComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account#EthAccountComponent)
+- [`SRC9Component`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account#SRC9Component)
diff --git a/packages/account/src/account.cairo b/packages/account/src/account.cairo
index 9914e3eed..6582a6245 100644
--- a/packages/account/src/account.cairo
+++ b/packages/account/src/account.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/account.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/account.cairo)
 
 /// # Account Component
 ///
diff --git a/packages/account/src/eth_account.cairo b/packages/account/src/eth_account.cairo
index a2baa0fb1..dad381abd 100644
--- a/packages/account/src/eth_account.cairo
+++ b/packages/account/src/eth_account.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/eth_account.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/eth_account.cairo)
 
 /// # EthAccount Component
 ///
diff --git a/packages/account/src/extensions/src9/interface.cairo b/packages/account/src/extensions/src9/interface.cairo
index bd3c0be0b..39e497376 100644
--- a/packages/account/src/extensions/src9/interface.cairo
+++ b/packages/account/src/extensions/src9/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/extensions/src9/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/extensions/src9/interface.cairo)
 
 use starknet::ContractAddress;
 use starknet::account::Call;
diff --git a/packages/account/src/extensions/src9/snip12_utils.cairo b/packages/account/src/extensions/src9/snip12_utils.cairo
index b2d81132c..db8e2e49a 100644
--- a/packages/account/src/extensions/src9/snip12_utils.cairo
+++ b/packages/account/src/extensions/src9/snip12_utils.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/extensions/src9/snip12_utils.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/extensions/src9/snip12_utils.cairo)
 
 use core::hash::{HashStateTrait, HashStateExTrait};
 use core::poseidon::{PoseidonTrait, poseidon_hash_span};
diff --git a/packages/account/src/extensions/src9/src9.cairo b/packages/account/src/extensions/src9/src9.cairo
index 468e1475f..973008b4e 100644
--- a/packages/account/src/extensions/src9/src9.cairo
+++ b/packages/account/src/extensions/src9/src9.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/extensions/src9/src9.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/extensions/src9/src9.cairo)
 
 /// # SRC9 Component (Outside Execution)
 ///
diff --git a/packages/account/src/interface.cairo b/packages/account/src/interface.cairo
index cb93569db..f1a284b21 100644
--- a/packages/account/src/interface.cairo
+++ b/packages/account/src/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/interface.cairo)
 
 use starknet::account::Call;
 
diff --git a/packages/account/src/utils.cairo b/packages/account/src/utils.cairo
index b4dfcd5c4..cf1630fd7 100644
--- a/packages/account/src/utils.cairo
+++ b/packages/account/src/utils.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/utils.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/utils.cairo)
 
 pub mod secp256k1;
 pub mod signature;
diff --git a/packages/account/src/utils/secp256k1.cairo b/packages/account/src/utils/secp256k1.cairo
index 49f0efd84..0722584a6 100644
--- a/packages/account/src/utils/secp256k1.cairo
+++ b/packages/account/src/utils/secp256k1.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/utils/secp256k1.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/utils/secp256k1.cairo)
 
 use core::fmt::{Formatter, Error};
 use starknet::SyscallResultTrait;
diff --git a/packages/account/src/utils/signature.cairo b/packages/account/src/utils/signature.cairo
index b8b8affb8..33e8c4246 100644
--- a/packages/account/src/utils/signature.cairo
+++ b/packages/account/src/utils/signature.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (account/utils/signature.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (account/utils/signature.cairo)
 
 use core::ecdsa::check_ecdsa_signature;
 use crate::interface::EthPublicKey;
diff --git a/packages/finance/src/vesting/interface.cairo b/packages/finance/src/vesting/interface.cairo
index 19d086a61..3c3c9ffa4 100644
--- a/packages/finance/src/vesting/interface.cairo
+++ b/packages/finance/src/vesting/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (finance/vesting/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (finance/vesting/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/finance/src/vesting/vesting.cairo b/packages/finance/src/vesting/vesting.cairo
index cddf32b56..79617d2ce 100644
--- a/packages/finance/src/vesting/vesting.cairo
+++ b/packages/finance/src/vesting/vesting.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (finance/vesting/vesting.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (finance/vesting/vesting.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/governance/README.md b/packages/governance/README.md
index 9dc2004ac..9aa45e2e2 100644
--- a/packages/governance/README.md
+++ b/packages/governance/README.md
@@ -1,15 +1,15 @@
 ## Governance
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/governance](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/governance)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/governance](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/governance)
 
 This crate includes primitives for on-chain governance.
 
 ### Interfaces
 
-- [`ITimelock`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/governance#ITimelock)
-- [`IVotes`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/governance#IVotes)
+- [`ITimelock`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/governance#ITimelock)
+- [`IVotes`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/governance#IVotes)
 
 ### Components
 
-- [`TimelockControllerComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/governance#TimelockControllerComponent)
-- [`VotesComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/governance#VotesComponent)
+- [`TimelockControllerComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/governance#TimelockControllerComponent)
+- [`VotesComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/governance#VotesComponent)
diff --git a/packages/governance/src/timelock/interface.cairo b/packages/governance/src/timelock/interface.cairo
index 4523c344c..f0ec3baa0 100644
--- a/packages/governance/src/timelock/interface.cairo
+++ b/packages/governance/src/timelock/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (governance/timelock/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (governance/timelock/interface.cairo)
 
 use crate::timelock::OperationState;
 use starknet::ContractAddress;
diff --git a/packages/governance/src/timelock/timelock_controller.cairo b/packages/governance/src/timelock/timelock_controller.cairo
index af7adf464..bd8fbcb38 100644
--- a/packages/governance/src/timelock/timelock_controller.cairo
+++ b/packages/governance/src/timelock/timelock_controller.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (governance/timelock/timelock_controller.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (governance/timelock/timelock_controller.cairo)
 
 /// # TimelockController Component
 ///
diff --git a/packages/governance/src/timelock/utils/call_impls.cairo b/packages/governance/src/timelock/utils/call_impls.cairo
index 302308e61..6e1b1663d 100644
--- a/packages/governance/src/timelock/utils/call_impls.cairo
+++ b/packages/governance/src/timelock/utils/call_impls.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (governance/timelock/utils/call_impls.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (governance/timelock/utils/call_impls.cairo)
 
 use core::hash::{HashStateTrait, HashStateExTrait, Hash};
 use starknet::account::Call;
diff --git a/packages/governance/src/votes/delegation.cairo b/packages/governance/src/votes/delegation.cairo
index e0814d647..75feada0f 100644
--- a/packages/governance/src/votes/delegation.cairo
+++ b/packages/governance/src/votes/delegation.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (governance/votes/delegation.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (governance/votes/delegation.cairo)
 
 use core::hash::{HashStateTrait, HashStateExTrait};
 use core::poseidon::PoseidonTrait;
diff --git a/packages/governance/src/votes/interface.cairo b/packages/governance/src/votes/interface.cairo
index cd48494c2..e6938f244 100644
--- a/packages/governance/src/votes/interface.cairo
+++ b/packages/governance/src/votes/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (governance/votes/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (governance/votes/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/governance/src/votes/votes.cairo b/packages/governance/src/votes/votes.cairo
index 7c9dc7655..7d97fd0c6 100644
--- a/packages/governance/src/votes/votes.cairo
+++ b/packages/governance/src/votes/votes.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (governance/votes/votes.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (governance/votes/votes.cairo)
 
 use starknet::ContractAddress;
 
@@ -22,7 +22,7 @@ use starknet::ContractAddress;
 /// purpose, as shown in the following ERC20 example:
 ///
 /// See [the documentation]
-/// (https://docs.openzeppelin.com/contracts-cairo/0.17.0/governance.html#usage_2)
+/// (https://docs.openzeppelin.com/contracts-cairo/0.18.0/governance.html#usage_2)
 /// for examples and more details.
 #[starknet::component]
 pub mod VotesComponent {
diff --git a/packages/introspection/README.md b/packages/introspection/README.md
index 6d4183e90..9335cbe09 100644
--- a/packages/introspection/README.md
+++ b/packages/introspection/README.md
@@ -1,13 +1,13 @@
 ## Introspection
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/introspection](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/introspection)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/introspection](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/introspection)
 
 This crate handles [type introspection](https://en.wikipedia.org/wiki/Type_introspection) of contracts. In other words, it examines which functions can be called on a given contract. This is referred to as the contract's interface.
 
 ### Interfaces
 
-- [`ISRC5`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/introspection#ISRC5)
+- [`ISRC5`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/introspection#ISRC5)
 
 ### Components
 
-- [`SRC5Component`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/introspection#SRC5Component)
+- [`SRC5Component`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/introspection#SRC5Component)
diff --git a/packages/introspection/src/interface.cairo b/packages/introspection/src/interface.cairo
index 317693dd5..64fc71bfa 100644
--- a/packages/introspection/src/interface.cairo
+++ b/packages/introspection/src/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (introspection/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (introspection/interface.cairo)
 
 pub const ISRC5_ID: felt252 = 0x3f918d17e5ee77373b56385708f855659a07f75997f365cf87748628532a055;
 
diff --git a/packages/introspection/src/src5.cairo b/packages/introspection/src/src5.cairo
index 451f716bc..eef2435f3 100644
--- a/packages/introspection/src/src5.cairo
+++ b/packages/introspection/src/src5.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (introspection/src5.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (introspection/src5.cairo)
 
 /// # SRC5 Component
 ///
diff --git a/packages/merkle_tree/README.md b/packages/merkle_tree/README.md
index 43d6eca3b..df6be5eec 100644
--- a/packages/merkle_tree/README.md
+++ b/packages/merkle_tree/README.md
@@ -1,6 +1,6 @@
 ## Merkle Tree
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/merkle-tree](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/merkle-tree)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/merkle-tree](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/merkle-tree)
 
 This crate provides a set of utilities for verifying Merkle Tree proofs on-chain. The tree and the proofs can be
 generated using this [JavaScript library](https://github.com/ericnordelo/strk-merkle-tree) both for Pedersen and Poseidon
diff --git a/packages/merkle_tree/src/hashes.cairo b/packages/merkle_tree/src/hashes.cairo
index e6d456d22..91ce6a73b 100644
--- a/packages/merkle_tree/src/hashes.cairo
+++ b/packages/merkle_tree/src/hashes.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (merkle_tree/hashes.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (merkle_tree/hashes.cairo)
 
 use core::hash::HashStateTrait;
 use core::pedersen::PedersenTrait;
diff --git a/packages/merkle_tree/src/merkle_proof.cairo b/packages/merkle_tree/src/merkle_proof.cairo
index 97bec3f0b..4bec0a807 100644
--- a/packages/merkle_tree/src/merkle_proof.cairo
+++ b/packages/merkle_tree/src/merkle_proof.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (merkle_tree/merkle_proof.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (merkle_tree/merkle_proof.cairo)
 
 /// These functions deal with verification of Merkle Tree proofs.
 ///
diff --git a/packages/presets/README.md b/packages/presets/README.md
index a86a5285b..92d95be05 100644
--- a/packages/presets/README.md
+++ b/packages/presets/README.md
@@ -1,6 +1,6 @@
 ## Presets
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/presets](https://docs.openzeppelin.com/contracts-cairo/0.17.0/presets)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/presets](https://docs.openzeppelin.com/contracts-cairo/0.18.0/presets)
 
 Presets are ready-to-deploy contracts provided by the library. Since presets are intended to be very simple and as
 generic as possible, there’s no support for custom or complex contracts such as `ERC20Pausable` or `ERC721Mintable`.
@@ -10,9 +10,9 @@ For contract customization and combination of modules you can use
 
 ### Presets
 
-- [`AccountUpgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account#AccountUpgradeable)
-- [`ERC20Upgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc20#ERC20Upgradeable)
-- [`ERC721Upgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721#ERC721Upgradeable)
-- [`ERC1155Upgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc1155#ERC1155Upgradeable)
-- [`EthAccountUpgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/account#EthAccountUpgradeable)
-- [`UniversalDeployer`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/udc#UniversalDeployer)
+- [`AccountUpgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account#AccountUpgradeable)
+- [`ERC20Upgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc20#ERC20Upgradeable)
+- [`ERC721Upgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721#ERC721Upgradeable)
+- [`ERC1155Upgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc1155#ERC1155Upgradeable)
+- [`EthAccountUpgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/account#EthAccountUpgradeable)
+- [`UniversalDeployer`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/udc#UniversalDeployer)
diff --git a/packages/presets/src/account.cairo b/packages/presets/src/account.cairo
index 08a61129e..135573428 100644
--- a/packages/presets/src/account.cairo
+++ b/packages/presets/src/account.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (presets/account.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (presets/account.cairo)
 
 /// # Account Preset
 ///
diff --git a/packages/presets/src/erc1155.cairo b/packages/presets/src/erc1155.cairo
index 18f7a1b74..42fc90c2f 100644
--- a/packages/presets/src/erc1155.cairo
+++ b/packages/presets/src/erc1155.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (presets/erc1155.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (presets/erc1155.cairo)
 
 /// # ERC1155Upgradeable Preset
 ///
diff --git a/packages/presets/src/erc20.cairo b/packages/presets/src/erc20.cairo
index f65bfcec1..c94a2c013 100644
--- a/packages/presets/src/erc20.cairo
+++ b/packages/presets/src/erc20.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (presets/erc20.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (presets/erc20.cairo)
 
 /// # ERC20 Preset
 ///
diff --git a/packages/presets/src/erc721.cairo b/packages/presets/src/erc721.cairo
index efd67a940..c2ea9d1a7 100644
--- a/packages/presets/src/erc721.cairo
+++ b/packages/presets/src/erc721.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (presets/erc721.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (presets/erc721.cairo)
 
 /// # ERC721 Preset
 ///
diff --git a/packages/presets/src/eth_account.cairo b/packages/presets/src/eth_account.cairo
index d10305bfc..a1a6bc36c 100644
--- a/packages/presets/src/eth_account.cairo
+++ b/packages/presets/src/eth_account.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (presets/eth_account.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (presets/eth_account.cairo)
 
 /// # EthAccount Preset
 ///
diff --git a/packages/presets/src/universal_deployer.cairo b/packages/presets/src/universal_deployer.cairo
index 2c2f25752..d2d7e6bb5 100644
--- a/packages/presets/src/universal_deployer.cairo
+++ b/packages/presets/src/universal_deployer.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (presets/universal_deployer.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (presets/universal_deployer.cairo)
 
 /// # UniversalDeployerContract Preset
 ///
diff --git a/packages/presets/src/vesting.cairo b/packages/presets/src/vesting.cairo
index 8d7b42ac2..20c972782 100644
--- a/packages/presets/src/vesting.cairo
+++ b/packages/presets/src/vesting.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (presets/vesting.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (presets/vesting.cairo)
 
 #[starknet::contract]
 pub mod VestingWallet {
diff --git a/packages/security/README.md b/packages/security/README.md
index 0845748ff..329b5bc24 100644
--- a/packages/security/README.md
+++ b/packages/security/README.md
@@ -1,11 +1,11 @@
 ## Security
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/security](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/security)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/security](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/security)
 
 This crate provides components to handle common security-related tasks such as pausing a contract.
 
 ### Components
 
-- [`InitializableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/security#InitializableComponent)
-- [`PausableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/security#PausableComponent)
-- [`ReentrancyGuardComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/security#ReentrancyGuardComponent)
+- [`InitializableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/security#InitializableComponent)
+- [`PausableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/security#PausableComponent)
+- [`ReentrancyGuardComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/security#ReentrancyGuardComponent)
diff --git a/packages/security/src/initializable.cairo b/packages/security/src/initializable.cairo
index cbf13fdd1..52d0aa909 100644
--- a/packages/security/src/initializable.cairo
+++ b/packages/security/src/initializable.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (security/initializable.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (security/initializable.cairo)
 
 /// # Initializable Component
 ///
diff --git a/packages/security/src/interface.cairo b/packages/security/src/interface.cairo
index 746fe4ce2..357708a68 100644
--- a/packages/security/src/interface.cairo
+++ b/packages/security/src/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (security/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (security/interface.cairo)
 
 #[starknet::interface]
 pub trait IInitializable<TState> {
diff --git a/packages/security/src/pausable.cairo b/packages/security/src/pausable.cairo
index 5f88cf164..62c149f54 100644
--- a/packages/security/src/pausable.cairo
+++ b/packages/security/src/pausable.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (security/pausable.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (security/pausable.cairo)
 
 /// # Pausable Component
 ///
diff --git a/packages/security/src/reentrancyguard.cairo b/packages/security/src/reentrancyguard.cairo
index c6e3616a8..79345cc4a 100644
--- a/packages/security/src/reentrancyguard.cairo
+++ b/packages/security/src/reentrancyguard.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (security/reentrancyguard.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (security/reentrancyguard.cairo)
 
 /// # ReentrancyGuard Component
 ///
diff --git a/packages/testing/README.md b/packages/testing/README.md
index 4d268349d..eb8089b9f 100644
--- a/packages/testing/README.md
+++ b/packages/testing/README.md
@@ -1,13 +1,13 @@
 ## Testing
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/testing](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/testing)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/testing](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/testing)
 
 This crate provides various helper functions for declaring, deploying,
 and testing smart contracts using the `snforge` toolchain from Starknet Foundry.
 
 ### Modules
 
-- [`common`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/testing#testing-common)
-- [`deployment`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/testing#testing-deployment)
-- [`events`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/testing#testing-events)
-- [`signing`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/testing#testing-signing)
+- [`common`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/testing#testing-common)
+- [`deployment`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/testing#testing-deployment)
+- [`events`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/testing#testing-events)
+- [`signing`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/testing#testing-signing)
diff --git a/packages/token/README.md b/packages/token/README.md
index 920092019..d89bcc139 100644
--- a/packages/token/README.md
+++ b/packages/token/README.md
@@ -5,57 +5,57 @@ standards.
 
 ### ERC20
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc20](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc20)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc20](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc20)
 
 #### Interfaces
 
-- [`IERC20`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc20#IERC20)
-- [`IERC20Metadata`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc20#IERC20Metadata)
+- [`IERC20`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc20#IERC20)
+- [`IERC20Metadata`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc20#IERC20Metadata)
 
 #### Components
 
-- [`ERC20Component`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc20#ERC20Component)
+- [`ERC20Component`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc20#ERC20Component)
 
 ### ERC721
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721)
 
 #### Interfaces
 
-- [`IERC721`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721#IERC721)
-- [`IERC721Metadata`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721#IERC721Metadata)
-- [`IERC721Receiver`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721#IERC721Receiver)
-- [`IERC721Enumerable`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721#IERC721Enumerable)
+- [`IERC721`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721#IERC721)
+- [`IERC721Metadata`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721#IERC721Metadata)
+- [`IERC721Receiver`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721#IERC721Receiver)
+- [`IERC721Enumerable`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721#IERC721Enumerable)
 
 #### Components
 
-- [`ERC721Component`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721#ERC721Component)
-- [`ERC721ReceiverComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721#ERC721ReceiverComponent)
-- [`ERC721EnumerableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc721#ERC721EnumerableComponent)
+- [`ERC721Component`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721#ERC721Component)
+- [`ERC721ReceiverComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721#ERC721ReceiverComponent)
+- [`ERC721EnumerableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc721#ERC721EnumerableComponent)
 
 ### ERC1155
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc1155](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc1155)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc1155](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc1155)
 
 #### Interfaces
 
-- [`IERC1155`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc1155#IERC1155)
-- [`IERC1155MetadataURI`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc1155#IERC1155MetadataURI)
-- [`IERC1155Receiver`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc1155#IERC1155Receiver)
+- [`IERC1155`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc1155#IERC1155)
+- [`IERC1155MetadataURI`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc1155#IERC1155MetadataURI)
+- [`IERC1155Receiver`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc1155#IERC1155Receiver)
 
 #### Components
 
-- [`ERC1155Component`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc1155#ERC1155Component)
-- [`ERC1155ReceiverComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/erc1155#ERC1155ReceiverComponent)
+- [`ERC1155Component`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc1155#ERC1155Component)
+- [`ERC1155ReceiverComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/erc1155#ERC1155ReceiverComponent)
 
 ### Common
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/token_common](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/token_common)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/token_common](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/token_common)
 
 #### Interfaces
 
-- [`IERC2981`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/token_common#IERC2981)
+- [`IERC2981`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/token_common#IERC2981)
 
 #### Components
 
-- [`ERC2981Component`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/token_common#ERC2981Component)
+- [`ERC2981Component`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/token_common#ERC2981Component)
diff --git a/packages/token/src/common/erc2981/erc2981.cairo b/packages/token/src/common/erc2981/erc2981.cairo
index 2355e50b8..f0da3e4fe 100644
--- a/packages/token/src/common/erc2981/erc2981.cairo
+++ b/packages/token/src/common/erc2981/erc2981.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/common/erc2981/erc2981.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/common/erc2981/erc2981.cairo)
 
 /// # ERC2981 Component
 ///
diff --git a/packages/token/src/common/erc2981/interface.cairo b/packages/token/src/common/erc2981/interface.cairo
index 20181e6e5..b34e8db19 100644
--- a/packages/token/src/common/erc2981/interface.cairo
+++ b/packages/token/src/common/erc2981/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/common/erc2981/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/common/erc2981/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/token/src/erc1155/erc1155.cairo b/packages/token/src/erc1155/erc1155.cairo
index 84dc32580..f394d043d 100644
--- a/packages/token/src/erc1155/erc1155.cairo
+++ b/packages/token/src/erc1155/erc1155.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc1155/erc1155.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc1155/erc1155.cairo)
 
 /// # ERC1155 Component
 ///
diff --git a/packages/token/src/erc1155/erc1155_receiver.cairo b/packages/token/src/erc1155/erc1155_receiver.cairo
index 92e9acba4..28463a57b 100644
--- a/packages/token/src/erc1155/erc1155_receiver.cairo
+++ b/packages/token/src/erc1155/erc1155_receiver.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc1155/erc1155_receiver.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc1155/erc1155_receiver.cairo)
 
 /// # ERC1155Receiver Component
 ///
diff --git a/packages/token/src/erc1155/interface.cairo b/packages/token/src/erc1155/interface.cairo
index f42586429..d4288c63f 100644
--- a/packages/token/src/erc1155/interface.cairo
+++ b/packages/token/src/erc1155/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc1155/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc1155/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/token/src/erc20/erc20.cairo b/packages/token/src/erc20/erc20.cairo
index bb9c5b357..0088fe0d0 100644
--- a/packages/token/src/erc20/erc20.cairo
+++ b/packages/token/src/erc20/erc20.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc20/erc20.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc20/erc20.cairo)
 
 /// # ERC20 Component
 ///
@@ -8,7 +8,7 @@
 /// component is agnostic regarding how tokens are created, which means that developers
 /// must create their own token distribution mechanism.
 /// See [the documentation]
-/// (https://docs.openzeppelin.com/contracts-cairo/0.17.0/guides/erc20-supply)
+/// (https://docs.openzeppelin.com/contracts-cairo/0.18.0/guides/erc20-supply)
 /// for examples.
 #[starknet::component]
 pub mod ERC20Component {
diff --git a/packages/token/src/erc20/interface.cairo b/packages/token/src/erc20/interface.cairo
index d35c2b75d..a3a2eccee 100644
--- a/packages/token/src/erc20/interface.cairo
+++ b/packages/token/src/erc20/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc20/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc20/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/token/src/erc20/snip12_utils/permit.cairo b/packages/token/src/erc20/snip12_utils/permit.cairo
index e39341307..43b7d2f78 100644
--- a/packages/token/src/erc20/snip12_utils/permit.cairo
+++ b/packages/token/src/erc20/snip12_utils/permit.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc20/snip12_utils/permit.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc20/snip12_utils/permit.cairo)
 
 use core::hash::{HashStateTrait, HashStateExTrait};
 use core::poseidon::PoseidonTrait;
diff --git a/packages/token/src/erc721/erc721.cairo b/packages/token/src/erc721/erc721.cairo
index a47874d9a..972dd7c85 100644
--- a/packages/token/src/erc721/erc721.cairo
+++ b/packages/token/src/erc721/erc721.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc721/erc721.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc721/erc721.cairo)
 
 /// # ERC721 Component
 ///
diff --git a/packages/token/src/erc721/erc721_receiver.cairo b/packages/token/src/erc721/erc721_receiver.cairo
index 740dc701f..bbfdb3457 100644
--- a/packages/token/src/erc721/erc721_receiver.cairo
+++ b/packages/token/src/erc721/erc721_receiver.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc721/erc721_receiver.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc721/erc721_receiver.cairo)
 
 /// # ERC721Receiver Component
 ///
diff --git a/packages/token/src/erc721/extensions/erc721_enumerable/erc721_enumerable.cairo b/packages/token/src/erc721/extensions/erc721_enumerable/erc721_enumerable.cairo
index 2b0629810..405991053 100644
--- a/packages/token/src/erc721/extensions/erc721_enumerable/erc721_enumerable.cairo
+++ b/packages/token/src/erc721/extensions/erc721_enumerable/erc721_enumerable.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0
+// OpenZeppelin Contracts for Cairo v0.18.0
 // (token/erc721/extensions/erc721_enumerable/erc721_enumerable.cairo)
 
 /// # ERC721Enumerable Component
diff --git a/packages/token/src/erc721/extensions/erc721_enumerable/interface.cairo b/packages/token/src/erc721/extensions/erc721_enumerable/interface.cairo
index 29073b61b..54ce6a817 100644
--- a/packages/token/src/erc721/extensions/erc721_enumerable/interface.cairo
+++ b/packages/token/src/erc721/extensions/erc721_enumerable/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0
+// OpenZeppelin Contracts for Cairo v0.18.0
 // (token/erc721/extensions/erc721_enumerable/interface.cairo)
 
 use starknet::ContractAddress;
diff --git a/packages/token/src/erc721/interface.cairo b/packages/token/src/erc721/interface.cairo
index e5f292e28..a1bb03d12 100644
--- a/packages/token/src/erc721/interface.cairo
+++ b/packages/token/src/erc721/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (token/erc721/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (token/erc721/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/upgrades/README.md b/packages/upgrades/README.md
index 3ee376bed..030d46762 100644
--- a/packages/upgrades/README.md
+++ b/packages/upgrades/README.md
@@ -1,14 +1,14 @@
 ## Upgrades
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/upgrades](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/upgrades)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/upgrades](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/upgrades)
 
 This crate provides an interface and component used for upgradeability.
 
 ### Interfaces
 
-- [`IUpgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/upgrades#IUpgradeable)
-- [`IUpgradeAndCall`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/upgrades#IUpgradeAndCall)
+- [`IUpgradeable`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/upgrades#IUpgradeable)
+- [`IUpgradeAndCall`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/upgrades#IUpgradeAndCall)
 
 ### Components
 
-- [`UpgradeableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/upgrades#UpgradeableComponent)
+- [`UpgradeableComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/upgrades#UpgradeableComponent)
diff --git a/packages/upgrades/src/interface.cairo b/packages/upgrades/src/interface.cairo
index a38ccb7e2..852d9cd0e 100644
--- a/packages/upgrades/src/interface.cairo
+++ b/packages/upgrades/src/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (upgrades/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (upgrades/interface.cairo)
 
 use starknet::ClassHash;
 
diff --git a/packages/upgrades/src/upgradeable.cairo b/packages/upgrades/src/upgradeable.cairo
index 610589a04..2c752d2ed 100644
--- a/packages/upgrades/src/upgradeable.cairo
+++ b/packages/upgrades/src/upgradeable.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (upgrades/upgradeable.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (upgrades/upgradeable.cairo)
 
 /// # Upgradeable Component
 ///
diff --git a/packages/utils/README.md b/packages/utils/README.md
index 00d094f37..a88bfe0db 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -1,18 +1,18 @@
 ## Utils
 
-> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities)
+> **NOTE:** This document is better viewed at [https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities)
 
 This crate provides components and libraries containing miscellaneous utilities.
 
 ### Core utilities
 
-- [`utils`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities#utils)
-- [`cryptography`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities#cryptography)
-- [`deployments`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities#deployments)
-- [`math`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities#math)
-- [`serde`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities#serde)
+- [`utils`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities#utils)
+- [`cryptography`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities#cryptography)
+- [`deployments`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities#deployments)
+- [`math`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities#math)
+- [`serde`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities#serde)
 
 ### Cryptography
 
-- [`NoncesComponent`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities#NoncesComponent)
-- [`snip12`](https://docs.openzeppelin.com/contracts-cairo/0.17.0/api/utilities#snip12)
+- [`NoncesComponent`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities#NoncesComponent)
+- [`snip12`](https://docs.openzeppelin.com/contracts-cairo/0.18.0/api/utilities#snip12)
diff --git a/packages/utils/src/cryptography/interface.cairo b/packages/utils/src/cryptography/interface.cairo
index 5b8043a25..8bd22fd98 100644
--- a/packages/utils/src/cryptography/interface.cairo
+++ b/packages/utils/src/cryptography/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/cryptography/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/cryptography/interface.cairo)
 
 use starknet::ContractAddress;
 
diff --git a/packages/utils/src/cryptography/nonces.cairo b/packages/utils/src/cryptography/nonces.cairo
index c4f97f724..4ddf69aaa 100644
--- a/packages/utils/src/cryptography/nonces.cairo
+++ b/packages/utils/src/cryptography/nonces.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/cryptography/nonces.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/cryptography/nonces.cairo)
 
 /// # Nonces Component
 ///
diff --git a/packages/utils/src/cryptography/snip12.cairo b/packages/utils/src/cryptography/snip12.cairo
index 39f460fa3..803840099 100644
--- a/packages/utils/src/cryptography/snip12.cairo
+++ b/packages/utils/src/cryptography/snip12.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/cryptography/snip12.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/cryptography/snip12.cairo)
 
 use core::hash::{HashStateTrait, HashStateExTrait};
 use core::poseidon::PoseidonTrait;
diff --git a/packages/utils/src/deployments.cairo b/packages/utils/src/deployments.cairo
index 9954c4f51..cc183c861 100644
--- a/packages/utils/src/deployments.cairo
+++ b/packages/utils/src/deployments.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/deployments.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/deployments.cairo)
 
 pub mod interface;
 
diff --git a/packages/utils/src/deployments/interface.cairo b/packages/utils/src/deployments/interface.cairo
index da8c8cf1d..a9b235104 100644
--- a/packages/utils/src/deployments/interface.cairo
+++ b/packages/utils/src/deployments/interface.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/deployments/interface.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/deployments/interface.cairo)
 
 use starknet::{ClassHash, ContractAddress};
 
diff --git a/packages/utils/src/lib.cairo b/packages/utils/src/lib.cairo
index 2e96323af..b828bc593 100644
--- a/packages/utils/src/lib.cairo
+++ b/packages/utils/src/lib.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/lib.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/lib.cairo)
 
 pub mod cryptography;
 pub mod deployments;
diff --git a/packages/utils/src/math.cairo b/packages/utils/src/math.cairo
index a21e245d7..d65c93528 100644
--- a/packages/utils/src/math.cairo
+++ b/packages/utils/src/math.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/math.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/math.cairo)
 
 use core::traits::{Into, BitAnd, BitXor};
 
diff --git a/packages/utils/src/serde.cairo b/packages/utils/src/serde.cairo
index 872adcbdf..fe7c8f93e 100644
--- a/packages/utils/src/serde.cairo
+++ b/packages/utils/src/serde.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/serde.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/serde.cairo)
 
 pub trait SerializedAppend<T> {
     fn append_serde(ref self: Array<felt252>, value: T);
diff --git a/packages/utils/src/structs/checkpoint.cairo b/packages/utils/src/structs/checkpoint.cairo
index b0fa3b5bd..635da01b6 100644
--- a/packages/utils/src/structs/checkpoint.cairo
+++ b/packages/utils/src/structs/checkpoint.cairo
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (utils/structs/checkpoint.cairo)
+// OpenZeppelin Contracts for Cairo v0.18.0 (utils/structs/checkpoint.cairo)
 
 use core::num::traits::Sqrt;
 use crate::math;
diff --git a/sncast_scripts/Scarb.lock b/sncast_scripts/Scarb.lock
index 323d8226c..90cb3ae2c 100644
--- a/sncast_scripts/Scarb.lock
+++ b/sncast_scripts/Scarb.lock
@@ -3,7 +3,7 @@ version = 1
 
 [[package]]
 name = "openzeppelin_access"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_utils",
@@ -11,7 +11,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_utils",
@@ -19,7 +19,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_finance"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_token",
@@ -27,7 +27,7 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_governance"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_introspection",
@@ -35,11 +35,11 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.17.0"
+version = "0.18.0"
 
 [[package]]
 name = "openzeppelin_presets"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
@@ -51,14 +51,14 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_testing"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "snforge_std",
 ]
 
 [[package]]
 name = "openzeppelin_token"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "openzeppelin_account",
  "openzeppelin_governance",
@@ -67,11 +67,11 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_upgrades"
-version = "0.17.0"
+version = "0.18.0"
 
 [[package]]
 name = "openzeppelin_utils"
-version = "0.17.0"
+version = "0.18.0"
 
 [[package]]
 name = "sncast_scripts"