Skip to content

Commit

Permalink
Merge branch 'master' into pputman/add-dependency-review-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
pputman-clabs authored Dec 10, 2024
2 parents f4bdcc4 + faca88f commit 378f207
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/celo-monorepo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
Expand Down Expand Up @@ -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 ,<path>)
separator: ','
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ,<path>)
separator: ','
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/protocol-devchain-anvil.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion packages/celotool/src/e2e-tests/slashing_tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion packages/celotool/src/lib/testnet-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/common/FeeHandler.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/governance/Governance.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/governance/ReleaseGold.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 378f207

Please sign in to comment.