prettier trailing comma in contracts v01

Bisonai · Jul 5, 2024 · b953f7c · b953f7c
1 parent 1bb6ba2
commit b953f7c
Show file tree

Hide file tree

Showing 93 changed files with 896 additions and 965 deletions.
diff --git a/contracts/v0.1/.eslintrc b/contracts/v0.1/.eslintrc
@@ -1,15 +1,9 @@
 {
   "root": true,
-  "extends": [
-    "prettier"
-  ],
-  "plugins": [
-    "prettier"
-  ],
+  "extends": ["prettier"],
+  "plugins": ["prettier"],
   "rules": {
-    "prettier/prettier": [
-      "error"
-    ]
+    "prettier/prettier": ["error"]
   },
   "parserOptions": {
     "sourceType": "module",

diff --git a/contracts/v0.1/.prettierrc b/contracts/v0.1/.prettierrc
@@ -2,7 +2,7 @@
   "useTabs": false,
   "tabWidth": 2,
   "singleQuote": true,
-  "trailingComma": "none",
+  "trailingComma": "all",
   "printWidth": 100,
   "semi": false,
   "overrides": [

diff --git a/contracts/v0.1/.solhint.json b/contracts/v0.1/.solhint.json
@@ -4,7 +4,7 @@
   "rules": {
     "avoid-throw": "off",
     "avoid-low-level-calls": "off",
-    "func-visibility": ["warn",{"ignoreConstructors": true}],
+    "func-visibility": ["warn", { "ignoreConstructors": true }],
     "avoid-suicide": "error",
     "avoid-sha3": "warn",
     "compiler-version": ["error", "^0.8.16"]

diff --git a/contracts/v0.1/deploy/Aggregator/Aggregator.cjs b/contracts/v0.1/deploy/Aggregator/Aggregator.cjs
@@ -7,7 +7,7 @@ const {
   validateAggregatorDeployConfig,
   validateAggregatorChangeOraclesConfig,
   validateAggregatorRedirectProxyConfig,
-  getFormattedDate
+  getFormattedDate,
 } = require('../../scripts/utils.cjs')
 
 const func = async function (hre) {
@@ -44,10 +44,10 @@ const func = async function (hre) {
           deployConfig.timeout,
           deployConfig.validator,
           deployConfig.decimals,
-          deployConfig.description
+          deployConfig.description,
         ],
         from: deployer,
-        log: true
+        log: true,
       })
       aggregator = await ethers.getContractAt('Aggregator', aggregatorDeployment.address)
       deployedContracts[`Aggregator_${deployConfig.name}`] = aggregatorDeployment.address
@@ -72,7 +72,7 @@ const func = async function (hre) {
           changeOraclesConfig.added,
           changeOraclesConfig.minSubmissionCount,
           changeOraclesConfig.maxSubmissionCount,
-          changeOraclesConfig.restartDelay
+          changeOraclesConfig.restartDelay,
         )
       ).wait()
     }
@@ -112,7 +112,7 @@ const func = async function (hre) {
         expect(confirmedAggregator).to.be.eq(proposedAggregator)
 
         console.log(
-          `Proxy Aggregator redirected from ${aggregatorAddress} to new ${confirmedAggregator}`
+          `Proxy Aggregator redirected from ${aggregatorAddress} to new ${confirmedAggregator}`,
         )
       } else if (redirectProxyConfig.status == 'revert') {
         // Revert back to old Aggregator Address
@@ -135,15 +135,15 @@ const func = async function (hre) {
         contract: 'AggregatorProxy',
         args: [aggregator.address],
         from: deployer,
-        log: true
+        log: true,
       })
 
       // DataFeedConsumerMock
       if (['localhost', 'hardhat'].includes(network.name)) {
         await localhostDeployment({
           deploy,
           aggregatorProxyDeployment,
-          name: deployConfig.name
+          name: deployConfig.name,
         })
       }
     }
@@ -164,7 +164,7 @@ async function localhostDeployment(args) {
     contract: 'DataFeedConsumerMock',
     args: [aggregatorProxyDeployment.address],
     from: consumer,
-    log: true
+    log: true,
   })
 }
 

