Changed factory name from SKYBIT to SKYBITSolady; Updated address

Author: -

README.md

@@ -120,13 +120,13 @@ The original Vectorized/solady CREATE3 solidity file was obtained by firstly add
 
 Gas used for the deployment is around 247,752, so gas limit in this deployment transaction has been set to 350,000, giving some room in case some opcode costs increase in future, hence there should be at least 0.035 of native currency at the signer's address before factory deployment.
 
-The SKYBIT factory contract will be deployed to this address (if the EVM version is `shanghai` and transaction bytecode is unchanged):
+The SKYBITSolady factory contract will be deployed to this address (if the EVM version is `shanghai` and transaction bytecode is unchanged):
 ```
-0xdD4Be472a59a5272C6970D759565cf38d26d4010
+0x7008e1DEECA3E45E61b379BBA882134b3A15d9dF
 ```
 The derived address of the account that would sign the deployment transaction, and that you'd need to fund in order to pay the gas fee, is:
 ```
-0x5f9bc74b96054F8DC18832B6ef39943466430931
+0x6610a846957021103477DB54c18172cd80d953b7
 ```
 
 #### SKYBITLite

package.json

@@ -1,6 +1,6 @@
 {
   "name": "SKYBIT-Keyless-Deployment",
-  "version": "3.9.0",
+  "version": "4.0.0",
   "packageManager": "yarn@3.6.1",
   "devDependencies": {
     "@SKYBITDev3/ZeframLou-create3-factory": "https://github.com/SKYBITDev3/ZeframLou-create3-factory#3a8db987b8a6e1b63845a0ee1d0206cb4b5748f9",

scripts/CREATE3-deploy-functions.js

@@ -45,7 +45,7 @@ const getArtifactOfFactory = (factoryToUse) => {
     case `axelarnetwork`:
       savedArtifactFilePath = `artifacts-saved/@axelar-network/axelar-gmp-sdk-solidity/contracts/deploy/Create3Deployer.sol/Create3Deployer.json`
       break
-    case `SKYBIT`:
+    case `SKYBITSolady`:
       savedArtifactFilePath = `artifacts-saved/contracts/SKYBITCREATE3Factory.sol/SKYBITCREATE3Factory.json`
       break
     case `SKYBITLite`:
@@ -61,7 +61,7 @@ const getDeployedAddress = async (factoryToUse, instanceOfFactory, bytecode, wal
     case `axelarnetwork`:
       return await instanceOfFactory.deployedAddress(bytecode, wallet.address, salt)
       break
-    case `SKYBIT`:
+    case `SKYBITSolady`:
     case `ZeframLou`:
       return await instanceOfFactory.getDeployed(wallet.address, salt)
       break
@@ -83,7 +83,7 @@ const getGasEstimate = async (factoryToUse, instanceOfFactory, bytecode, wallet,
     case `axelarnetwork`:
       return await instanceOfFactory.deploy.estimateGas(bytecode, salt)
       break
-    case `SKYBIT`:
+    case `SKYBITSolady`:
     case `ZeframLou`:
       return await instanceOfFactory.deploy.estimateGas(salt, bytecode)
       break
@@ -104,7 +104,7 @@ const deploy = async (factoryToUse, instanceOfFactory, bytecode, wallet, salt, f
     case `axelarnetwork`:
       return await instanceOfFactory.deploy(bytecode, salt, { ...feeData })
       break
-    case `SKYBIT`:
+    case `SKYBITSolady`:
     case `ZeframLou`:
       return await instanceOfFactory.deploy(salt, bytecode, { ...feeData })
       break

scripts/deployKeylessly-Create3Factory.js

@@ -1,7 +1,7 @@
 // CHOOSE WHICH FACTORY YOU WANT TO USE:
 // const factoryToDeploy = `axelarnetwork`
 // const factoryToDeploy = `ZeframLou`
-// const factoryToDeploy = `SKYBIT`
+// const factoryToDeploy = `SKYBITSolady`
 const factoryToDeploy = `SKYBITLite`
 
 const isDeployEnabled = true // toggle in case you do deployment and verification separately.
@@ -44,7 +44,7 @@ const getCreate3FactoryArtifact = factory => {
     case `axelarnetwork`:
       compiledArtifactFilePath = `artifacts/@axelar-network/axelar-gmp-sdk-solidity/contracts/deploy/Create3Deployer.sol/Create3Deployer.json`
       break
-    case `SKYBIT`:
+    case `SKYBITSolady`:
       compiledArtifactFilePath = `artifacts/contracts/SKYBITCREATE3Factory.sol/SKYBITCREATE3Factory.json`
       break
     case `SKYBITLite`:
@@ -65,7 +65,7 @@ const getGasLimit = (factory) => {
     case `axelarnetwork`:
       return 900000n // Gas cost: 712665
       break
-    case `SKYBIT`:
+    case `SKYBITSolady`:
       return 350000n // Gas cost: 247752
       break
     case `SKYBITLite`:

scripts/deployViaCREATE3-TESTERC20.js

@@ -1,17 +1,10 @@
 const { ethers, network } = require(`hardhat`)
 
 // CHOOSE WHICH FACTORY YOU WANT TO USE:
-// const factoryToUse = `axelarnetwork`
-// const addressOfFactory = `0xf0d5258610A5eF4ac7b894DDaAD1c314De8d56a5` // gas cost: 2222365
-
-// const factoryToUse = `ZeframLou`
-// const addressOfFactory = `0x92B9db5453E03E516Fd461a1852E67EAF8Bc6dad` // gas cost: 2145541
-
-// const factoryToUse = `SKYBIT`
-// const addressOfFactory = `0xdD4Be472a59a5272C6970D759565cf38d26d4010` // gas cost: 2116813
-
-const factoryToUse = `SKYBITLite`
-const addressOfFactory = `0xb8462884791B873F68Bc5e2FD90E5BfEc8034D69` // gas cost: 2117420
+// const factoryToUse = { name: `axelarnetwork`, address: `0xf0d5258610A5eF4ac7b894DDaAD1c314De8d56a5` } // gas cost: 2222365
+// const factoryToUse = { name: `ZeframLou`, address: `0x92B9db5453E03E516Fd461a1852E67EAF8Bc6dad` } // gas cost: 2145541
+// const factoryToUse = { name: `SKYBITSolady`, address: `0x7008e1DEECA3E45E61b379BBA882134b3A15d9dF` } // gas cost: 2116813
+const factoryToUse = { name: `SKYBITLite`, address: `0xb8462884791B873F68Bc5e2FD90E5BfEc8034D69` } // gas cost: 2117420
 
 
 // PASS YOUR OWN STRING HERE TO GENERATE A UNIQUE SALT. After doing your first production deployment, don't change it in order to have same address on other blockchains.
@@ -40,7 +33,7 @@ async function main() {
   const cfToken = await ethers.getContractFactory(tokenContractName) // No need to use artifacts-saved for your contract because with CREATE3 deployment address isn't dependent on bytecode
 
   const { CREATE3Deploy } = rootRequire(`scripts/CREATE3-deploy-functions.js`)
-  const deployedContract = await CREATE3Deploy(factoryToUse, addressOfFactory, cfToken, tokenContractName, constructorArgs, salt, wallet)
+  const deployedContract = await CREATE3Deploy(factoryToUse.name, factoryToUse.address, cfToken, tokenContractName, constructorArgs, salt, wallet)
   if(deployedContract === undefined) return
 
   // Testing the deployed ERC20 contract. If your contract isn't ERC20 then you can call a function other than balanceOf.

scripts/deployViaCREATE3-TESTERC20UG.js

@@ -2,17 +2,10 @@
 const { ethers, network, upgrades } = require(`hardhat`)
 
 // CHOOSE WHICH FACTORY YOU WANT TO USE:
-// const factoryToUse = `axelarnetwork`
-// const addressOfFactory = `0xf0d5258610A5eF4ac7b894DDaAD1c314De8d56a5`
-
-// const factoryToUse = `ZeframLou`
-// const addressOfFactory = `0x92B9db5453E03E516Fd461a1852E67EAF8Bc6dad`
-
-// const factoryToUse = `SKYBIT`
-// const addressOfFactory = `0xdD4Be472a59a5272C6970D759565cf38d26d4010`
-
-const factoryToUse = `SKYBITLite`
-const addressOfFactory = `0xb8462884791B873F68Bc5e2FD90E5BfEc8034D69`
+// const factoryToUse = { name: `axelarnetwork`, address: `0xf0d5258610A5eF4ac7b894DDaAD1c314De8d56a5` } // gas cost: 2222365
+// const factoryToUse = { name: `ZeframLou`, address: `0x92B9db5453E03E516Fd461a1852E67EAF8Bc6dad` } // gas cost: 2145541
+// const factoryToUse = { name: `SKYBITSolady`, address: `0x7008e1DEECA3E45E61b379BBA882134b3A15d9dF` } // gas cost: 2116813
+const factoryToUse = { name: `SKYBITLite`, address: `0xb8462884791B873F68Bc5e2FD90E5BfEc8034D69` } // gas cost: 2117420
 
 const isDeployEnabled = true // toggle in case you do deployment and verification separately.
 
@@ -71,15 +64,15 @@ async function main() {
       const { getArtifactOfFactory, getDeployedAddress, CREATE3Deploy } = rootRequire(`scripts/CREATE3-deploy-functions.js`)
 
       if (isDeployEnabled) {
-        proxy = await CREATE3Deploy(factoryToUse, addressOfFactory, cfProxy, proxyContractName, proxyConstructorArgs, salt, wallet) // Gas cost: 425068
+        proxy = await CREATE3Deploy(factoryToUse.name, factoryToUse.address, cfProxy, proxyContractName, proxyConstructorArgs, salt, wallet) // Gas cost: 425068
         if (proxy === undefined) return
 
         proxyAddress = proxy.target
       } else {
-        const artifactOfFactory = getArtifactOfFactory(factoryToUse)
-        const instanceOfFactory = await ethers.getContractAt(artifactOfFactory.abi, addressOfFactory)
+        const artifactOfFactory = getArtifactOfFactory(factoryToUse.name)
+        const instanceOfFactory = await ethers.getContractAt(artifactOfFactory.abi, factoryToUse.address)
         const proxyBytecodeWithArgs = (await cfProxy.getDeployTransaction(...proxyConstructorArgs)).data
-        proxyAddress = await getDeployedAddress(factoryToUse, instanceOfFactory, proxyBytecodeWithArgs, wallet, salt)
+        proxyAddress = await getDeployedAddress(factoryToUse.name, instanceOfFactory, proxyBytecodeWithArgs, wallet, salt)
       }
     } else { // not using CREATE3
       const feeData = await ethers.provider.getFeeData()