Bump OZ and solidity

1inch · Nov 14, 2023 · 4d11341 · 4d11341
1 parent 585cad4
commit 4d11341
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 83 deletions.
diff --git a/contracts/ERC20Plugins.sol b/contracts/ERC20Plugins.sol
@@ -168,8 +168,8 @@ abstract contract ERC20Plugins is ERC20, IERC20Plugins, ReentrancyGuardExt {
         }
     }
 
-    function _afterTokenTransfer(address from, address to, uint256 amount) internal nonReentrant(_guard) override virtual {
-        super._afterTokenTransfer(from, to, amount);
+    function _update(address from, address to, uint256 amount) internal nonReentrant(_guard) override virtual {
+        super._update(from, to, amount);
 
         unchecked {
             if (amount > 0 && from != to) {

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -8,15 +8,21 @@ require('dotenv').config();
 
 const { networks, etherscan } = require('./hardhat.networks');
 
+function getNetwork () {
+    const index = process.argv.findIndex((arg) => arg === '--network') + 1;
+    return index !== 0 ? process.argv[index] : 'unknown';
+}
+
 module.exports = {
     etherscan,
     solidity: {
-        version: '0.8.17',
+        version: '0.8.23',
         settings: {
             optimizer: {
                 enabled: true,
                 runs: 1000000,
             },
+            evmVersion: networks[getNetwork()]?.hardfork || 'shanghai',
             viaIR: true,
         },
     },

diff --git a/hardhat.networks.js b/hardhat.networks.js
@@ -1,12 +1,13 @@
 const networks = {};
-const etherscan = { apiKey: {} };
+const etherscan = { apiKey: {}, customChains: [] };
 
-function register (name, chainId, url, privateKey, etherscanNetworkName, etherscanKey) {
-    if (url && privateKey && etherscanKey) {
+function register (name, chainId, url, privateKey, etherscanNetworkName, etherscanKey, hardfork = 'paris') {
+    if (url && privateKey && etherscanNetworkName && etherscanKey) {
         networks[name] = {
             url,
             chainId,
             accounts: [privateKey],
+            hardfork,
         };
         etherscan.apiKey[etherscanNetworkName] = etherscanKey;
         console.log(`Network '${name}' registered`);
@@ -15,72 +16,25 @@ function register (name, chainId, url, privateKey, etherscanNetworkName, ethersc
     }
 }
 
-register(
-    'mainnet',
-    1,
-    process.env.MAINNET_RPC_URL,
-    process.env.MAINNET_PRIVATE_KEY,
-    'mainnet',
-    process.env.MAINNET_ETHERSCAN_KEY,
-);
+function registerCustom (name, chainId, url, privateKey, etherscanKey, apiURL, browserURL, hardfork = 'paris') {
+    if (url && privateKey && etherscanKey) {
+        register(name, chainId, hardfork, url, privateKey, name, etherscanKey);
+        etherscan.customChains.push({ network: name, chainId, urls: { apiURL, browserURL } });
+    }
+}
+
+register('mainnet', 1, process.env.MAINNET_RPC_URL, process.env.MAINNET_PRIVATE_KEY, 'mainnet', process.env.MAINNET_ETHERSCAN_KEY, 'shanghai');
 register('bsc', 56, process.env.BSC_RPC_URL, process.env.BSC_PRIVATE_KEY, 'bsc', process.env.BSC_ETHERSCAN_KEY);
-register(
-    'kovan',
-    42,
-    process.env.KOVAN_RPC_URL,
-    process.env.KOVAN_PRIVATE_KEY,
-    'kovan',
-    process.env.KOVAN_ETHERSCAN_KEY,
-);
-register(
-    'optimistic',
-    10,
-    process.env.OPTIMISTIC_RPC_URL,
-    process.env.OPTIMISTIC_PRIVATE_KEY,
-    'optimisticEthereum',
-    process.env.OPTIMISTIC_ETHERSCAN_KEY,
-);
-register(
-    'matic',
-    137,
-    process.env.MATIC_RPC_URL,
-    process.env.MATIC_PRIVATE_KEY,
-    'polygon',
-    process.env.MATIC_ETHERSCAN_KEY,
-);
-register(
-    'arbitrum',
-    42161,
-    process.env.ARBITRUM_RPC_URL,
-    process.env.ARBITRUM_PRIVATE_KEY,
-    'arbitrumOne',
-    process.env.ARBITRUM_ETHERSCAN_KEY,
-);
-register('xdai', 100, process.env.XDAI_RPC_URL, process.env.XDAI_PRIVATE_KEY, 'xdai', process.env.XDAI_ETHERSCAN_KEY);
-register(
-    'avax',
-    43114,
-    process.env.AVAX_RPC_URL,
-    process.env.AVAX_PRIVATE_KEY,
-    'avalanche',
-    process.env.AVAX_ETHERSCAN_KEY,
-);
-register(
-    'fantom',
-    250,
-    process.env.FANTOM_RPC_URL,
-    process.env.FANTOM_PRIVATE_KEY,
-    'opera',
-    process.env.FANTOM_ETHERSCAN_KEY,
-);
-register(
-    'aurora',
-    1313161554,
-    process.env.AURORA_RPC_URL,
-    process.env.AURORA_PRIVATE_KEY,
-    'aurora',
-    process.env.AURORA_ETHERSCAN_KEY,
-);
+register('kovan', 42, process.env.KOVAN_RPC_URL, process.env.KOVAN_PRIVATE_KEY, 'kovan', process.env.KOVAN_ETHERSCAN_KEY);
+register('optimistic', 10, process.env.OPTIMISTIC_RPC_URL, process.env.OPTIMISTIC_PRIVATE_KEY, 'optimisticEthereum', process.env.OPTIMISTIC_ETHERSCAN_KEY);
+register('matic', 137, process.env.MATIC_RPC_URL, process.env.MATIC_PRIVATE_KEY, 'polygon', process.env.MATIC_ETHERSCAN_KEY);
+register('arbitrum', 42161, process.env.ARBITRUM_RPC_URL, process.env.ARBITRUM_PRIVATE_KEY, 'arbitrumOne', process.env.ARBITRUM_ETHERSCAN_KEY);
+register('xdai', 100, process.env.XDAI_RPC_URL, process.env.XDAI_PRIVATE_KEY, 'gnosis', process.env.XDAI_ETHERSCAN_KEY);
+register('avax', 43114, process.env.AVAX_RPC_URL, process.env.AVAX_PRIVATE_KEY, 'avalanche', process.env.AVAX_ETHERSCAN_KEY);
+register('fantom', 250, process.env.FANTOM_RPC_URL, process.env.FANTOM_PRIVATE_KEY, 'opera', process.env.FANTOM_ETHERSCAN_KEY);
+register('aurora', 1313161554, process.env.AURORA_RPC_URL, process.env.AURORA_PRIVATE_KEY, 'aurora', process.env.AURORA_ETHERSCAN_KEY);
+register('base', 8453, process.env.BASE_RPC_URL, process.env.BASE_PRIVATE_KEY, 'base', process.env.BASE_ETHERSCAN_KEY);
+registerCustom('klaytn', 8217, process.env.KLAYTN_RPC_URL, process.env.KLAYTN_PRIVATE_KEY, process.env.KLAYTN_ETHERSCAN_KEY, 'https://scope.klaytn.com/', 'https://scope.klaytn.com/');
 
 module.exports = {
     networks,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1inch/token-plugins",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "ERC20 extension enabling external smart contract based plugins to track balances of those users who opted-in to those plugins",
   "repository": {
     "type": "git",
@@ -13,8 +13,8 @@
   "author": "1inch",
   "license": "MIT",
   "dependencies": {
-    "@1inch/solidity-utils": "3.0.1",
-    "@openzeppelin/contracts": "4.9.2"
+    "@1inch/solidity-utils": "3.3.0",
+    "@openzeppelin/contracts": "5.0.0"
   },
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "2.0.1",

diff --git a/yarn.lock b/yarn.lock
@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@1inch/solidity-utils@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@1inch/solidity-utils/-/solidity-utils-3.0.1.tgz#afce60992fff724b09d570801ed0381ac31402cf"
-  integrity sha512-KbLhh1JgjBIJAq6B+AGOuyLNlEf5bRvoMZb509YMeec3s3iLbTrtI5D76b+HGKR98wU3HuRiDac/7j4ck2bjBQ==
+"@1inch/solidity-utils@3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@1inch/solidity-utils/-/solidity-utils-3.3.0.tgz#409dec87901f465ca7cd291df30155f50f5ab34a"
+  integrity sha512-mkS/Ej1wXO+Xa3ztVB5KKmKVwXCp5zrXcLiCEwkHyouOBauxYWp4/icj/wOBapIwVaju9ha5u1HlwbIlbl2gbQ==
   dependencies:
     "@metamask/eth-sig-util" "6.0.0"
     "@nomicfoundation/hardhat-ethers" "3.0.3"
     "@nomicfoundation/hardhat-network-helpers" "1.0.8"
-    "@openzeppelin/contracts" "4.9.2"
+    "@openzeppelin/contracts" "5.0.0"
     "@uniswap/permit2-sdk" "1.2.0"
     ethereumjs-util "7.1.5"
     ethers "6.6.3"
@@ -915,10 +915,10 @@
     find-up "^4.1.0"
     fs-extra "^8.1.0"
 
-"@openzeppelin/contracts@4.9.2":
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.2.tgz#1cb2d5e4d3360141a17dbc45094a8cad6aac16c1"
-  integrity sha512-mO+y6JaqXjWeMh9glYVzVu8HYPGknAAnWyxTRhGeckOruyXQMNnlcW6w/Dx9ftLeIQk6N+ZJFuVmTwF7lEIFrg==
+"@openzeppelin/contracts@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.0.tgz#ee0e4b4564f101a5c4ee398cd4d73c0bd92b289c"
+  integrity sha512-bv2sdS6LKqVVMLI5+zqnNrNU/CA+6z6CmwFXm/MzmOPBRSO5reEJN7z0Gbzvs0/bv/MZZXNklubpwy3v2+azsw==
 
 "@openzeppelin/[email protected]":
   version "0.5.16"