Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
4a1fedb
use contract for the @openzeppelin/contracts package + update to
Amxx Mar 17, 2021
8e56c18
refactor unsafeAllow to prepare for UUPS checks
Amxx Mar 17, 2021
f2d3833
validate function selectors and verify upgradeTo is present.
Amxx Mar 17, 2021
8dadea6
support proxy kind in hardhat plugin.
Amxx Mar 17, 2021
a736b9a
add proxiable version of the test contract for plugin-hardhat
Amxx Mar 17, 2021
e80ff42
uups testing for hardhat-plugin:
Amxx Mar 18, 2021
30755ae
refactor & improve core uups support
Amxx Mar 18, 2021
d2efa84
use functionSignature instead of functionSelector
Amxx Mar 18, 2021
283cd37
Revert back to 0.5 / 0.6 test contracts
Amxx Mar 18, 2021
b514a14
autodetect proxy kind when upgrading
Amxx Mar 18, 2021
3938cb9
refactor hardhat plugin
Amxx Mar 19, 2021
958cde8
add uups support to truffle plugin + tests
Amxx Mar 19, 2021
2bb30b4
update defender tests for uups/transparent
Amxx Mar 19, 2021
6ae8111
fix lint
Amxx Mar 19, 2021
3483576
add a skiplist in core/src/validation/run.ts
Amxx Mar 22, 2021
e3224c6
allowUnsafe using custom natspec
Amxx Mar 24, 2021
5e0919f
immutable needs state assignment as well
Amxx Mar 24, 2021
88f8ad4
fix lint
Amxx Mar 24, 2021
5bdad43
fix relative imports in tests
Amxx Mar 24, 2021
8dfeab8
depend on latest contract version
Amxx Mar 24, 2021
874b008
Fix hashBytecode part of contract versionning
Amxx Mar 25, 2021
8da549f
Update packages/core/src/validate/run.ts
Amxx Mar 25, 2021
06cf2b9
address PR comments + fix bytecodeHash for truffle
Amxx Mar 25, 2021
0b994fd
Merge branch 'feature/uup-support-#3' of github.com:Amxx/openzeppelin…
Amxx Mar 25, 2021
00175bc
update function signature computation
Amxx Mar 25, 2021
37a7b2e
re-enable unsafeAllowCustomTypes and unsafeAllowLinkedLibraries options
Amxx Mar 25, 2021
8f3d573
Update packages/core/contracts/import.sol
Amxx Mar 25, 2021
1602b55
use regexp to parse natspec
Amxx Mar 25, 2021
f7f03ea
Update packages/core/src/version.ts
Amxx Mar 26, 2021
c8da179
address some PR comments
Amxx Mar 26, 2021
3f713ae
fix comments for the PR
Amxx Mar 26, 2021
8523fbb
fix lint
Amxx Mar 26, 2021
1f8fab1
Add proxy to the manifest & use manifest for upgrades
Amxx Mar 26, 2021
c60bd73
migrate transparent compatible proxies from oz-cli
Amxx Mar 26, 2021
e6e62d3
migrateManifest fix
Amxx Mar 26, 2021
f6f60bc
fix lint
Amxx Mar 26, 2021
7406639
warning messages against proxyAdmin + uups incompatibilities
Amxx Mar 26, 2021
edd5d9e
change natspec allow unsafe syntax
Amxx Mar 29, 2021
95e79eb
inline asembly no longer authorized by default. Easy to disable local…
Amxx Mar 29, 2021
c3f868d
fix lint
Amxx Mar 29, 2021
c176d8b
disable assembly check
Amxx Mar 30, 2021
02fccd1
fix core - thanks manual testing
Amxx Apr 9, 2021
e18eafb
Merge branch 'master' into feature/uup-support-#3
Amxx Apr 9, 2021
766f2d3
remove inline assembly check
Amxx Apr 9, 2021
74d41ef
fix indentation
Amxx Apr 9, 2021
3d6efb6
reset custom error type
Amxx Apr 9, 2021
5b9a9b7
fix lint
Amxx Apr 9, 2021
d05c571
fix error message
Amxx Apr 9, 2021
24a725e
add explanation of AdminUpgradeabilityProxy
frangio Apr 13, 2021
caf7f95
add old contract locations for compatibility
frangio Apr 13, 2021
307fb13
add proxy kind codec for more accurate manifest validation
frangio Apr 13, 2021
83e75f9
add back DeployOptions and restore default initialization behavior
frangio Apr 14, 2021
99676a2
keep original export
frangio Apr 14, 2021
00e6e30
define logWarning helper
frangio Apr 14, 2021
5bb89fe
use the new logWarning where appropriate
frangio Apr 14, 2021
c5d1ebc
lint
frangio Apr 14, 2021
0dca413
narrow down error in catch block
frangio Apr 14, 2021
d0cd980
remove manifest argument in deployImpl
frangio Apr 14, 2021
836d138
replace auto before deploying impl to perform the correct check
Amxx Apr 14, 2021
952f887
rename variable
frangio Apr 14, 2021
3483eb9
add kind to ValidationOption
Amxx Apr 14, 2021
7f71368
Merge branch 'feature/uup-support-#3' of github.com:Amxx/openzeppelin…
Amxx Apr 14, 2021
9b8d781
add more detailed description of state-variable-assignment flag
frangio Apr 14, 2021
85b1caf
add test for function signatures
frangio Apr 15, 2021
028e517
rename serialize function
frangio Apr 15, 2021
1e44607
remove redundant check
frangio Apr 15, 2021
e6f6fa9
fix type errors
frangio Apr 15, 2021
5d68bce
lint
frangio Apr 15, 2021
f0784ea
refactor query.ts getErrors
frangio Apr 16, 2021
346c526
define array of error kinds with type checking
frangio Apr 16, 2021
7c4e656
make methods a mandatory member of validation data
frangio Apr 16, 2021
6863cf2
Merge branch 'master' into feature/uup-support-#3
frangio Apr 16, 2021
634048a
bump validation data version to flush caches
frangio Apr 16, 2021
688a427
add kind: transparent in test even if not necessary
frangio Apr 16, 2021
aaa914d
add setProxyKind helper
frangio Apr 16, 2021
f5ffb33
lint
frangio Apr 16, 2021
0975e7b
remove fallback addressed by manifest version
Amxx Apr 19, 2021
a088cd3
replace switch by simpler if
frangio Apr 20, 2021
97b302e
replace fetchOrDeployProxy with simpler method in Manifest
frangio Apr 20, 2021
442c545
remove extra slash
frangio Apr 20, 2021
d360815
remove redundant code
frangio Apr 20, 2021
a04874b
rename variables for clarity
frangio Apr 20, 2021
b40e32f
use getCode helper
frangio Apr 20, 2021
5cd1477
introduce upgrader abstraction to simplify upgrade-proxy
frangio Apr 20, 2021
049f461
Merge branch 'master' into feature/uup-support-#3
frangio Apr 20, 2021
5a47f46
add explicit kind in tests
frangio Apr 20, 2021
af45ff7
rename no-public-upgrade-fn -> missing-public-upgradeto
frangio Apr 20, 2021
9347a68
Allow explicitly setting proxy admin and multisig addresses in defend…
spalladino Apr 22, 2021
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
11 changes: 11 additions & 0 deletions packages/core/contracts/import.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";

// Kept for backwards compatibility with older versions of Hardhat and Truffle plugins.
contract AdminUpgradeabilityProxy is TransparentUpgradeableProxy {
constructor(address logic, address admin, bytes memory data) payable TransparentUpgradeableProxy(logic, admin, data) {}
}
136 changes: 0 additions & 136 deletions packages/core/contracts/proxy/AdminUpgradeabilityProxy.sol

This file was deleted.

77 changes: 0 additions & 77 deletions packages/core/contracts/proxy/Proxy.sol

This file was deleted.

70 changes: 0 additions & 70 deletions packages/core/contracts/proxy/ProxyAdmin.sol

This file was deleted.

78 changes: 0 additions & 78 deletions packages/core/contracts/proxy/UpgradeabilityProxy.sol

This file was deleted.

Loading