Skip to content

Commit 421bd18

Browse files
committed
update patch
1 parent 5bdf0c4 commit 421bd18

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

scripts/upgradeable/upgradeable.patch

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ index ff596b0c..00000000
5959
-<!-- Make sure that you have reviewed the OpenZeppelin Contracts Contributor Guidelines. -->
6060
-<!-- https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/CONTRIBUTING.md -->
6161
diff --git a/README.md b/README.md
62-
index aba99171..6656267b 100644
62+
index 9d1c405b..c264e29c 100644
6363
--- a/README.md
6464
+++ b/README.md
65-
@@ -19,17 +19,20 @@
65+
@@ -19,6 +19,9 @@
6666

6767
:building_construction: **Want to scale your decentralized application?** Check out [OpenZeppelin Defender](https://openzeppelin.com/defender) — a secure platform for automating and monitoring your operations.
6868

@@ -72,20 +72,25 @@ index aba99171..6656267b 100644
7272
## Overview
7373

7474
### Installation
75+
@@ -26,7 +29,7 @@
76+
#### Hardhat, Truffle (npm)
7577

7678
```
7779
-$ npm install @openzeppelin/contracts
7880
+$ npm install @openzeppelin/contracts-upgradeable
7981
```
8082

8183
OpenZeppelin Contracts features a [stable API](https://docs.openzeppelin.com/contracts/releases-stability#api-stability), which means that your contracts won't break unexpectedly when upgrading to a newer minor version.
84+
@@ -38,7 +41,7 @@ OpenZeppelin Contracts features a [stable API](https://docs.openzeppelin.com/con
85+
> **Warning** Foundry installs the latest version initially, but subsequent `forge update` commands will use the `master` branch.
8286

83-
-An alternative to npm is to use the GitHub repository (`openzeppelin/openzeppelin-contracts`) to retrieve the contracts. When doing this, make sure to specify the tag for a release such as `v4.5.0`, instead of using the `master` branch.
84-
+An alternative to npm is to use the GitHub repository (`openzeppelin/openzeppelin-contracts-upgradeable`) to retrieve the contracts. When doing this, make sure to specify the tag for a release such as `v4.5.0`, instead of using the `master` branch.
87+
```
88+
-$ forge install OpenZeppelin/openzeppelin-contracts
89+
+$ forge install OpenZeppelin/openzeppelin-contracts-upgradeable
90+
```
8591

8692
### Usage
87-
88-
@@ -38,10 +41,11 @@ Once installed, you can use the contracts in the library by importing them:
93+
@@ -48,10 +51,11 @@ Once installed, you can use the contracts in the library by importing them:
8994
```solidity
9095
pragma solidity ^0.8.19;
9196

@@ -101,7 +106,7 @@ index aba99171..6656267b 100644
101106
}
102107
```
103108
diff --git a/contracts/finance/VestingWallet.sol b/contracts/finance/VestingWallet.sol
104-
index 5b7e1b15..1ca745d6 100644
109+
index ebdf0a33..8888803e 100644
105110
--- a/contracts/finance/VestingWallet.sol
106111
+++ b/contracts/finance/VestingWallet.sol
107112
@@ -18,6 +18,8 @@ import "../utils/Context.sol";
@@ -127,15 +132,15 @@ index 5d8318f4..ef3cde55 100644
127132
abstract contract GovernorVotes is Governor {
128133
IERC5805 public immutable token;
129134
diff --git a/contracts/package.json b/contracts/package.json
130-
index 4d0f576b..822fd471 100644
135+
index df141192..1cf90ad1 100644
131136
--- a/contracts/package.json
132137
+++ b/contracts/package.json
133138
@@ -1,5 +1,5 @@
134139
{
135140
- "name": "@openzeppelin/contracts",
136141
+ "name": "@openzeppelin/contracts-upgradeable",
137142
"description": "Secure Smart Contract library for Solidity",
138-
"version": "4.9.0",
143+
"version": "4.9.2",
139144
"files": [
140145
@@ -13,7 +13,7 @@
141146
},
@@ -147,7 +152,7 @@ index 4d0f576b..822fd471 100644
147152
"keywords": [
148153
"solidity",
149154
diff --git a/contracts/token/ERC20/extensions/ERC20Capped.sol b/contracts/token/ERC20/extensions/ERC20Capped.sol
150-
index cda07265..d314148c 100644
155+
index 41e9ce5c..1d910dfa 100644
151156
--- a/contracts/token/ERC20/extensions/ERC20Capped.sol
152157
+++ b/contracts/token/ERC20/extensions/ERC20Capped.sol
153158
@@ -7,6 +7,8 @@ import "../ERC20.sol";
@@ -160,7 +165,7 @@ index cda07265..d314148c 100644
160165
abstract contract ERC20Capped is ERC20 {
161166
uint256 private immutable _cap;
162167
diff --git a/contracts/token/ERC20/extensions/ERC20Permit.sol b/contracts/token/ERC20/extensions/ERC20Permit.sol
163-
index 9379e445..e02f0644 100644
168+
index 4378eb7c..1da9e731 100644
164169
--- a/contracts/token/ERC20/extensions/ERC20Permit.sol
165170
+++ b/contracts/token/ERC20/extensions/ERC20Permit.sol
166171
@@ -18,6 +18,8 @@ import "../../../utils/Nonces.sol";
@@ -173,7 +178,7 @@ index 9379e445..e02f0644 100644
173178
abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712, Nonces {
174179
// solhint-disable-next-line var-name-mixedcase
175180
diff --git a/contracts/token/ERC20/extensions/ERC20Wrapper.sol b/contracts/token/ERC20/extensions/ERC20Wrapper.sol
176-
index bf2b225c..0e5b3628 100644
181+
index 389965e9..66436b14 100644
177182
--- a/contracts/token/ERC20/extensions/ERC20Wrapper.sol
178183
+++ b/contracts/token/ERC20/extensions/ERC20Wrapper.sol
179184
@@ -14,6 +14,8 @@ import "../utils/SafeERC20.sol";
@@ -356,7 +361,7 @@ index 2628014f..7d5193c8 100644
356361
}
357362
}
358363
diff --git a/package.json b/package.json
359-
index c070915f..9a513cac 100644
364+
index 37e8f871..d098669f 100644
360365
--- a/package.json
361366
+++ b/package.json
362367
@@ -33,7 +33,7 @@

0 commit comments

Comments
 (0)