[RFC][draft only] add billing token and config

.github/actions/build-chainlink-image/action.yml

@@ -11,10 +11,6 @@ inputs:
   git_commit_sha:
     description: The git commit sha to use for the image tag
     default: ${{ github.sha }}
-  GRAFANA_CLOUD_BASIC_AUTH:
-    description: "grafana cloud basic auth"
-  GRAFANA_CLOUD_HOST:
-    description: "grafana cloud hostname"
   AWS_REGION:
     description: "AWS region to use for ECR"
   AWS_ROLE_TO_ASSUME:

.github/actions/golangci-lint/action.yml

@@ -21,11 +21,13 @@ inputs:
   go-module-file:
     description: Set where the go module file is located at
     default: "go.sum"
-  # grafana cloud inputs
+  # grafana inputs
   gc-host:
-    description: "grafana cloud hostname"
+    description: "grafana hostname"
   gc-basic-auth:
-    description: "grafana cloud basic auth"
+    description: "grafana basic auth"
+  gc-org-id:
+    description: "grafana org id"
 
 runs:
   using: composite
@@ -64,9 +66,10 @@ runs:
         path: ${{ inputs.go-directory }}/golangci-lint-report.xml
     - name: Collect Metrics
       if: always()
-      uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
+      uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
       with:
         basic-auth: ${{ inputs.gc-basic-auth }}
         hostname: ${{ inputs.gc-host }}
+        org-id: ${{ inputs.gc-org-id }}
         this-job-name: ${{ inputs.name }}
       continue-on-error: true

.github/workflows/automation-nightly-tests.yml

@@ -38,8 +38,6 @@ jobs:
           tag_suffix: ""
           dockerfile: core/chainlink.Dockerfile
           git_commit_sha: ${{ github.sha }}
