fixed issues

Author: Sunnesoft

Makefile

@@ -12,8 +12,8 @@ module.exports = {
     8217: '0xa38038f9Ac2b3A7b4247804A46C787960E160Aed', // Klaytn (not safe)
     8453: '0xa4659995DC39d891C1bA9131Aaf5F000E5B57224', // Base
     59144: '0x9cCf4d6B76976Ab11CF9f9219A38BA28983A9a27', // Linea
-    146: '0x56E44874F624EbDE6efCc783eFD685f0FBDC6dcF', // Sonic (not safe)
-    130: '0x56E44874F624EbDE6efCc783eFD685f0FBDC6dcF', // Unichain (not safe)
+    146: '0x385004992b43F1A73c6Cb2F7D2B88B79a3c0120f', // Sonic
+    130: '0xc985620F2F18a6560ca68F1f85107674735CF8e7', // Unichain
     324: '0x5cEf041D1C3198Ce7F9D5E0521867e670da7520e', // zksync
 };
 

deploy/constants/fee-collector-factory-owner.js

@@ -12,6 +12,8 @@ module.exports = {
     8453: '0xa4659995DC39d891C1bA9131Aaf5F000E5B57224', // Base
     59144: '0x9cCf4d6B76976Ab11CF9f9219A38BA28983A9a27', // Linea
     324: '0x5cEf041D1C3198Ce7F9D5E0521867e670da7520e', // zksync
+    146: '0x385004992b43F1A73c6Cb2F7D2B88B79a3c0120f', // Sonic
+    130: '0xc985620F2F18a6560ca68F1f85107674735CF8e7', // Unichain
     31337: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
 };
 

deploy/constants/fee-collector-owner.js

@@ -8,26 +8,38 @@ module.exports = async ({ config }) => {
     console.log('network id ', chainId);
     console.log('deployOpts', config.deployOpts);
 
-    const feeCollectorOperatorName = config.deployOpts?.feeCollectorOperatorName;
+    if (!constants.FEE_COLLECTOR_FACTORY[chainId]) {
+        console.log(`Skipping deployment on chain ${chainId} as no FeeCollectorFactory is set`);
+        return;
+    }
 
-    const salt = ethers.keccak256(ethers.toUtf8Bytes(feeCollectorOperatorName)); // Use correct salt, for instance: from `deploy/upgrade-fee-collector.js`
+    for (const feeCollectorOperatorName of config.deployOpts.feeCollectorOperatorNames) {
+        console.log('Deploying FeeCollector for operator name:', feeCollectorOperatorName);
 
-    const feeCollectorFactory = await ethers.getContractAt('FeeCollectorFactory', constants.FEE_COLLECTOR_FACTORY[chainId]);
-    await feeCollectorFactory.deployFeeCollector(salt);
-    const feeCollectorAddress = await feeCollectorFactory.getFeeCollectorAddress(salt);
-    console.log('FeeCollector deployed at', feeCollectorAddress);
+        if (!constants.FEE_COLLECTOR_OPERATOR?.[chainId]?.[feeCollectorOperatorName]) {
+            console.log(`Skipping deployment on chain ${chainId} as no operator is set for name ${feeCollectorOperatorName}`);
+            continue;
+        }
 
-    if (await getChainId() !== '31337') {
-        await hre.run('verify:verify', {
-            address: feeCollectorAddress,
-            constructorArguments: [constants.FEE_COLLECTOR_FACTORY[chainId], '0x'],
-        });
-    }
+        const salt = ethers.keccak256(ethers.toUtf8Bytes(feeCollectorOperatorName)); // Use correct salt, for instance: from `deploy/upgrade-fee-collector.js`
+
+        const feeCollectorFactory = await ethers.getContractAt('FeeCollectorFactory', constants.FEE_COLLECTOR_FACTORY[chainId]);
+        await feeCollectorFactory.deployFeeCollector(salt);
+        const feeCollectorAddress = await feeCollectorFactory.getFeeCollectorAddress(salt);
+        console.log('FeeCollector deployed at', feeCollectorAddress);
 
-    const OPERATOR = constants.FEE_COLLECTOR_OPERATOR[chainId][feeCollectorOperatorName]; // Replace with the actual operator address
-    const feeCollector = await ethers.getContractAt('FeeCollector', feeCollectorAddress);
-    await feeCollector.setOperator(OPERATOR);
-    console.log('feeCollectorOperator set to', feeCollectorAddress);
+        if (chainId !== '31337') {
+            await hre.run('verify:verify', {
+                address: feeCollectorAddress,
+                constructorArguments: [constants.FEE_COLLECTOR_FACTORY[chainId], '0x'],
+            });
+        }
+
+        const OPERATOR = constants.FEE_COLLECTOR_OPERATOR[chainId][feeCollectorOperatorName]; // Replace with the actual operator address
+        const feeCollector = await ethers.getContractAt('FeeCollector', feeCollectorAddress);
+        await feeCollector.setOperator(OPERATOR);
+        console.log('feeCollectorOperator set to', feeCollectorAddress);
+    }
 };
 
 module.exports.skip = async () => true;

