Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Sepolia testnet in monitoring #754

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Add support for Sepolia testnet in monitoring #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d17a581
Add support for Sepolia testnet in monitoring
lukasz-zimnoch Nov 22, 2023
c179e76
Merge remote-tracking branch 'origin/main' into monitoring-sepolia
michalinacienciala Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/monitoring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
type: choice
options:
- local # Just a bare Docker build without push
- goerli # Pushes Docker image to keep-test cluster
- sepolia # Pushes Docker image to keep-test cluster
- mainnet # Pushes Docker image to keep-prd cluster

jobs:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
if: ${{ github.event.inputs.environment != 'local' }}
uses: docker/login-action@v1
env:
CLUSTER_MAPPING: '{"goerli": "KEEP_TEST", "mainnet": "KEEP_PRD"}'
CLUSTER_MAPPING: '{"sepolia": "KEEP_TEST", "mainnet": "KEEP_PRD"}'
with:
registry: ${{ env.GCR_REGISTRY_URL }}
username: _json_key
Expand Down
6 changes: 3 additions & 3 deletions monitoring/docs/monitoring-and-telemetry.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,22 +277,22 @@ that collects telemetry from the production (mainnet) Threshold dashboard as
well as from production previews

** https://keep-ko.sentry.io/projects/test-threshold-dashboard/?project=4504564892827648[test-threshold-dashboard]
that collects telemetry from the test (Goerli) Threshold dashboard as well as
that collects telemetry from the test (Sepolia) Threshold dashboard as well as
from test previews

** https://keep-ko.sentry.io/projects/prod-tbtc-v2-minters-guardians/?project=4504690017042432[prod-tbtc-v2-minters-guardians]
that collects telemetry from production (mainnet) TBTCv2 minters and guardians instances

** https://keep-ko.sentry.io/projects/test-tbtc-v2-minters-guardians/?project=4504576597032960[test-tbtc-v2-minters-guardians]
that collects telemetry from test (Goerli) TBTCv2 minters and guardians instances
that collects telemetry from test (Sepolia) TBTCv2 minters and guardians instances

** https://keep-ko.sentry.io/projects/prod-tbtc-v2-monitoring/?project=4504684945342464[prod-tbtc-v2-monitoring]
that collects alerts (i.e. warning/critical system events) from the production
(mainnet) TBTCv2 monitoring instance

** https://keep-ko.sentry.io/projects/test-tbtc-v2-monitoring/?project=4504672363806720[test-tbtc-v2-monitoring]
that collects alerts (i.e. warning/critical system events) from the test
(Goerli) TBTCv2 monitoring instance
(Sepolia) TBTCv2 monitoring instance

=== Alerts