-          GRAFANA_CLOUD_BASIC_AUTH: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          GRAFANA_CLOUD_HOST: ${{ secrets.GRAFANA_CLOUD_HOST }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 

.github/workflows/ci-core.yml

@@ -26,8 +26,9 @@ jobs:
       - name: Golang Lint
         uses: ./.github/actions/golangci-lint
         with:
-          gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
       - name: Notify Slack
         if: ${{ failure() && (github.event_name == 'merge_group' || github.event.branch == 'develop')}}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0

.github/workflows/ci-scripts.yml

@@ -17,8 +17,9 @@ jobs:
           go-directory: core/scripts
           go-version-file: core/scripts/go.mod
           go-module-file: core/scripts/go.sum
-          gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
 
   test-scripts:
     if: ${{ github.event_name == 'pull_request' }}

.github/workflows/client-compatibility-tests.yml

@@ -42,8 +42,6 @@ jobs:
           tag_suffix: ""
           dockerfile: core/chainlink.Dockerfile
           git_commit_sha: ${{ github.sha }}
-          GRAFANA_CLOUD_BASIC_AUTH: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          GRAFANA_CLOUD_HOST: ${{ secrets.GRAFANA_CLOUD_HOST }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 

.github/workflows/helm-chart.yml

@@ -21,11 +21,12 @@ jobs:
           helm repo add tempo https://grafana.github.io/helm-charts
           helm repo add grafana https://grafana.github.io/helm-charts
       - name: ci-lint-helm-charts
-        uses: smartcontractkit/.github/actions/ci-lint-charts@9fd15fe8e698a5e28bfd06b3a91471c56568dcb3 # [email protected].1
+        uses: smartcontractkit/.github/actions/ci-lint-charts@6b08487b176ef7cad086526d0b54ddff6691c044 # [email protected].2
         with:
           # chart testing inputs
           chart-testing-extra-args: "--lint-conf=lintconf.yaml"
           # grafana inputs
           metrics-job-name: ci-lint-helm-charts
-          gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}

.github/workflows/integration-tests-publish.yml

@@ -93,7 +93,5 @@ jobs:
           tag_suffix: ${{ matrix.image.tag-suffix }}
           dockerfile: ${{ matrix.image.dockerfile }}
           git_commit_sha: ${{ github.sha }}
-          GRAFANA_CLOUD_BASIC_AUTH: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          GRAFANA_CLOUD_HOST: ${{ secrets.GRAFANA_CLOUD_HOST }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

.github/workflows/integration-tests.yml

@@ -160,8 +160,6 @@ jobs:
           tag_suffix: ${{ matrix.image.tag-suffix }}
           dockerfile: ${{ matrix.image.dockerfile }}
           git_commit_sha: ${{ github.sha }}
-          GRAFANA_CLOUD_BASIC_AUTH: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          GRAFANA_CLOUD_HOST: ${{ secrets.GRAFANA_CLOUD_HOST }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 
@@ -270,10 +268,11 @@ jobs:
       - name: Collect Metrics
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
+        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
         with:
-          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           this-job-name: ETH Smoke Tests ${{ matrix.product.name }}
           test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true

.github/workflows/live-testnet-tests.yml

@@ -86,8 +86,6 @@ jobs:
           tag_suffix: ""
           dockerfile: core/chainlink.Dockerfile
           git_commit_sha: ${{ github.sha }}
-          GRAFANA_CLOUD_BASIC_AUTH: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          GRAFANA_CLOUD_HOST: ${{ secrets.GRAFANA_CLOUD_HOST }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 

.github/workflows/operator-ui-ci.yml

@@ -15,10 +15,11 @@ jobs:
     steps:
       - name: Collect Metrics
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@v1
+        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
         with:
-          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           this-job-name: Breaking Changes GQL Check
         continue-on-error: true
 

.golangci.yml

@@ -13,6 +13,7 @@ linters:
     - unconvert
     - sqlclosecheck
     - noctx
+    - depguard
 linters-settings:
   exhaustive:
     default-signifies-exhaustive: true
@@ -78,6 +79,34 @@ linters-settings:
       # - name: confusing-results
       - name: bool-literal-in-expr
       - name: atomic
+  depguard:
+    rules:
+      main:
+        list-mode: lax
+        deny:
+          - pkg: cosmossdk.io/errors
+            desc: Use the standard library instead
+          - pkg: github.com/gofrs/uuid
+            desc: Use github.com/google/uuid instead
+          - pkg: github.com/satori/go.uuid
+            desc: Use github.com/google/uuid instead
+          - pkg: github.com/test-go/testify/assert
+            desc: Use github.com/stretchr/testify/assert instead
+          - pkg: github.com/test-go/testify/mock
+            desc: Use github.com/stretchr/testify/mock instead
+          - pkg: github.com/test-go/testify/require
+            desc: Use github.com/stretchr/testify/require instead
+# TODO https://smartcontract-it.atlassian.net/browse/BCI-2589
+#          - pkg: go.uber.org/multierr
+#            desc: Use the standard library instead, for example https://pkg.go.dev/errors#Join
+          - pkg: gopkg.in/guregu/null.v1
+            desc: Use gopkg.in/guregu/null.v4 instead
+          - pkg: gopkg.in/guregu/null.v2
+            desc: Use gopkg.in/guregu/null.v4 instead
+          - pkg: gopkg.in/guregu/null.v3
+            desc: Use gopkg.in/guregu/null.v4 instead
+          - pkg: https://github.com/go-gorm/gorm
+            desc: Use github.com/jmoiron/sqlx directly instead
 issues:
   exclude-rules:
     - path: test

contracts/scripts/generate-automation-master-interface-v2_3.ts

@@ -0,0 +1,50 @@
+/**
+ * @description this script generates a master interface for interacting with the automation registry
+ * @notice run this script with pnpm ts-node ./scripts/generate-automation-master-interface-v2_3.ts
+ */
+import { AutomationRegistry2_3__factory as Registry } from '../typechain/factories/AutomationRegistry2_3__factory'
+import { AutomationRegistryLogicA2_3__factory as RegistryLogicA } from '../typechain/factories/AutomationRegistryLogicA2_3__factory'
+import { AutomationRegistryLogicB2_3__factory as RegistryLogicB } from '../typechain/factories/AutomationRegistryLogicB2_3__factory'
+import { utils } from 'ethers'
+import fs from 'fs'
+import { exec } from 'child_process'
+
+const dest = 'src/v0.8/automation/dev/interfaces/v2_3'
+const srcDest = `${dest}/IAutomationRegistryMaster2_3.sol`
+const tmpDest = `${dest}/tmp.txt`
+
+const combinedABI = []
+const abiSet = new Set()
+const abis = [Registry.abi, RegistryLogicA.abi, RegistryLogicB.abi]
+
+for (const abi of abis) {
+  for (const entry of abi) {
+    const id = utils.id(JSON.stringify(entry))
+    if (!abiSet.has(id)) {
+      abiSet.add(id)
+      if (
+        entry.type === 'function' &&
+        (entry.name === 'checkUpkeep' ||
+          entry.name === 'checkCallback' ||
+          entry.name === 'simulatePerformUpkeep')
+      ) {
+        entry.stateMutability = 'view' // override stateMutability for check / callback / simulate functions
+      }
+      combinedABI.push(entry)
+    }
+  }
+}
+
+const checksum = utils.id(abis.join(''))
+
+fs.writeFileSync(`${tmpDest}`, JSON.stringify(combinedABI))
+
+const cmd = `
+cat ${tmpDest} | pnpm abi-to-sol --solidity-version ^0.8.4 --license MIT > ${srcDest} IAutomationRegistryMaster;
+echo "// abi-checksum: ${checksum}" | cat - ${srcDest} > ${tmpDest} && mv ${tmpDest} ${srcDest};
+pnpm prettier --write ${srcDest};
+`
+
+exec(cmd)
+
+console.log('generated new master interface for automation registry')

contracts/scripts/native_solc_compile_all_automation

@@ -96,4 +96,11 @@ compileContract automation/dev/chains/ArbitrumModule.sol
 compileContract automation/dev/chains/ChainModuleBase.sol
 compileContract automation/dev/chains/OptimismModule.sol
 compileContract automation/dev/chains/ScrollModule.sol
-compileContract automation/dev/interfaces/v2_2/IChainModule.sol
+
+compileContract automation/dev/interfaces/IChainModule.sol
+compileContract automation/dev/v2_3/AutomationRegistrar2_3.sol
+compileContract automation/dev/v2_3/AutomationRegistry2_3.sol
+compileContract automation/dev/v2_3/AutomationRegistryLogicA2_3.sol
+compileContract automation/dev/v2_3/AutomationRegistryLogicB2_3.sol
+compileContract automation/dev/v2_3/AutomationUtils2_3.sol
+compileContract automation/dev/interfaces/v2_3/IAutomationRegistryMaster2_3.sol

contracts/src/v0.8/automation/README.md

@@ -0,0 +1,40 @@
+# Automation Contract Structure
+
+The on-chain component of Chainlink automation is too large to fit into the [size requirements][size-limit-eip] of a single contract. It is also too large to fit into 2 contracts, a solution that works for most large projects. Therefore, we included this explanation of how the pieces fit together and various tradeoffs incurred.
+
+### Glossary
+
+**Master Contract** - also known as the “storage” contract. This is the contract whose state we care about. It is the entry-point into the chain of delegatecalls. (We avoid the term "proxy" because it is commonly associated with upgradability, and this system _is not upgradable_ even though it relies on some of the same mechanics.)
+
+**Logic Contract** - this a contract whose sole purpose is to hold code. We use the code at this address and execute it in the context of the master contract in order to increase our total capacity for on-chain code.
+
+### Overview
+
+We chain multiple logic contracts together using [fallback functions][fallback] and [delegatecall][delegatecall]. If a function definition is not found on one contract, we fall back to the next, always executing the function in the scope of the master contract. The actual implementation of this is based off of [OZ's Proxy contract][oz-proxy].
+
+### Diagram
+
+```mermaid
+graph LR
+  Master -- delegatecall --> la[Logic A]
+  la -- delegatecall --> lb[Logic B]
+  lb -. delegatecall .-> lx[Logic X]
+```
+
+### Special Considerations
+
+- functions on the master contract have the least gas overhead, therefore, our most price-sensitive functions live there
+- functions on the master contract have first-class support from tools like etherscan and tenderly - functions that we (or users) call often to debug should live there
+- etherscan supports executing logic contract functions that are once removed from the master - therefore we give secondary preference to the first logic contract for user and debugging functions
+- functions on logic A through logic X (as of writing) have no support on etherscan and will essentially be "invisible" to everyone but advanced users - we will try to reserve this space for uncommon interactions that are mostly done progamatically
+- We use Logic A, B, C... to avoid confusion with the version ex `AutomationRegistryLogicA2_1.sol` --> Logic Contract A verion 2.1
+- Storage locations for logic contract addresses MUST BE BYTECODE (this is done by marking them as "immutable") otherwise the chaining mechanism will break
+
+### Master Interface
+
+The Master Interface is a deduped combination of all the interfaces from all contracts in the chain. We generate this interface programatically using the script `generate-automation-master-interface.ts`. This process is not a hardened one. Users of this script should take great care to ensure it's efficacy.
+
+[size-limit-eip]: https://eips.ethereum.org/EIPS/eip-170
+[fallback]: https://docs.soliditylang.org/en/v0.8.12/contracts.html#fallback-function
+[delegatecall]: https://docs.soliditylang.org/en/v0.8.12/introduction-to-smart-contracts.html?highlight=delegatecall#delegatecall-callcode-and-libraries
+[oz-proxy]: https://docs.openzeppelin.com/contracts/4.x/api/proxy#Proxy

contracts/src/v0.8/automation/dev/chains/ChainModuleBase.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {IChainModule} from "../interfaces/v2_2/IChainModule.sol";
+import {IChainModule} from "../interfaces/IChainModule.sol";
 
 contract ChainModuleBase is IChainModule {
   uint256 private constant FIXED_GAS_OVERHEAD = 300;