From 9e39bee3bd074d61ec6f7d81763abcb787730e00 Mon Sep 17 00:00:00 2001 From: Ryan <80392855+RayXpub@users.noreply.github.com> Date: Thu, 28 Aug 2025 10:49:03 +0200 Subject: [PATCH 1/2] fix: npm openzeppelin aliases --- contracts/package.json | 10 +++++----- contracts/pnpm-lock.yaml | 16 ++++++++-------- contracts/remappings.txt | 6 +++++- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/contracts/package.json b/contracts/package.json index c81aac7a40..e85705d151 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -96,11 +96,11 @@ "@eslint/eslintrc": "^3.3.1", "@eth-optimism/contracts": "0.6.0", "@openzeppelin/contracts-upgradeable": "4.9.6", - "@openzeppelin/contracts@4.7.3/": "npm:@openzeppelin/contracts@4.7.3", - "@openzeppelin/contracts@4.8.3/": "npm:@openzeppelin/contracts@4.8.3", - "@openzeppelin/contracts@4.9.6/": "npm:@openzeppelin/contracts@4.9.6", - "@openzeppelin/contracts@5.0.2/": "npm:@openzeppelin/contracts@5.0.2", - "@openzeppelin/contracts@5.1.0/": "npm:@openzeppelin/contracts@5.1.0", + "@openzeppelin/contracts-4.7.3/": "npm:@openzeppelin/contracts@4.7.3", + "@openzeppelin/contracts-4.8.3/": "npm:@openzeppelin/contracts@4.8.3", + "@openzeppelin/contracts-4.9.6/": "npm:@openzeppelin/contracts@4.9.6", + "@openzeppelin/contracts-5.0.2/": "npm:@openzeppelin/contracts@5.0.2", + "@openzeppelin/contracts-5.1.0/": "npm:@openzeppelin/contracts@5.1.0", "@scroll-tech/contracts": "2.0.0", "@zksync/contracts": "github:matter-labs/era-contracts#446d391d34bdb48255d5f8fef8a8248925fc98b9", "semver": "^7.7.2" diff --git a/contracts/pnpm-lock.yaml b/contracts/pnpm-lock.yaml index 7601fa1223..8fb663d46b 100644 --- a/contracts/pnpm-lock.yaml +++ b/contracts/pnpm-lock.yaml @@ -33,24 +33,24 @@ importers: '@eth-optimism/contracts': specifier: 0.6.0 version: 0.6.0(ethers@5.8.0) - '@openzeppelin/contracts-upgradeable': - specifier: 4.9.6 - version: 4.9.6 - '@openzeppelin/contracts@4.7.3/': + '@openzeppelin/contracts-4.7.3/': specifier: npm:@openzeppelin/contracts@4.7.3 version: '@openzeppelin/contracts@4.7.3' - '@openzeppelin/contracts@4.8.3/': + '@openzeppelin/contracts-4.8.3/': specifier: npm:@openzeppelin/contracts@4.8.3 version: '@openzeppelin/contracts@4.8.3' - '@openzeppelin/contracts@4.9.6/': + '@openzeppelin/contracts-4.9.6/': specifier: npm:@openzeppelin/contracts@4.9.6 version: '@openzeppelin/contracts@4.9.6' - '@openzeppelin/contracts@5.0.2/': + '@openzeppelin/contracts-5.0.2/': specifier: npm:@openzeppelin/contracts@5.0.2 version: '@openzeppelin/contracts@5.0.2' - '@openzeppelin/contracts@5.1.0/': + '@openzeppelin/contracts-5.1.0/': specifier: npm:@openzeppelin/contracts@5.1.0 version: '@openzeppelin/contracts@5.1.0' + '@openzeppelin/contracts-upgradeable': + specifier: 4.9.6 + version: 4.9.6 '@scroll-tech/contracts': specifier: 2.0.0 version: 2.0.0 diff --git a/contracts/remappings.txt b/contracts/remappings.txt index 4ed0fcfd9a..eb41fbb226 100644 --- a/contracts/remappings.txt +++ b/contracts/remappings.txt @@ -1,6 +1,10 @@ forge-std/=src/v0.8/vendor/forge-std/src/ -@openzeppelin/=node_modules/@openzeppelin/ +@openzeppelin/contracts@4.7.3=node_modules/@openzeppelin/contracts-4.7.3 +@openzeppelin/contracts@4.8.3=node_modules/@openzeppelin/contracts-4.8.3 +@openzeppelin/contracts@4.9.6=node_modules/@openzeppelin/contracts-4.9.6 +@openzeppelin/contracts@5.0.2=node_modules/@openzeppelin/contracts-5.0.2 +@openzeppelin/contracts@5.1.0=node_modules/@openzeppelin/contracts-5.1.0 @arbitrum/=node_modules/@arbitrum/ hardhat/=node_modules/hardhat/ @eth-optimism/=node_modules/@eth-optimism/ From 200aba865bdd86601209b6de301406f644db5b79 Mon Sep 17 00:00:00 2001 From: Rens Rooimans Date: Fri, 29 Aug 2025 10:04:57 +0200 Subject: [PATCH 2/2] fix path refs, fix remapping of OZ upgradable --- contracts/.solhint.json | 1 + contracts/remappings.txt | 3 +++ contracts/scripts/native_solc_compile_all_shared | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contracts/.solhint.json b/contracts/.solhint.json index 8ba4f12039..b4771fc9f8 100644 --- a/contracts/.solhint.json +++ b/contracts/.solhint.json @@ -11,6 +11,7 @@ "no-inline-assembly": "off", "contract-name-capwords": "off", "no-unused-import": "error", + "import-path-check": "off", "gas-struct-packing": "warn", "interface-starts-with-i": "warn", "func-visibility": [ diff --git a/contracts/remappings.txt b/contracts/remappings.txt index eb41fbb226..041fdb5b0b 100644 --- a/contracts/remappings.txt +++ b/contracts/remappings.txt @@ -5,6 +5,9 @@ forge-std/=src/v0.8/vendor/forge-std/src/ @openzeppelin/contracts@4.9.6=node_modules/@openzeppelin/contracts-4.9.6 @openzeppelin/contracts@5.0.2=node_modules/@openzeppelin/contracts-5.0.2 @openzeppelin/contracts@5.1.0=node_modules/@openzeppelin/contracts-5.1.0 +@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/ + + @arbitrum/=node_modules/@arbitrum/ hardhat/=node_modules/hardhat/ @eth-optimism/=node_modules/@eth-optimism/ diff --git a/contracts/scripts/native_solc_compile_all_shared b/contracts/scripts/native_solc_compile_all_shared index 962a355cf4..e4be846b71 100755 --- a/contracts/scripts/native_solc_compile_all_shared +++ b/contracts/scripts/native_solc_compile_all_shared @@ -74,6 +74,6 @@ compileContract mocks/MockV3Aggregator 0.8.19 compileContract mocks/WERC20Mock 0.8.19 compileContract token/ERC20/zksync/WETH9ZKSync 0.8.19 -compileContract @openzeppelin/contracts@4.8.3/token/ERC20/ERC20 0.8.19 ../../node_modules +compileContract @openzeppelin/contracts-4.8.3/token/ERC20/ERC20 0.8.19 ../../node_modules compileContract multicall/ebd8b64/src/Multicall3 0.8.19 vendor compileContract canonical-weth/WETH9 0.8.19 vendor