Skip to content

Commit

Permalink
Merge branch 'main' into ameten/prep-queue-alert
Browse files Browse the repository at this point in the history
  • Loading branch information
ameten committed Feb 13, 2025
2 parents e2e4810 + 21edc3a commit fb26af6
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 35 deletions.
18 changes: 10 additions & 8 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

# Check for potential secrets in staged files
echo "🔍 Checking for potential secrets in staged files..."
if git diff --cached --name-only | xargs gitleaks protect --staged --verbose --redact --config .gitleaks.toml; then
echo "✅ No secrets detected"
else
echo "❌ Potential secrets detected in your changes!"
echo "Please remove any secrets, credentials, or sensitive information before committing."
exit 1
# If not in GitHub Actions, check for potential secrets in staged files
if [ "$GITHUB_ACTIONS" != "true" ]; then
echo "🔍 Checking for potential secrets in staged files..."
if git diff --cached --name-only | xargs gitleaks protect --staged --verbose --redact --config .gitleaks.toml; then
echo "✅ No secrets detected"
else
echo "❌ Potential secrets detected in your changes!"
echo "Please remove any secrets, credentials, or sensitive information before committing."
exit 1
fi
fi

yarn lint-staged
Expand Down
2 changes: 1 addition & 1 deletion .registryrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
df5ba632a94891e5995eb51181cb87c1f8aebd94
26e513e8fe567428cb58e7634e0ed8c659430707
14 changes: 3 additions & 11 deletions rust/sealevel/environments/mainnet3/gas-oracle-configs.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,6 @@
"tokenDecimals": 9
},
"overhead": 600000
},
"treasure": {
"oracleConfig": {
"tokenExchangeRate": "21123257666268419",
"gasPrice": "1601935300783",
"tokenDecimals": 18
},
"overhead": 333774
}
},
"eclipsemainnet": {
Expand All @@ -141,7 +133,7 @@
"solanamainnet": {
"oracleConfig": {
"tokenExchangeRate": "115958288827584",
"gasPrice": "50977",
"gasPrice": "61172",
"tokenDecimals": 9
},
"overhead": 600000
Expand All @@ -159,7 +151,7 @@
"solanamainnet": {
"oracleConfig": {
"tokenExchangeRate": "115958288827584",
"gasPrice": "50977",
"gasPrice": "61172",
"tokenDecimals": 9
},
"overhead": 600000
Expand All @@ -169,7 +161,7 @@
"solanamainnet": {
"oracleConfig": {
"tokenExchangeRate": "1500000000000000",
"gasPrice": "50977",
"gasPrice": "61172",
"tokenDecimals": 9
},
"overhead": 600000
Expand Down
2 changes: 1 addition & 1 deletion typescript/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dependencies": {
"@aws-sdk/client-kms": "^3.577.0",
"@aws-sdk/client-s3": "^3.577.0",
"@hyperlane-xyz/registry": "9.4.0",
"@hyperlane-xyz/registry": "9.5.0",
"@hyperlane-xyz/sdk": "8.6.1",
"@hyperlane-xyz/utils": "8.6.1",
"@inquirer/core": "9.0.10",
Expand Down
2 changes: 1 addition & 1 deletion typescript/helloworld/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "8.6.1",
"dependencies": {
"@hyperlane-xyz/core": "5.11.3",
"@hyperlane-xyz/registry": "9.4.0",
"@hyperlane-xyz/registry": "9.5.0",
"@hyperlane-xyz/sdk": "8.6.1",
"@openzeppelin/contracts-upgradeable": "^4.9.3",
"ethers": "^5.7.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const ezEthSafes: Record<(typeof chainsToDeploy)[number], string> = {
taiko: '0x31FF35F84ADB120DbE089D190F03Ac74731Ae83F',
sei: '0xa30FF77d30Eb2d785f574344B4D11CAAe1949807',
swell: '0xf40b75fb85C3bEc70D75A1B45ef08FC48Db61115',
unichain: '0xa7eccdb9be08178f896c26b7bbd8c3d4e844d9ba',
unichain: '0x9D5FCF39FF17a67eB9CB4505f83920519EfEB01B',
berachain: '0xf013c8Be28421b050cca5bD95cc57Af49568e8be',
};

Expand Down
2 changes: 1 addition & 1 deletion typescript/infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@google-cloud/secret-manager": "^5.5.0",
"@hyperlane-xyz/cli": "8.6.1",
"@hyperlane-xyz/helloworld": "8.6.1",
"@hyperlane-xyz/registry": "9.4.0",
"@hyperlane-xyz/registry": "9.5.0",
"@hyperlane-xyz/sdk": "8.6.1",
"@hyperlane-xyz/utils": "8.6.1",
"@inquirer/prompts": "3.3.2",
Expand Down
2 changes: 1 addition & 1 deletion typescript/infra/src/config/gas-oracle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ function getMinUsdCost(local: ChainName, remote: ChainName): number {
// Nexus adjustment
neutron: 0.5,
// For Solana, special min cost
solanamainnet: 1,
solanamainnet: 1.2,
};
const override = remoteMinCostOverrides[remote];
if (override !== undefined) {
Expand Down
2 changes: 1 addition & 1 deletion typescript/infra/src/warp/helm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class WarpRouteMonitorHelmManager extends HelmManager {
return {
image: {
repository: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
tag: 'ba8e26d-20250207-165930',
tag: 'fb81b29-20250211-194801',
},
warpRouteId: this.warpRouteId,
fullnameOverride: this.helmReleaseName,
Expand Down
2 changes: 1 addition & 1 deletion typescript/widgets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@eslint/js": "^9.15.0",
"@hyperlane-xyz/registry": "9.4.0",
"@hyperlane-xyz/registry": "9.5.0",
"@storybook/addon-essentials": "^7.6.14",
"@storybook/addon-interactions": "^7.6.14",
"@storybook/addon-links": "^7.6.14",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7320,7 +7320,7 @@ __metadata:
"@eslint/js": "npm:^9.15.0"
"@ethersproject/abi": "npm:*"
"@ethersproject/providers": "npm:*"
"@hyperlane-xyz/registry": "npm:9.4.0"
"@hyperlane-xyz/registry": "npm:9.5.0"
"@hyperlane-xyz/sdk": "npm:8.6.1"
"@hyperlane-xyz/utils": "npm:8.6.1"
"@inquirer/core": "npm:9.0.10"
Expand Down Expand Up @@ -7425,7 +7425,7 @@ __metadata:
dependencies:
"@eslint/js": "npm:^9.15.0"
"@hyperlane-xyz/core": "npm:5.11.3"
"@hyperlane-xyz/registry": "npm:9.4.0"
"@hyperlane-xyz/registry": "npm:9.5.0"
"@hyperlane-xyz/sdk": "npm:8.6.1"
"@nomiclabs/hardhat-ethers": "npm:^2.2.3"
"@nomiclabs/hardhat-waffle": "npm:^2.0.6"
Expand Down Expand Up @@ -7477,7 +7477,7 @@ __metadata:
"@google-cloud/secret-manager": "npm:^5.5.0"
"@hyperlane-xyz/cli": "npm:8.6.1"
"@hyperlane-xyz/helloworld": "npm:8.6.1"
"@hyperlane-xyz/registry": "npm:9.4.0"
"@hyperlane-xyz/registry": "npm:9.5.0"
"@hyperlane-xyz/sdk": "npm:8.6.1"
"@hyperlane-xyz/utils": "npm:8.6.1"
"@inquirer/prompts": "npm:3.3.2"
Expand Down Expand Up @@ -7540,13 +7540,13 @@ __metadata:
languageName: unknown
linkType: soft

"@hyperlane-xyz/registry@npm:9.4.0":
version: 9.4.0
resolution: "@hyperlane-xyz/registry@npm:9.4.0"
"@hyperlane-xyz/registry@npm:9.5.0":
version: 9.5.0
resolution: "@hyperlane-xyz/registry@npm:9.5.0"
dependencies:
yaml: "npm:2.4.5"
zod: "npm:^3.21.2"
checksum: 10/13eb3ed671d70cc4b66a3546eb54b82e5606aed6c97cea82df54208415941026aab809ac434208a15b698d1b9fe88a828ce2e2b2d64239a6ca60d0dc2666c2fb
checksum: 10/a5dc2fcee12f4976a106b3da2b6756892171e27fb22a8c0e08e7fe03dac41c4421d9931a30f5854690737cfcd84e4631879f327c3368472ac385fffccb7c4468
languageName: node
linkType: hard

Expand Down Expand Up @@ -7645,7 +7645,7 @@ __metadata:
"@emotion/styled": "npm:^11.13.0"
"@eslint/js": "npm:^9.15.0"
"@headlessui/react": "npm:^2.1.8"
"@hyperlane-xyz/registry": "npm:9.4.0"
"@hyperlane-xyz/registry": "npm:9.5.0"
"@hyperlane-xyz/sdk": "npm:8.6.1"
"@hyperlane-xyz/utils": "npm:8.6.1"
"@interchain-ui/react": "npm:^1.23.28"
Expand Down

0 comments on commit fb26af6

Please sign in to comment.