Expand Down
4 changes: 2 additions & 2 deletions monitoring/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
},
"dependencies": {
"@keep-network/tbtc-v2-mainnet": "npm:@keep-network/tbtc-v2@mainnet",
"@keep-network/tbtc-v2-testnet": "npm:@keep-network/tbtc-v2@goerli",
"@keep-network/tbtc-v2.ts": "development",
"@keep-network/tbtc-v2-testnet": "npm:@keep-network/tbtc-v2@sepolia",
"@keep-network/tbtc-v2.ts": "1.4.0-dev.1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this particular package?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't leave development as it will fetch an incompatible 2.4.0-dev.X version. I changed to 1.4.0-dev.1 as this is the version used in yarn.lock and we are sure it is compatible.

"@sentry/node": "^7.33.0",
"axios": "^1.3.2",
"ethers": "^5.5.2",
Expand Down
2 changes: 1 addition & 1 deletion monitoring/src/block-explorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { BitcoinTransactionHash, Hex } from "@keep-network/tbtc-v2.ts"

const ethTxUrlPrefixMapping = {
[Environment.Mainnet]: "https://etherscan.io/tx",
[Environment.Testnet]: "https://goerli.etherscan.io/tx",
[Environment.Testnet]: "https://sepolia.etherscan.io/tx",
}

export function createEthTxUrl(txHash: Hex) {
Expand Down
90 changes: 45 additions & 45 deletions monitoring/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,16 +569,16 @@
"@openzeppelin/contracts-upgradeable" "^4.6.0"
"@threshold-network/solidity-contracts" "1.3.0-dev.6"

"@keep-network/[email protected]goerli.4":
version "2.1.0-goerli.4"
resolved "https://registry.yarnpkg.com/@keep-network/ecdsa/-/ecdsa-2.1.0-goerli.4.tgz#9ff035b2a1dd000dfdab8617ab3da5c41e7ec6da"
integrity sha512-JsBrLeJyC8Lob6MYDsqG5hyYTXWYYARGmiP0kFRT+9B/tDr3HeWGOkCU0uAdMn4dlmu1IPyR5nBbl+9Atyoa1w==
"@keep-network/[email protected]sepolia.1":
version "2.1.0-sepolia.1"
resolved "https://registry.yarnpkg.com/@keep-network/ecdsa/-/ecdsa-2.1.0-sepolia.1.tgz#6e985148ade6415013e5d8cbca167d029c7b0c2c"
integrity sha512-WWG8Y1NW3nh30AShvFtVT+qijLUYuQNfWDox28DAv5KrgX9Od3a/l1HkRWA3qHEdakHqZ/ZDdR5/bGliT11PwQ==
dependencies:
"@keep-network/random-beacon" "2.1.0-goerli.6"
"@keep-network/random-beacon" "2.1.0-sepolia.1"
"@keep-network/sortition-pools" "github:keep-network/sortition-pools#test-fork"
"@openzeppelin/contracts" "^4.6.0"
"@openzeppelin/contracts-upgradeable" "^4.6.0"
"@threshold-network/solidity-contracts" "1.3.0-goerli.0"
"@threshold-network/solidity-contracts" "1.3.0-sepolia.0"

"@keep-network/[email protected]":
version "1.3.0"
Expand All @@ -597,18 +597,18 @@
"@openzeppelin/upgrades" "^2.7.2"
openzeppelin-solidity "2.4.0"

"@keep-network/[email protected].0-ropsten.16":
version "1.8.0-ropsten.16"
resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.0-ropsten.16.tgz#56a1c66124e30a31f2db45869462bffee2c571df"
integrity sha512-6AGSb95sTGB/qwbxgko1+IzK+gbh6u0+IbynikZ1MFm3zQ6XNAe8oZiojP/O5Kxu5+tbw68a77rKB5aLnmJMYQ==
"@keep-network/[email protected].1-goerli.0":
version "1.8.1-goerli.0"
resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.1-goerli.0.tgz#238485aab51902021d42357bf59695225002f0ab"
integrity sha512-h3La/RqbyEZjBBPg8V+pcRFo3UpWZUF4CxWfXHZnUR4PnkZKnIDrTNFQPhpV2uYFZwrbJxTR9mzOq/DOAiXPwA==
dependencies:
"@openzeppelin/upgrades" "^2.7.2"
openzeppelin-solidity "2.4.0"

"@keep-network/[email protected]goerli.0", "@keep-network/keep-core@^1.8.1-goerli.0":
version "1.8.1-goerli.0"
resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.1-goerli.0.tgz#238485aab51902021d42357bf59695225002f0ab"
integrity sha512-h3La/RqbyEZjBBPg8V+pcRFo3UpWZUF4CxWfXHZnUR4PnkZKnIDrTNFQPhpV2uYFZwrbJxTR9mzOq/DOAiXPwA==
"@keep-network/[email protected]sepolia.0":
version "1.8.1-sepolia.0"
resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.1-sepolia.0.tgz#62fc477ea0f5c0a44f67eefbdc1219fbe261b4c3"
integrity sha512-dHdZQR/PWO7Cw8M/GawmsJ5mhaiBOTdd4cUb1DF9fEjUY/4AVrd2F7c39CkrqGCF598ve46hhQWoRLLgtiAv2A==
dependencies:
"@openzeppelin/upgrades" "^2.7.2"
openzeppelin-solidity "2.4.0"
Expand All @@ -631,12 +631,12 @@
"@openzeppelin/upgrades" "^2.7.2"
openzeppelin-solidity "2.3.0"

"@keep-network/keep-ecdsa@1.8.0-ropsten.1":
version "1.8.0-ropsten.1"
resolved "https://registry.yarnpkg.com/@keep-network/keep-ecdsa/-/keep-ecdsa-1.8.0-ropsten.1.tgz#e8b0232a3383ede5f1789f8bd14fd5ce682bfdf1"
integrity sha512-KXItqehvCV5waZ6TZ1lvBoWWwFBgNTSnoC2/w0sXmn0RE8gPHr6qCKiL20MJtDUw7ys3gW0rHvd+POd8T/f9Sw==
"@keep-network/keep-ecdsa@1.9.0-sepolia.0":
version "1.9.0-sepolia.0"
resolved "https://registry.yarnpkg.com/@keep-network/keep-ecdsa/-/keep-ecdsa-1.9.0-sepolia.0.tgz#33d0fcf512193d2b701e92efcfa08de97064f779"
integrity sha512-+hWE8ZzafsElA6xTrVK/XbEpomhiPJDzKO085OJ5GJE6qzx/MGZ5J+EwD3KR+5/1+K+gtVwowF/Q39pgj+jNoQ==
dependencies:
"@keep-network/keep-core" "1.8.0-ropsten.16"
"@keep-network/keep-core" "1.8.1-sepolia.0"
"@keep-network/sortition-pools" "1.2.0-dev.1"
"@openzeppelin/upgrades" "^2.7.2"
openzeppelin-solidity "2.3.0"
Expand Down Expand Up @@ -685,15 +685,15 @@
"@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf"
"@threshold-network/solidity-contracts" "1.3.0-dev.6"

"@keep-network/[email protected]goerli.6":
version "2.1.0-goerli.6"
resolved "https://registry.yarnpkg.com/@keep-network/random-beacon/-/random-beacon-2.1.0-goerli.6.tgz#dd6dcf4f5101b35a603a819f30fc884ecfeb0b85"
integrity sha512-A+rnK0NkP4Q+EHzbbW9iuSUEjUgCAJdhdh14WY9zMpIreXn4KoT44WmyqcjYbwWe+1DcbsX5SwDK7yjmoeqcFA==
"@keep-network/[email protected]sepolia.1":
version "2.1.0-sepolia.1"
resolved "https://registry.yarnpkg.com/@keep-network/random-beacon/-/random-beacon-2.1.0-sepolia.1.tgz#3debde13d5f365883d88b3c1d279cc7d21984d58"
integrity sha512-dj6j6/msv1BqMtPbVoLo4cMhbtf4jLhKjkXmJoBXU2KYWW9wBlRB06M4DZPfUhhW8L7/1eaFJJIINATt26wBjA==
dependencies:
"@keep-network/sortition-pools" "github:keep-network/sortition-pools#test-fork"
"@openzeppelin/contracts" "^4.6.0"
"@openzeppelin/contracts" "4.7.3"
"@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf"
"@threshold-network/solidity-contracts" "1.3.0-goerli.0"
"@threshold-network/solidity-contracts" "1.3.0-sepolia.0"

"@keep-network/[email protected]":
version "1.1.2"
Expand Down Expand Up @@ -737,20 +737,20 @@
"@openzeppelin/contracts-upgradeable" "^4.6.0"
"@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf"

"@keep-network/tbtc-v2-testnet@npm:@keep-network/tbtc-v2@goerli":
version "1.0.3-goerli.0"
resolved "https://registry.yarnpkg.com/@keep-network/tbtc-v2/-/tbtc-v2-1.0.3-goerli.0.tgz#e21bea562de0a263c0e61aff38dcee0faeeae352"
integrity sha512-GnSmZoxXRrWgXT5XyCgIMYN8V7FIObP/txERvfYXTvh5bZs7nH4sci9ELxMx4WxiSDp0qsdsDMwbXCe2ACKtug==
"@keep-network/tbtc-v2-testnet@npm:@keep-network/tbtc-v2@sepolia":
version "1.6.0-sepolia.0"
resolved "https://registry.yarnpkg.com/@keep-network/tbtc-v2/-/tbtc-v2-1.6.0-sepolia.0.tgz#2916677d9732d4ac7bd03d7e00a2d8c2fb71b0c7"
integrity sha512-cRupt7tEOqfSWQc2LUMtCZsuENe+VEjlo71MeFKaOQ7H1fe80A/VHHJUmoWw5XNDKyjJQb3oBmVhVDx2YfEL+w==
dependencies:
"@keep-network/bitcoin-spv-sol" "3.4.0-solc-0.8"
"@keep-network/ecdsa" "2.1.0-goerli.4"
"@keep-network/random-beacon" "2.1.0-goerli.6"
"@keep-network/tbtc" "^1.1.2-goerli.0"
"@openzeppelin/contracts" "^4.6.0"
"@openzeppelin/contracts-upgradeable" "^4.6.0"
"@keep-network/ecdsa" "2.1.0-sepolia.1"
"@keep-network/random-beacon" "2.1.0-sepolia.1"
"@keep-network/tbtc" "1.1.2-sepolia.0"
"@openzeppelin/contracts" "^4.8.1"
"@openzeppelin/contracts-upgradeable" "^4.8.1"
"@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf"

"@keep-network/tbtc-v2.ts@development":
"@keep-network/tbtc-v2.ts@1.4.0-dev.1":
version "1.4.0-dev.1"
resolved "https://registry.yarnpkg.com/@keep-network/tbtc-v2.ts/-/tbtc-v2.ts-1.4.0-dev.1.tgz#a2f89db54aa0e8924f205f3bfbd411a2b79c9553"
integrity sha512-+20QZ4/FFGUdqVrY+N6+K+t2aQ8WcKlFjo0J/wiTMfb00A5KjJ8SDb3QI8+RHsvtbKnulnyH3VXEOAHBcI0IkQ==
Expand Down Expand Up @@ -799,13 +799,13 @@
"@summa-tx/relay-sol" "^2.0.2"
openzeppelin-solidity "2.3.0"

"@keep-network/tbtc@^1.1.2-goerli.0":
version "1.1.2-ropsten.12"
resolved "https://registry.yarnpkg.com/@keep-network/tbtc/-/tbtc-1.1.2-ropsten.12.tgz#5a5d9d9424f9d70e05a07e6b62b29e0c8d19742c"
integrity sha512-9ICNoPNoE2Trj0B5BGNls36CoDBfHLutxf82kUZuII6X7QHBYFfJ/p/iRLGsIN22RUdnSjoxDXGbxHUvnj+bFw==
"@keep-network/[email protected]sepolia.0":
version "1.1.2-sepolia.0"
resolved "https://registry.yarnpkg.com/@keep-network/tbtc/-/tbtc-1.1.2-sepolia.0.tgz#6ef5f511a5ce80133f892f564c81b45afb9eaec9"
integrity sha512-p5H728tyG/Frli3N0//u4JiqFxiuW4uzMrMmnJFO7azBJPhdwEALhHRsIX6BNkVH2/NRnmu3MQYksqNnUYM6Bg==
dependencies:
"@celo/contractkit" "^1.0.2"
"@keep-network/keep-ecdsa" "1.8.0-ropsten.1"
"@keep-network/keep-ecdsa" "1.9.0-sepolia.0"
"@summa-tx/bitcoin-spv-sol" "^3.1.0"
"@summa-tx/relay-sol" "^2.0.2"
openzeppelin-solidity "2.3.0"
Expand Down Expand Up @@ -1147,12 +1147,12 @@
"@openzeppelin/contracts-upgradeable" "~4.5.2"
"@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf"

"@threshold-network/[email protected]goerli.0":
version "1.3.0-goerli.0"
resolved "https://registry.yarnpkg.com/@threshold-network/solidity-contracts/-/solidity-contracts-1.3.0-goerli.0.tgz#392813309a19b20fda1ef98f94935cd3cdb15d78"
integrity sha512-qM5FQIPMxUoztYYTQs5ylESvPuD3j9NHFFRLP1ECPMcBlVRZPP273WqmgGLwU9YdEq+8Fp0T3q7W8IUlvdkE3w==
"@threshold-network/[email protected]sepolia.0":
version "1.3.0-sepolia.0"
resolved "https://registry.yarnpkg.com/@threshold-network/solidity-contracts/-/solidity-contracts-1.3.0-sepolia.0.tgz#9a2401094ca267844e08d1a5be1214d32bd99f93"
integrity sha512-FmRsi+WZAG805kpPYRWAeMbEDRDH44Af+q8UuyVKpjJh5ObcNz9MPGESeYflE1o8MsNpY1mfxZBY6olXPR/LCw==
dependencies:
"@keep-network/keep-core" "^1.8.1-goerli.0"
"@keep-network/keep-core" "1.8.1-sepolia.0"
"@openzeppelin/contracts" "~4.5.0"
"@openzeppelin/contracts-upgradeable" "~4.5.2"
"@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf"
Expand Down
Loading