From 2d36c63d61bc3bfd68ee6d377f0fe0509706cddf Mon Sep 17 00:00:00 2001 From: curlwget Date: Mon, 23 Sep 2024 19:14:59 +0800 Subject: [PATCH 1/2] chore: remove repetitive words (#11194) Signed-off-by: curlwget --- packages/celotool/src/e2e-tests/slashing_tests.ts | 2 +- packages/celotool/src/lib/testnet-utils.ts | 2 +- packages/protocol/README.md | 2 +- packages/protocol/contracts/common/FeeHandler.sol | 2 +- packages/protocol/contracts/governance/Governance.sol | 2 +- packages/protocol/contracts/governance/ReleaseGold.sol | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/celotool/src/e2e-tests/slashing_tests.ts b/packages/celotool/src/e2e-tests/slashing_tests.ts index ee027c05341..2c28ae1d522 100644 --- a/packages/celotool/src/e2e-tests/slashing_tests.ts +++ b/packages/celotool/src/e2e-tests/slashing_tests.ts @@ -162,7 +162,7 @@ describe('slashing tests', function (this: any) { ], } - // Do a shallow copy so that the instance objects are the the same (even after the init step fills private keys, etc.) + // Do a shallow copy so that the instance objects are the same (even after the init step fills private keys, etc.) const gethConfigDown = _.clone(gethConfig) // Exclude the last validator to simulate it being down gethConfigDown.instances = gethConfig.instances.slice(0, gethConfig.instances.length - 1) diff --git a/packages/celotool/src/lib/testnet-utils.ts b/packages/celotool/src/lib/testnet-utils.ts index ae1b838f853..74bd7e36f15 100644 --- a/packages/celotool/src/lib/testnet-utils.ts +++ b/packages/celotool/src/lib/testnet-utils.ts @@ -92,7 +92,7 @@ export async function uploadEnvFileToGoogleStorage(networkName: string) { const metaData = `# .env file for network "${networkName}"\n` + `# Last modified by "${userInfo}"\n` + - `# Last modified on on ${Date()}\n` + + `# Last modified on ${Date()}\n` + `# Base commit: "https://github.com/${repo}/commit/${commitHash}"\n` const fullData = metaData + '\n' + envFileData await uploadDataToGoogleStorage( diff --git a/packages/protocol/README.md b/packages/protocol/README.md index ce103a070fb..8c96371c8a8 100644 --- a/packages/protocol/README.md +++ b/packages/protocol/README.md @@ -8,7 +8,7 @@ The contents of this package are licensed under the terms of the GNU Lesser Publ ### Initial deployment -See the the [testnet helm chart README](../helm-charts/testnet/README.md) for how to expose the RPC endpoint. +See the [testnet helm chart README](../helm-charts/testnet/README.md) for how to expose the RPC endpoint. Then, to deploy contracts to a network run: diff --git a/packages/protocol/contracts/common/FeeHandler.sol b/packages/protocol/contracts/common/FeeHandler.sol index 57f69d1c5bf..b872bb39b8f 100644 --- a/packages/protocol/contracts/common/FeeHandler.sol +++ b/packages/protocol/contracts/common/FeeHandler.sol @@ -231,7 +231,7 @@ contract FeeHandler is } /** - @dev Distributes the the token for to the feeBeneficiary. + @dev Distributes the token for to the feeBeneficiary. */ function handle(address tokenAddress) external { return _handle(tokenAddress); diff --git a/packages/protocol/contracts/governance/Governance.sol b/packages/protocol/contracts/governance/Governance.sol index 7d3a50e81e8..26f37927947 100644 --- a/packages/protocol/contracts/governance/Governance.sol +++ b/packages/protocol/contracts/governance/Governance.sol @@ -975,7 +975,7 @@ contract Governance is /** * @notice Updates the number of proposals to dequeue at a time. - * @param _concurrentProposals The number of proposals to dequeue at at a time. + * @param _concurrentProposals The number of proposals to dequeue at a time. */ function setConcurrentProposals(uint256 _concurrentProposals) public onlyOwner { require(_concurrentProposals != 0, "Number of proposals must be larger than zero"); diff --git a/packages/protocol/contracts/governance/ReleaseGold.sol b/packages/protocol/contracts/governance/ReleaseGold.sol index 469e93274b3..680ae2395d4 100644 --- a/packages/protocol/contracts/governance/ReleaseGold.sol +++ b/packages/protocol/contracts/governance/ReleaseGold.sol @@ -587,7 +587,7 @@ contract ReleaseGold is UsingRegistry, ReentrancyGuard, IReleaseGold, Initializa } /** - * @notice A wrapper setter function for the for the data encryption key + * @notice A wrapper setter function for the data encryption key * and version of an account. * @param dataEncryptionKey Secp256k1 public key for data encryption. * Preferably compressed. From faca88f6a48cc7c8e6104393e49ddf7c2d7d20e3 Mon Sep 17 00:00:00 2001 From: pputman-clabs <99900942+pputman-clabs@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:03:10 -0500 Subject: [PATCH 2/2] Pputman/pin dependencies (#11221) * adding permissions to protocol-devchain-anvil.yml workflow * pinning 3rd party actions for security purposes --------- Co-authored-by: pputman12 --- .github/workflows/celo-monorepo.yml | 10 +++++----- .github/workflows/containers.yaml | 2 +- .github/workflows/protocol-devchain-anvil.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/celo-monorepo.yml b/.github/workflows/celo-monorepo.yml index cb9ca18efdb..42be3f77241 100644 --- a/.github/workflows/celo-monorepo.yml +++ b/.github/workflows/celo-monorepo.yml @@ -99,7 +99,7 @@ jobs: # Get workdir local changes and fail if there are any change - name: Verify Changed files id: verify-changed-files - uses: tj-actions/verify-changed-files@v20 + uses: tj-actions/verify-changed-files@6ed7632824d235029086612d4330d659005af687 with: fail-if-changed: 'true' fail-message: 'Files changed during build. Please build locally and commit the changes.' @@ -130,7 +130,7 @@ jobs: code-${{ github.sha }} - name: Detect files changed in PR (or commit), and expose as output id: changed-files - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@48d8f15b2aaa3d255ca5af3eba4870f807ce6b3c with: # Using comma as separator to be able to easily match full paths (using ,) separator: ',' @@ -175,7 +175,7 @@ jobs: with: artifacts_to_cache: ${{ needs.install-dependencies.outputs.artifacts_to_cache }} - name: Download protocol devchain artifact - uses: dawidd6/action-download-artifact@v6 + uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 with: workflow: protocol-devchain.yml name: devchain-${{ env.RELEASE_TAG }} @@ -235,7 +235,7 @@ jobs: rebuild-package: 'true' artifacts_to_cache: ${{ needs.install-dependencies.outputs.artifacts_to_cache }} - name: Execute matrix command for test - uses: nick-fields/retry@v3 + uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e with: timeout_minutes: 40 max_attempts: 3 @@ -320,7 +320,7 @@ jobs: with: artifacts_to_cache: ${{ needs.install-dependencies.outputs.artifacts_to_cache }} - name: Execute matrix command for test - uses: nick-fields/retry@v3 + uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e with: timeout_minutes: 30 max_attempts: 3 diff --git a/.github/workflows/containers.yaml b/.github/workflows/containers.yaml index 856340303de..b92c66f162d 100644 --- a/.github/workflows/containers.yaml +++ b/.github/workflows/containers.yaml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - name: Detect files changed in PR (or commit), and expose as output id: changed-files - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@48d8f15b2aaa3d255ca5af3eba4870f807ce6b3c with: # Using comma as separator to be able to easily match full paths (using ,) separator: ',' diff --git a/.github/workflows/protocol-devchain-anvil.yml b/.github/workflows/protocol-devchain-anvil.yml index e0344af0877..31001d8c110 100644 --- a/.github/workflows/protocol-devchain-anvil.yml +++ b/.github/workflows/protocol-devchain-anvil.yml @@ -96,7 +96,7 @@ jobs: echo "Pull Request Number: ${{ env.PR_NUMBER }}" - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 + uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 with: version: ${{ env.SUPPORTED_FOUNDRY_VERSION }}