diff --git a/contracts/v0.1/deploy/AggregatorRouter/AggregatorRouter.cjs b/contracts/v0.1/deploy/AggregatorRouter/AggregatorRouter.cjs
@@ -3,7 +3,7 @@ const {
   loadJson,
   loadMigration,
   updateMigration,
-  loadDeployments
+  loadDeployments,
 } = require('../../scripts/utils.cjs')
 
 const func = async function (hre) {
@@ -26,12 +26,12 @@ const func = async function (hre) {
       const aggregatorRouterDeployment = await deploy('AggregatorRouter', {
         args: [],
         from: deployer,
-        log: true
+        log: true,
       })
 
       aggregatorRouter = await ethers.getContractAt(
         'AggregatorRouter',
-        aggregatorRouterDeployment.address
+        aggregatorRouterDeployment.address,
       )
 
       console.log('AggregatorRouter:', aggregatorRouterDeployment)
@@ -50,7 +50,7 @@ const func = async function (hre) {
 
       if (updateProxiesConfig.updateAll) {
         const deployments = await loadDeployments(`./deployments/${network.name}`)
-        
+
         for (const key in deployments) {
           if (key.includes('AggregatorProxy')) {
             const feedName = key.split('_')[1]
@@ -66,7 +66,6 @@ const func = async function (hre) {
           feedNames.push(feedName)
           addresses.push(address)
         }
-
       }
       if (feedNames.length == 0 || addresses.length == 0) {
         throw new Error('no proxies to update')

diff --git a/contracts/v0.1/deploy/L1Endpoint/L1Endpoint.cjs b/contracts/v0.1/deploy/L1Endpoint/L1Endpoint.cjs
@@ -17,10 +17,10 @@ const func = async function (hre) {
         args: [
           deployConfig.registry,
           deployConfig.vrfCoordinator,
-          deployConfig.requestResponseCoordinator
+          deployConfig.requestResponseCoordinator,
         ],
         from: deployer,
-        log: true
+        log: true,
       })
 
       console.log('L1Endpoint:', l1Endpoint)

diff --git a/contracts/v0.1/deploy/L2Endpoint/L2Endpoint.cjs b/contracts/v0.1/deploy/L2Endpoint/L2Endpoint.cjs
@@ -15,7 +15,7 @@ const func = async function (hre) {
       const l2EndpointDeployment = await deploy('L2Endpoint', {
         args: [],
         from: deployer,
-        log: true
+        log: true,
       })
 
       console.log('l2EndpointDeployment:', l2EndpointDeployment)

diff --git a/contracts/v0.1/deploy/L2RequestResponseConsumerMock/L2RequestResponseConsumerMock.cjs b/contracts/v0.1/deploy/L2RequestResponseConsumerMock/L2RequestResponseConsumerMock.cjs
@@ -15,7 +15,7 @@ const func = async function (hre) {
       const l2RequestResponseConsumerMock = await deploy('L2RequestResponseConsumerMock', {
         args: [deployConfig.l2EndpointAddress],
         from: deployer,
-        log: true
+        log: true,
       })
 
       console.log('L2RequestResponseConsumerMock:', l2RequestResponseConsumerMock)

diff --git a/contracts/v0.1/deploy/L2VRFConsumerMock/L2VRFConsumer.cjs b/contracts/v0.1/deploy/L2VRFConsumerMock/L2VRFConsumer.cjs
@@ -16,7 +16,7 @@ const func = async function (hre) {
       const l2VRFConsumerMock = await deploy('L2VRFConsumerMock', {
         args: [deployConfig.l2EndpointAddress],
         from: deployer,
-        log: true
+        log: true,
       })
 
       console.log('L2VRFConsumerMock:', l2VRFConsumerMock)

diff --git a/contracts/v0.1/deploy/POR/POR.cjs b/contracts/v0.1/deploy/POR/POR.cjs
@@ -7,7 +7,7 @@ const {
   validateAggregatorDeployConfig,
   validateAggregatorChangeOraclesConfig,
   validateAggregatorRedirectProxyConfig,
-  getFormattedDate
+  getFormattedDate,
 } = require('../../scripts/utils.cjs')
 
 const func = async function (hre) {
@@ -41,10 +41,10 @@ const func = async function (hre) {
           deployConfig.timeout,
           deployConfig.validator,
           deployConfig.decimals,
-          deployConfig.description
+          deployConfig.description,
         ],
         from: deployer,
-        log: true
+        log: true,
       })
       aggregator = await ethers.getContractAt('Aggregator', aggregatorDeployment.address)
     }
@@ -68,7 +68,7 @@ const func = async function (hre) {
           changeOraclesConfig.added,
           changeOraclesConfig.minSubmissionCount,
           changeOraclesConfig.maxSubmissionCount,
-          changeOraclesConfig.restartDelay
+          changeOraclesConfig.restartDelay,
         )
       ).wait()
     }
@@ -108,7 +108,7 @@ const func = async function (hre) {
         expect(confirmedAggregator).to.be.eq(proposedAggregator)
 
         console.log(
-          `Proxy POR address redirected from ${aggregatorAddress} to new ${confirmedAggregator}`
+          `Proxy POR address redirected from ${aggregatorAddress} to new ${confirmedAggregator}`,
         )
       } else if (redirectProxyConfig.status == 'revert') {
         // Revert back to old POR contract address
@@ -120,7 +120,7 @@ const func = async function (hre) {
         expect(revertedAggregator).to.be.eq(aggregatorAddress)
 
         console.log(
-          `Proxy POR address reverted from ${proposedAggregator} to ${revertedAggregator}`
+          `Proxy POR address reverted from ${proposedAggregator} to ${revertedAggregator}`,
         )
       } else {
         console.log('Wrong proxyRedirect method')
@@ -133,15 +133,15 @@ const func = async function (hre) {
         contract: 'AggregatorProxy',
         args: [aggregator.address],
         from: deployer,
-        log: true
+        log: true,
       })
 
       // DataFeedConsumerMock
       if (['localhost', 'hardhat'].includes(network.name)) {
         await localhostDeployment({
           deploy,
           aggregatorProxyDeployment,
-          name: deployConfig.name
+          name: deployConfig.name,
         })
       }
     }
@@ -160,7 +160,7 @@ async function localhostDeployment(args) {
     contract: 'DataFeedConsumerMock',
     args: [aggregatorProxyDeployment.address],
     from: consumer,
-    log: true
+    log: true,
   })
 }
 

diff --git a/contracts/v0.1/deploy/Prepayment/Prepayment.cjs b/contracts/v0.1/deploy/Prepayment/Prepayment.cjs
@@ -3,7 +3,7 @@ const {
   loadJson,
   loadMigration,
   updateMigration,
-  validatePrepaymentDeployConfig
+  validatePrepaymentDeployConfig,
 } = require('../../scripts/utils.cjs')
 
 const func = async function (hre) {
@@ -31,7 +31,7 @@ const func = async function (hre) {
       const prepaymentDeployment = await deploy('Prepayment', {
         args: [deployConfig.protocolFeeRecipient],
         from: deployer,
-        log: true
+        log: true,
       })
     }
 

diff --git a/contracts/v0.1/deploy/Registry/Registry.cjs b/contracts/v0.1/deploy/Registry/Registry.cjs
@@ -6,7 +6,7 @@ const func = async function (hre) {
   const registryDeployment = await deploy('Registry', {
     args: [],
     from: deployer,
-    log: true
+    log: true,
   })
 
   console.log('registeryDeployment:', registryDeployment)

diff --git a/contracts/v0.1/deploy/RequestResponse/RequestResponseCoordinator.cjs b/contracts/v0.1/deploy/RequestResponse/RequestResponseCoordinator.cjs
@@ -4,7 +4,7 @@ const {
   loadMigration,
   updateMigration,
   validateCoordinatorDeployConfig,
-  validateSetConfig
+  validateSetConfig,
 } = require('../../scripts/utils.cjs')
 
 const func = async function (hre) {
@@ -37,20 +37,20 @@ const func = async function (hre) {
         contract: 'RequestResponseCoordinator',
         args: [prepayment.address],
         from: deployer,
-        log: true
+        log: true,
       })
 
       requestResponseCoordinator = await ethers.getContractAt(
         'RequestResponseCoordinator',
-        requestResponseDeployment.address
+        requestResponseDeployment.address,
       )
 
       // RequestResponseConsumerMock
       if (['localhost', 'hardhat'].includes(network.name)) {
         await localhostDeployment({
           deploy,
           requestResponseCoordinator,
-          prepayment
+          prepayment,
         })
       }
     }
@@ -59,7 +59,7 @@ const func = async function (hre) {
       ? requestResponseCoordinator
       : await ethers.getContractAt(
           'RequestResponseCoordinator',
-          config.requestResponseCoordinatorAddress
+          config.requestResponseCoordinatorAddress,
         )
 
     // Register Oracle //////////////////////////////////////////////////////////
@@ -94,7 +94,7 @@ const func = async function (hre) {
         await requestResponseCoordinator.setConfig(
           setConfig.maxGasLimit,
           setConfig.gasAfterPaymentCalculation,
-          setConfig.feeConfig
+          setConfig.feeConfig,
         )
       ).wait()
     }
@@ -114,7 +114,7 @@ const func = async function (hre) {
       const prepaymentDeployerSigner = await ethers.getContractAt(
         'Prepayment',
         prepayment.address,
-        deployer
+        deployer,
       )
       await (
         await prepaymentDeployerSigner.addCoordinator(requestResponseCoordinatorAddress)
@@ -133,13 +133,13 @@ async function localhostDeployment(args) {
     contract: 'RequestResponseConsumerMock',
     args: [requestResponseCoordinator.address],
     from: consumer,
-    log: true
+    log: true,
   })
 
   const prepaymentConsumerSigner = await ethers.getContractAt(
     'Prepayment',
     prepayment.address,
-    consumer
+    consumer,
   )
 
   // Create account