Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0f54291
enable partial transpilation
frangio Sep 27, 2023
b4a9a76
refactor prepare/prepack scripts
frangio Sep 27, 2023
f648bfe
add vanilla as dependency during upgradeable tests
frangio Sep 27, 2023
3910fbc
fix npm pack output
frangio Sep 27, 2023
270c006
fix npm pack
frangio Sep 27, 2023
df08dd7
fix transpile command
frangio Sep 27, 2023
59746e6
change approach without using pack
frangio Sep 27, 2023
e904e02
fix workflow
frangio Sep 27, 2023
0f2bafe
fix checkout location
frangio Sep 27, 2023
8002e8d
fix run
frangio Sep 27, 2023
9e2dcf1
fix mkdir
frangio Sep 27, 2023
0ff2901
fix ln
frangio Sep 27, 2023
5d8422f
add transpiler as dependency]
frangio Sep 27, 2023
de7a277
update hardhat-exposed
frangio Sep 27, 2023
63acb32
update transpiler
frangio Sep 27, 2023
5f0c801
enable exposed imports
frangio Sep 27, 2023
b6476c1
fix config
frangio Sep 27, 2023
448d8f6
add Stateless.sol
frangio Sep 27, 2023
0f7c3e2
fix stateless
frangio Sep 27, 2023
7246dbb
add dummy contract in stateless file
frangio Sep 27, 2023
ef88118
add all library imports
frangio Sep 27, 2023
01a768b
update hardhat-exposed
frangio Sep 27, 2023
e16c0ae
mark some contracts as stateless
Amxx Sep 28, 2023
9dc5442
sort
Amxx Sep 28, 2023
4771215
Add peer dependency to package.json
Amxx Sep 28, 2023
4ca92e2
fix import path
Amxx Sep 28, 2023
b320373
cleanup
Amxx Sep 28, 2023
268e17f
mark UUPSUpgradeable as stateless
Amxx Sep 28, 2023
781d5f2
Merge branch 'master' into partial-transpilation
frangio Sep 28, 2023
242b716
add changeset
frangio Sep 28, 2023
8d8030b
Update .github/workflows/checks.yml
frangio Sep 28, 2023
f63cf2d
simplify prepack
frangio Sep 28, 2023
86ebb2e
fix order of transpilation
frangio Sep 28, 2023
9e1ce8d
Merge branch 'master' into partial-transpilation
frangio Sep 28, 2023
b51a866
fix location where peer dependency is added
frangio Sep 28, 2023
5336454
read package version from contracts/package.json
Amxx Sep 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix location where peer dependency is added
  • Loading branch information
frangio committed Sep 28, 2023
commit b51a866989babff4d7e922ec69c3db4ab5872fc9
6 changes: 3 additions & 3 deletions scripts/upgradeable/transpile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

set -euo pipefail -x

VERSION=$(jq -r .version package.json)
VERSION="$(jq -r .version package.json)"
DIRNAME="$(dirname -- "${BASH_SOURCE[0]}")"

bash "$DIRNAME/patch-apply.sh"
sed -i "s/<package-version>/$VERSION/g" package.json
git add package.json
sed -i "s/<package-version>/$VERSION/g" contracts/package.json
git add contracts/package.json

npm run clean
npm run compile
Expand Down
34 changes: 17 additions & 17 deletions scripts/upgradeable/upgradeable.patch
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ index ff596b0c3..000000000
-<!-- Make sure that you have reviewed the OpenZeppelin Contracts Contributor Guidelines. -->
-<!-- https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/CONTRIBUTING.md -->
diff --git a/README.md b/README.md
index 53c29e5f8..59f72a542 100644
index 549891e3f..a6b24078e 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,9 @@
Expand All @@ -81,8 +81,8 @@ index 53c29e5f8..59f72a542 100644
```

#### Foundry (git)
@@ -40,10 +43,10 @@ $ npm install @openzeppelin/contracts
> **Warning** Foundry installs the latest version initially, but subsequent `forge update` commands will use the `master` branch.
@@ -42,10 +45,10 @@ $ npm install @openzeppelin/contracts
> Foundry installs the latest version initially, but subsequent `forge update` commands will use the `master` branch.

```
-$ forge install OpenZeppelin/openzeppelin-contracts
Expand All @@ -94,7 +94,7 @@ index 53c29e5f8..59f72a542 100644

### Usage

@@ -52,10 +55,11 @@ Once installed, you can use the contracts in the library by importing them:
@@ -54,10 +57,11 @@ Once installed, you can use the contracts in the library by importing them:
```solidity
pragma solidity ^0.8.20;

Expand All @@ -110,7 +110,7 @@ index 53c29e5f8..59f72a542 100644
}
```
diff --git a/contracts/package.json b/contracts/package.json
index 9017953ca..c6eec1a88 100644
index 9017953ca..f51c1d38b 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -1,5 +1,5 @@
Expand All @@ -129,6 +129,16 @@ index 9017953ca..c6eec1a88 100644
},
"keywords": [
"solidity",
@@ -28,5 +28,8 @@
"bugs": {
"url": "https://github.com/OpenZeppelin/openzeppelin-contracts/issues"
},
- "homepage": "https://openzeppelin.com/contracts/"
+ "homepage": "https://openzeppelin.com/contracts/",
+ "peerDependencies": {
+ "@openzeppelin/contracts": "<package-version>"
+ }
}
diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol
index 644f6f531..ab8ba05ff 100644
--- a/contracts/utils/cryptography/EIP712.sol
Expand Down Expand Up @@ -297,10 +307,10 @@ index 644f6f531..ab8ba05ff 100644
}
}
diff --git a/package.json b/package.json
index e25097399..fbcc10d88 100644
index 3a1617c09..97e59c2d9 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
@@ -32,7 +32,7 @@
},
"repository": {
"type": "git",
Expand All @@ -309,16 +319,6 @@ index e25097399..fbcc10d88 100644
},
"keywords": [
"solidity",
@@ -49,6 +49,9 @@
"url": "https://github.com/OpenZeppelin/openzeppelin-contracts/issues"
},
"homepage": "https://openzeppelin.com/contracts/",
+ "peerDependencies": {
+ "@openzeppelin/contracts": "<package-version>"
+ },
"devDependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.0",
diff --git a/test/utils/cryptography/EIP712.test.js b/test/utils/cryptography/EIP712.test.js
index faf01f1a3..b25171a56 100644
--- a/test/utils/cryptography/EIP712.test.js
Expand Down