deploy/deploy-create3.js

@@ -1,24 +1,66 @@
 const { getChainId } = require('hardhat');
-const { deployAndGetContract } = require('@1inch/solidity-utils');
+const { deployAndGetContract, deployAndGetContractWithCreate3 } = require('@1inch/solidity-utils');
 
 const constants = require('./constants');
 
 module.exports = async ({ deployments, getNamedAccounts, config }) => {
+    const networkName = hre.network.name;
     console.log('running deploy script');
-
     const chainId = await getChainId();
     console.log('network id ', chainId);
-    console.log('deployOpts', config.deployOpts);
-    
-    const CONTRACT_HELPER_NAME = config.deployOpts?.contractHelperName;
-
-    const { deployer } = await getNamedAccounts();
-    await deployAndGetContract({
-        contractName: CONTRACT_HELPER_NAME,
-        deployments,
-        deployer,
-        constructorArgs: constants.CONSTRUCTOR_ARGS?.[CONTRACT_HELPER_NAME]?.[chainId] ?? [],
-    });
+
+    if (
+        networkName in hre.config.networks &&
+        chainId !== hre.config.networks[networkName].chainId.toString()
+    ) {
+        console.log(`network chain id: ${hre.config.networks[networkName].chainId}, your chain id ${chainId}`);
+        console.log('skipping wrong chain id deployment');
+        return;
+    }
+
+    let DEPLOYMENT_METHOD = config.deployOpts?.deploymentMethod || 'create3';
+
+    if (chainId === '324') { // create3 is not supported for zksync
+        DEPLOYMENT_METHOD = 'create';
+    }
+
+    for (const contractHelperName of config.deployOpts.contractHelperNames) {
+        console.log('Deploying contract helper for name:', contractHelperName);
+
+        let result;
+
+        if (DEPLOYMENT_METHOD === 'create3') {
+            let salt = ethers.keccak256(ethers.toUtf8Bytes(contractHelperName));
+            if (contractHelperName === 'EvmHelpers') {
+                salt = ethers.keccak256(ethers.toUtf8Bytes('EvmHelpers-new'));
+            }
+            if (!constants.CREATE3_DEPLOYER?.[chainId]) {
+                console.log(`Skipping deployment on chain ${chainId} as no Create3Deployer is set`);
+                continue;
+            }
+
+            result = await deployAndGetContractWithCreate3({
+                contractName: contractHelperName,
+                constructorArgs: constants.CONSTRUCTOR_ARGS?.[contractHelperName]?.[chainId] ?? [],
+                deploymentName: contractHelperName,
+                create3Deployer: constants.CREATE3_DEPLOYER[chainId],
+                salt,
+                deployments,
+            });
+        } else {
+            const { deployer } = await getNamedAccounts();
+
+            result = await deployAndGetContract({
+                contractName: contractHelperName,
+                deployments,
+                deployer,
+                constructorArgs: constants.CONSTRUCTOR_ARGS?.[contractHelperName]?.[chainId] ?? [],
+            });
+        }
+
+        console.log(`Address for ${contractHelperName}: ${await result.getAddress()}`);
+
+    }
 };
 
 module.exports.skip = async () => true;

deploy/deploy-new-fee-collector.js

@@ -53,7 +53,8 @@ module.exports = {
         settings: {},
     },
     deployOpts: {
-        contractHelperName: process.env.CONTRACT_HELPER_NAME || '',
-        feeCollectorOperatorName: process.env.FEE_COLLECTOR_OPERATOR_NAME || '',
+        contractHelperNames: process.env.OPS_EVM_HELPER_NAMES || [],
+        feeCollectorOperatorNames: process.env.OPS_FEE_COLLECTOR_OPERATOR_NAMES || [],
+        deploymentMethod: process.env.OPS_DEPLOYMENT_METHOD || 'create3',
     },
 };