Skip to content

Commit

Permalink
Merge branch 'april-update' into 'dev'
Browse files Browse the repository at this point in the history
April update

See merge request ergo/rosen-bridge/watcher!271
  • Loading branch information
vorujack committed Jun 3, 2024
2 parents 628ab05 + b6b0112 commit aea034d
Show file tree
Hide file tree
Showing 26 changed files with 1,637 additions and 406 deletions.
5 changes: 5 additions & 0 deletions .changeset/early-dingos-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rosen-bridge/watcher': patch
---

update typeorm version to 0.3.20
5 changes: 5 additions & 0 deletions .changeset/gorgeous-keys-crash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rosen-bridge/watcher': minor
---

Upgrade health check package to latest
2 changes: 2 additions & 0 deletions .changeset/heavy-horses-wink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/little-frogs-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rosen-bridge/watcher': minor
---

add bitcoin network
5 changes: 5 additions & 0 deletions .changeset/popular-boxes-tell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rosen-bridge/watcher': minor
---

Integrate rpc scanner for bitcoin network
5 changes: 5 additions & 0 deletions .changeset/popular-schools-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rosen-bridge/watcher': patch
---

Update minimum-fee and health-check packages
5 changes: 5 additions & 0 deletions .changeset/weak-lions-judge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rosen-bridge/watcher': major
---

update minimum-fee to v1
2 changes: 2 additions & 0 deletions config/dataSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from '@rosen-bridge/observation-extractor';
import {
BlockEntity,
ExtractorStatusEntity,
migrations as scannerMigrations,
} from '@rosen-bridge/scanner';
import {
Expand Down Expand Up @@ -38,6 +39,7 @@ const dbConfigs = {
PermitEntity,
CollateralEntity,
ObservationEntity,
ExtractorStatusEntity,
TokenEntity,
TxEntity,
ObservationStatusEntity,
Expand Down
18 changes: 17 additions & 1 deletion config/default.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
---
network: '' # which scanner network used in this watcher ergo/cardano
network: '' # which scanner network used in this watcher ergo/cardano/bitcoin
observation:
confirmation: 60 # number of required block confirmations to create the commitment after observing an event
validThreshold: 12960 # observations that have not been triggered won't be processed after this period (in blocks)
bitcoin:
type: '' # options: esplora, rpc
initial:
height: -1 # initial height of scanning
esplora:
interval: 180 # esplora scanning interval (in seconds)
timeout: 10 # esplora request timeout (in seconds)
url: 'https://blockstream.info' # esplora url
rpc:
interval: 180 # rpc scanning interval (in seconds)
timeout: 10 # rpc request timeout (in seconds)
url: '' # rpc url
cardano:
type: '' # options: koios, ogmios, blockfrost
initial:
Expand Down Expand Up @@ -50,6 +62,7 @@ ergo:
redeem: 120 # commitment reveal interval (in seconds)
wid:
status: 120 # wid status check interval (in seconds)
minimumFee: 300
path:
addresses: config/rosen # addresses path
# tokens: config/rosen/tokens.json # default tokens path.
Expand Down Expand Up @@ -89,6 +102,9 @@ healthCheck:
cardanoScanner:
warnDifference: 2 # warning difference between existing and scanned blocks height
criticalDifference: 600 # critical difference between existing and scanned blocks height
bitcoinScanner:
warnDifference: 2 # warning difference between existing and scanned blocks height
criticalDifference: 10 # critical difference between existing and scanned blocks height
permit:
warnCommitmentCount: 4 # warning remaining permits for creating commitment
criticalCommitmentCount: 0 # critical remaining permits for creating commitment
Expand Down
Loading

0 comments on commit aea034d

Please sign in to comment.