From e4c75c69d96c6a48756c1faffc977bddc16ad82a Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Thu, 29 Aug 2024 14:51:21 +1000 Subject: [PATCH 01/10] init --- .gitmodules | 16 ++++++++-------- babylon | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) create mode 160000 babylon diff --git a/.gitmodules b/.gitmodules index bed4e109..e391e9ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,9 @@ url = git@github.com:babylonlabs-io/babylon-contract.git [submodule "covenant-emulator"] path = covenant-emulator url = git@github.com:babylonlabs-io/covenant-emulator.git -[submodule "babylon-private"] -path = babylon-private -url = git@github.com:babylonlabs-io/babylon-private.git +[submodule "babylon"] + path = babylon + url = git@github.com:babylonlabs-io/babylon.git branch = base/consumer-chain-support [submodule "vigilante"] path = vigilante @@ -20,9 +20,9 @@ path = btc-staker-phase-3 url = git@github.com:babylonlabs-io/btc-staker.git branch = base/consumer-chain-support [submodule "optimism"] - path = optimism - url = git@github.com:babylonlabs-io/optimism.git - branch = feat/babylon-rfc +path = optimism +url = git@github.com:babylonlabs-io/optimism.git +branch = feat/babylon-rfc [submodule "finality-gadget"] - path = finality-gadget - url = git@github.com:babylonlabs-io/finality-gadget.git +path = finality-gadget +url = git@github.com:babylonlabs-io/finality-gadget.git diff --git a/babylon b/babylon new file mode 160000 index 00000000..28f87a79 --- /dev/null +++ b/babylon @@ -0,0 +1 @@ +Subproject commit 28f87a79dfef988b25eb4ab8b5c9678c311b14a5 From 36a2b88399e8288c4cfb9005f9554509bba8f788 Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Thu, 29 Aug 2024 14:51:32 +1000 Subject: [PATCH 02/10] fix bbn --- .gitmodules | 4 ++-- babylon-private | 1 - covenant-emulator | 2 +- deployments/btc-staking-integration-bitcoind/Makefile | 2 +- deployments/finality-gadget-integration-op-l2/Makefile | 2 +- finality-provider-phase-3 | 2 +- vigilante | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) delete mode 160000 babylon-private diff --git a/.gitmodules b/.gitmodules index e391e9ad..0ec3845a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,8 +5,8 @@ url = git@github.com:babylonlabs-io/babylon-contract.git path = covenant-emulator url = git@github.com:babylonlabs-io/covenant-emulator.git [submodule "babylon"] - path = babylon - url = git@github.com:babylonlabs-io/babylon.git +path = babylon +url = git@github.com:babylonlabs-io/babylon.git branch = base/consumer-chain-support [submodule "vigilante"] path = vigilante diff --git a/babylon-private b/babylon-private deleted file mode 160000 index 74a24c96..00000000 --- a/babylon-private +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 74a24c962ce2cf64e5216edba9383fe0b460070c diff --git a/covenant-emulator b/covenant-emulator index 5fd91be4..7515fe5a 160000 --- a/covenant-emulator +++ b/covenant-emulator @@ -1 +1 @@ -Subproject commit 5fd91be4fe38e293d2fb46ad615badb2dfa922ad +Subproject commit 7515fe5a21b0a441add2d939792aaa4c59c20fc2 diff --git a/deployments/btc-staking-integration-bitcoind/Makefile b/deployments/btc-staking-integration-bitcoind/Makefile index 629ec68e..e6c2d8e6 100644 --- a/deployments/btc-staking-integration-bitcoind/Makefile +++ b/deployments/btc-staking-integration-bitcoind/Makefile @@ -8,7 +8,7 @@ build-ibcsim-bcd: $(MAKE) BBN_PRIV_DEPLOY_KEY=${BBN_PRIV_DEPLOY_KEY} -C $(GIT_TOPLEVEL)/contrib/images ibcsim-bcd build-babylond: - $(MAKE) -C $(GIT_TOPLEVEL)/babylon-private/contrib/images babylond + $(MAKE) -C $(GIT_TOPLEVEL)/babylon/contrib/images babylond build-vigilante: $(MAKE) -C $(GIT_TOPLEVEL)/vigilante build-docker diff --git a/deployments/finality-gadget-integration-op-l2/Makefile b/deployments/finality-gadget-integration-op-l2/Makefile index 9c86a4c4..05e83293 100644 --- a/deployments/finality-gadget-integration-op-l2/Makefile +++ b/deployments/finality-gadget-integration-op-l2/Makefile @@ -12,7 +12,7 @@ build-bitcoindsim: @$(MAKE) -C $(GIT_TOPLEVEL)/contrib/images bitcoindsim build-babylond: - @$(MAKE) -C $(GIT_TOPLEVEL)/babylon-private/contrib/images babylond + @$(MAKE) -C $(GIT_TOPLEVEL)/babylon/contrib/images babylond build-vigilante: @$(MAKE) -C $(GIT_TOPLEVEL)/vigilante build-docker diff --git a/finality-provider-phase-3 b/finality-provider-phase-3 index 464946b2..6455f492 160000 --- a/finality-provider-phase-3 +++ b/finality-provider-phase-3 @@ -1 +1 @@ -Subproject commit 464946b2d7d020555583819fdcdbc3b23c281306 +Subproject commit 6455f492b82d33fa48d0b4ed3fbed21c4c6cb8aa diff --git a/vigilante b/vigilante index e42be2f3..e9922316 160000 --- a/vigilante +++ b/vigilante @@ -1 +1 @@ -Subproject commit e42be2f3c04c8de4abc6b8fbcae849e2f7e20850 +Subproject commit e9922316a01888f6f503d63fdb428394f998eb28 From 235c604e79941100fca7ef04b20ea1930b8910ab Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Thu, 29 Aug 2024 14:53:57 +1000 Subject: [PATCH 03/10] fix btc-staker and finality-provider --- .gitmodules | 12 ++++++------ btc-staker | 1 + finality-provider | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) create mode 160000 btc-staker create mode 160000 finality-provider diff --git a/.gitmodules b/.gitmodules index 0ec3845a..45d550ca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,13 +11,13 @@ branch = base/consumer-chain-support [submodule "vigilante"] path = vigilante url = git@github.com:babylonlabs-io/vigilante.git -[submodule "finality-provider-phase-3"] -path = finality-provider-phase-3 -url = git@github.com:babylonlabs-io/finality-provider.git +[submodule "finality-provider"] + path = finality-provider + url = git@github.com:babylonlabs-io/finality-provider.git branch = base/consumer-chain-support -[submodule "btc-staker-phase-3"] -path = btc-staker-phase-3 -url = git@github.com:babylonlabs-io/btc-staker.git +[submodule "btc-staker"] + path = btc-staker + url = git@github.com:babylonlabs-io/btc-staker.git branch = base/consumer-chain-support [submodule "optimism"] path = optimism diff --git a/btc-staker b/btc-staker new file mode 160000 index 00000000..06abcc3c --- /dev/null +++ b/btc-staker @@ -0,0 +1 @@ +Subproject commit 06abcc3c18fa53fba0c8b63432e1710ead896eb1 diff --git a/finality-provider b/finality-provider new file mode 160000 index 00000000..fdc18c89 --- /dev/null +++ b/finality-provider @@ -0,0 +1 @@ +Subproject commit fdc18c897d539c687fa141ab5c21614fe981db58 From ee9420558df4ce0d5fc274adad5254147ea43e9d Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Thu, 29 Aug 2024 14:54:00 +1000 Subject: [PATCH 04/10] fix --- btc-staker-phase-3 | 1 - .../btc-staking-integration-bitcoind/Makefile | 10 +++++----- .../finality-gadget-integration-op-l2/Makefile | 12 ++++++------ finality-provider-phase-3 | 1 - 4 files changed, 11 insertions(+), 13 deletions(-) delete mode 160000 btc-staker-phase-3 delete mode 160000 finality-provider-phase-3 diff --git a/btc-staker-phase-3 b/btc-staker-phase-3 deleted file mode 160000 index 7dd8646b..00000000 --- a/btc-staker-phase-3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7dd8646b89551118cab0f71578be81f91f994f2d diff --git a/deployments/btc-staking-integration-bitcoind/Makefile b/deployments/btc-staking-integration-bitcoind/Makefile index e6c2d8e6..a010bc7c 100644 --- a/deployments/btc-staking-integration-bitcoind/Makefile +++ b/deployments/btc-staking-integration-bitcoind/Makefile @@ -13,16 +13,16 @@ build-babylond: build-vigilante: $(MAKE) -C $(GIT_TOPLEVEL)/vigilante build-docker -build-btc-staker-phase-3: - $(MAKE) -C $(GIT_TOPLEVEL)/btc-staker-phase-3 build-docker +build-btc-staker: + $(MAKE) -C $(GIT_TOPLEVEL)/btc-staker build-docker -build-finality-provider-phase-3: - $(MAKE) -C $(GIT_TOPLEVEL)/finality-provider-phase-3 build-docker +build-finality-provider: + $(MAKE) -C $(GIT_TOPLEVEL)/finality-provider build-docker build-covenant-emulator: $(MAKE) -C $(GIT_TOPLEVEL)/covenant-emulator build-docker -build-deployment-btc-staking-integration-bitcoind: build-babylond build-bitcoindsim build-vigilante build-btc-staker-phase-3 build-finality-provider-phase-3 build-covenant-emulator build-ibcsim-bcd +build-deployment-btc-staking-integration-bitcoind: build-babylond build-bitcoindsim build-vigilante build-btc-staker build-finality-provider build-covenant-emulator build-ibcsim-bcd start-deployment-btc-staking-integration-bitcoind: stop-deployment-btc-staking-integration-bitcoind build-deployment-btc-staking-integration-bitcoind ./pre-deployment.sh diff --git a/deployments/finality-gadget-integration-op-l2/Makefile b/deployments/finality-gadget-integration-op-l2/Makefile index 05e83293..6afd7a84 100644 --- a/deployments/finality-gadget-integration-op-l2/Makefile +++ b/deployments/finality-gadget-integration-op-l2/Makefile @@ -17,11 +17,11 @@ build-babylond: build-vigilante: @$(MAKE) -C $(GIT_TOPLEVEL)/vigilante build-docker -build-btc-staker-phase-3: - @$(MAKE) -C $(GIT_TOPLEVEL)/btc-staker-phase-3 build-docker +build-btc-staker: + @$(MAKE) -C $(GIT_TOPLEVEL)/btc-staker build-docker -build-finality-provider-phase-3: - @$(MAKE) -C $(GIT_TOPLEVEL)/finality-provider-phase-3 build-docker +build-finality-provider: + @$(MAKE) -C $(GIT_TOPLEVEL)/finality-provider build-docker build-covenant-emulator: @$(MAKE) -C $(GIT_TOPLEVEL)/covenant-emulator build-docker @@ -35,8 +35,8 @@ build-cw-contract: build: build-babylond \ build-bitcoindsim \ build-vigilante \ - build-btc-staker-phase-3 \ - build-finality-provider-phase-3 \ + build-btc-staker \ + build-finality-provider \ build-finality-gadget \ build-covenant-emulator \ build-cw-contract diff --git a/finality-provider-phase-3 b/finality-provider-phase-3 deleted file mode 160000 index 6455f492..00000000 --- a/finality-provider-phase-3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6455f492b82d33fa48d0b4ed3fbed21c4c6cb8aa From 63f5eeace97095eaf9823098957276f61009d65d Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Thu, 29 Aug 2024 14:54:43 +1000 Subject: [PATCH 05/10] use base branch --- babylon | 2 +- btc-staker | 2 +- covenant-emulator | 2 +- finality-provider | 2 +- vigilante | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/babylon b/babylon index 28f87a79..81ee356f 160000 --- a/babylon +++ b/babylon @@ -1 +1 @@ -Subproject commit 28f87a79dfef988b25eb4ab8b5c9678c311b14a5 +Subproject commit 81ee356f706d6132fd3056f75650ec143448a7dc diff --git a/btc-staker b/btc-staker index 06abcc3c..7dd8646b 160000 --- a/btc-staker +++ b/btc-staker @@ -1 +1 @@ -Subproject commit 06abcc3c18fa53fba0c8b63432e1710ead896eb1 +Subproject commit 7dd8646b89551118cab0f71578be81f91f994f2d diff --git a/covenant-emulator b/covenant-emulator index 7515fe5a..d1770a70 160000 --- a/covenant-emulator +++ b/covenant-emulator @@ -1 +1 @@ -Subproject commit 7515fe5a21b0a441add2d939792aaa4c59c20fc2 +Subproject commit d1770a7070f556a400f1c3f32525786cec8cea44 diff --git a/finality-provider b/finality-provider index fdc18c89..6455f492 160000 --- a/finality-provider +++ b/finality-provider @@ -1 +1 @@ -Subproject commit fdc18c897d539c687fa141ab5c21614fe981db58 +Subproject commit 6455f492b82d33fa48d0b4ed3fbed21c4c6cb8aa diff --git a/vigilante b/vigilante index e9922316..41819a8b 160000 --- a/vigilante +++ b/vigilante @@ -1 +1 @@ -Subproject commit e9922316a01888f6f503d63fdb428394f998eb28 +Subproject commit 41819a8b47d9aa99a18cf44362263e1aa02fe3b0 From 8aa831f4329d97b701c4ba8ec36edfc28ea1b4d0 Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Thu, 29 Aug 2024 21:16:46 +1000 Subject: [PATCH 06/10] bump fp --- finality-provider | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/finality-provider b/finality-provider index 6455f492..bace5ce9 160000 --- a/finality-provider +++ b/finality-provider @@ -1 +1 @@ -Subproject commit 6455f492b82d33fa48d0b4ed3fbed21c4c6cb8aa +Subproject commit bace5ce9cd8d9df7ec2b99ee90c5dc8ba362e248 From 26995fabef9c86e1f796fa2fa2ffab1b50455f8a Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Wed, 25 Sep 2024 16:14:10 +1000 Subject: [PATCH 07/10] bump --- babylon | 2 +- btc-staker | 2 +- contrib/images/Makefile | 35 ------------------- covenant-emulator | 2 +- .../pre-deployment.sh | 2 +- .../init-testnets-dir.sh | 4 +-- finality-provider | 2 +- vigilante | 2 +- 8 files changed, 8 insertions(+), 43 deletions(-) diff --git a/babylon b/babylon index 81ee356f..a6f728b0 160000 --- a/babylon +++ b/babylon @@ -1 +1 @@ -Subproject commit 81ee356f706d6132fd3056f75650ec143448a7dc +Subproject commit a6f728b023145bea81d275f4e94fdbed60c36736 diff --git a/btc-staker b/btc-staker index 7dd8646b..9bbf30c3 160000 --- a/btc-staker +++ b/btc-staker @@ -1 +1 @@ -Subproject commit 7dd8646b89551118cab0f71578be81f91f994f2d +Subproject commit 9bbf30c390bb0ca349f51fbfdd65a4a00e6d3404 diff --git a/contrib/images/Makefile b/contrib/images/Makefile index c6a401a5..e69de29b 100644 --- a/contrib/images/Makefile +++ b/contrib/images/Makefile @@ -1,35 +0,0 @@ -ifeq ($(BITCOIN_CORE_VERSION),) - BITCOINDSIM_TAG := latest -else - BITCOINDSIM_BUILD_ARG := --build-arg BITCOIN_CORE_VERSION=$(BITCOIN_CORE_VERSION) - BITCOINDSIM_TAG := $(BITCOIN_CORE_VERSION) -endif - -all: bitcoinsim - -bitcoindsim: - docker build --platform "linux/amd64" --tag babylonlabs-io/bitcoindsim:$(BITCOINDSIM_TAG) -f bitcoindsim/Dockerfile \ - $(shell git rev-parse --show-toplevel)/contrib/images/bitcoindsim $(BITCOINDSIM_BUILD_ARG) - -ibcsim-gaia: - docker build --tag babylonlabs-io/ibcsim-gaia -f ibcsim-gaia/Dockerfile \ - $(shell git rev-parse --show-toplevel)/contrib/images/ibcsim-gaia - -ibcsim-bcd: - docker build --secret id=sshKey,src=${BBN_PRIV_DEPLOY_KEY} \ - --tag babylonlabs-io/ibcsim-bcd -f ibcsim-bcd/Dockerfile \ - $(shell git rev-parse --show-toplevel)/contrib/images/ibcsim-bcd - -btcdsim-rmi: - docker rmi babylonlabs-io/btcdsim 2>/dev/null; true - -bitcoindsim-rmi: - docker rmi babylonlabs-io/bitcoindsim 2>/dev/null; true - -ibcsim-gaia-rmi: - docker rmi babylonlabs-io/ibcsim-gaia 2>/dev/null; true - -ibcsim-bcd-rmi: - docker rmi babylonlabs-io/ibcsim-bcd 2>/dev/null; true - -.PHONY: all btcdsim btcdsim-rmi bitcoindsim bitcoindsim-rmi ibcsim-gaia ibcsim-gaia-rmi ibcsim-bcd ibcsim-bcd-rmi diff --git a/covenant-emulator b/covenant-emulator index d1770a70..792b91dd 160000 --- a/covenant-emulator +++ b/covenant-emulator @@ -1 +1 @@ -Subproject commit d1770a7070f556a400f1c3f32525786cec8cea44 +Subproject commit 792b91dd810ed6619f3ce61da05cfbb96560450a diff --git a/deployments/btc-staking-integration-bitcoind/pre-deployment.sh b/deployments/btc-staking-integration-bitcoind/pre-deployment.sh index d5ef3c33..13712e50 100755 --- a/deployments/btc-staking-integration-bitcoind/pre-deployment.sh +++ b/deployments/btc-staking-integration-bitcoind/pre-deployment.sh @@ -10,7 +10,7 @@ docker run --rm -v $(pwd)/.testnets:/data babylonlabs-io/babylond \ --minimum-gas-prices 0.000006ubbn \ --btc-base-header 0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4adae5494dffff7f2002000000 \ --btc-network regtest --additional-sender-account \ - --slashing-address "mfcGAzvis9JQAb6avB6WBGiGrgWzLxuGaC" \ + --slashing-pk-script "76a914010101010101010101010101010101010101010188ab" \ --slashing-rate 0.1 \ --min-commission-rate 0.05 \ --covenant-quorum 1 \ diff --git a/deployments/finality-gadget-integration-op-l2/init-testnets-dir.sh b/deployments/finality-gadget-integration-op-l2/init-testnets-dir.sh index e9be8fce..63aafa02 100755 --- a/deployments/finality-gadget-integration-op-l2/init-testnets-dir.sh +++ b/deployments/finality-gadget-integration-op-l2/init-testnets-dir.sh @@ -13,7 +13,7 @@ docker run --rm -v $(pwd)/.testnets:/data babylonlabs-io/babylond \ --minimum-gas-prices 0.000006ubbn \ --btc-base-header 0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4adae5494dffff7f2002000000 \ --btc-network regtest --additional-sender-account \ - --slashing-address "mfcGAzvis9JQAb6avB6WBGiGrgWzLxuGaC" \ + --slashing-pk-script "76a914010101010101010101010101010101010101010188ab" \ --slashing-rate 0.1 \ --min-commission-rate 0.05 \ --covenant-quorum 1 \ @@ -41,4 +41,4 @@ cp artifacts/covd.conf .testnets/covenant-emulator/covd.conf cp -R artifacts/covenant-keyring .testnets/covenant-emulator/keyring-test chmod -R 777 .testnets -echo \ No newline at end of file +echo diff --git a/finality-provider b/finality-provider index bace5ce9..a7fb489d 160000 --- a/finality-provider +++ b/finality-provider @@ -1 +1 @@ -Subproject commit bace5ce9cd8d9df7ec2b99ee90c5dc8ba362e248 +Subproject commit a7fb489dc8e38bb03bd703ee5598abe96beec4db diff --git a/vigilante b/vigilante index 41819a8b..8f930402 160000 --- a/vigilante +++ b/vigilante @@ -1 +1 @@ -Subproject commit 41819a8b47d9aa99a18cf44362263e1aa02fe3b0 +Subproject commit 8f9304020a3250890cdd0b811c75195a88a770d3 From 00915a9dd486e81b7e9982c117f883b174ef4df3 Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Wed, 25 Sep 2024 16:25:40 +1000 Subject: [PATCH 08/10] fix fp config --- .../artifacts/consumer-fpd.conf | 5 ++++- .../btc-staking-integration-bitcoind/artifacts/fpd.conf | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/deployments/btc-staking-integration-bitcoind/artifacts/consumer-fpd.conf b/deployments/btc-staking-integration-bitcoind/artifacts/consumer-fpd.conf index 2b29be35..cedc3b1d 100644 --- a/deployments/btc-staking-integration-bitcoind/artifacts/consumer-fpd.conf +++ b/deployments/btc-staking-integration-bitcoind/artifacts/consumer-fpd.conf @@ -48,6 +48,9 @@ RpcListener = 127.0.0.1:12581 ; The maximum number of finality-provider instances running concurrently within the daemon MaxNumFinalityProviders = 10 +; The interval between each attempt to update the finality-provider status +SyncFpStatusInterval = 10s + [chainpollerconfig] ; The maximum number of Babylon blocks that can be stored in the buffer BufferSize = 1000 @@ -69,7 +72,7 @@ Host = 127.0.0.1 Port = 2112 ; The interval of Prometheus metrics updated -UpdateInterval = 1m0s +UpdateInterval = 1m [dbconfig] ; The directory path in which the database file should be stored. diff --git a/deployments/btc-staking-integration-bitcoind/artifacts/fpd.conf b/deployments/btc-staking-integration-bitcoind/artifacts/fpd.conf index f93be1b0..556fd345 100644 --- a/deployments/btc-staking-integration-bitcoind/artifacts/fpd.conf +++ b/deployments/btc-staking-integration-bitcoind/artifacts/fpd.conf @@ -48,6 +48,9 @@ RpcListener = 127.0.0.1:12581 ; The maximum number of finality-provider instances running concurrently within the daemon MaxNumFinalityProviders = 10 +; The interval between each attempt to update the finality-provider status +SyncFpStatusInterval = 10s + [chainpollerconfig] ; The maximum number of Babylon blocks that can be stored in the buffer BufferSize = 1000 @@ -69,7 +72,7 @@ Host = 127.0.0.1 Port = 2112 ; The interval of Prometheus metrics updated -UpdateInterval = 1m0s +UpdateInterval = 1m [dbconfig] ; The directory path in which the database file should be stored. From ed57d15102cfe004c92fb1407e961e43f24ea2b0 Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Wed, 25 Sep 2024 16:40:45 +1000 Subject: [PATCH 09/10] fix vigilante config --- .../artifacts/vigilante.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/deployments/btc-staking-integration-bitcoind/artifacts/vigilante.yml b/deployments/btc-staking-integration-bitcoind/artifacts/vigilante.yml index 52a7a0b5..6c6333d1 100644 --- a/deployments/btc-staking-integration-bitcoind/artifacts/vigilante.yml +++ b/deployments/btc-staking-integration-bitcoind/artifacts/vigilante.yml @@ -4,9 +4,9 @@ common: log-format: "auto" log-level: "debug" btc: - no-client-tls: true # use true for bitcoind as it does not support tls + no-client-tls: true # use true for bitcoind as it does not support tls ca-file: ~ - endpoint: bitcoindsim:18443 # use port 18443 for bitcoind regtest + endpoint: bitcoindsim:18443 # use port 18443 for bitcoind regtest estimate-mode: CONSERVATIVE # only needed by bitcoind tx-fee-max: 10000 # maximum tx fee, 10,000sat/kvb tx-fee-min: 1000 # minimum tx fee, 1,000sat/kvb @@ -58,6 +58,13 @@ submitter: polling-interval-seconds: 60 resend-interval-seconds: 1800 resubmit-fee-multiplier: 2 + database-config: + dbpath: /home/vigilante/db + dbfilename: vigilante.db + nofreelistsync: false + autocompact: true + autocompactminage: 1000 + dbtimeout: 10s reporter: netparams: regtest btc_cache_size: 1000 @@ -72,6 +79,13 @@ monitor: enable-liveness-checker: true enable-slasher: true btcnetparams: regtest + database-config: + dbpath: /home/vigilante/db + dbfilename: vigilante.db + nofreelistsync: false + autocompact: true + autocompactminage: 1000 + dbtimeout: 10s btcstaking-tracker: check-delegations-interval: 1m delegations-batch-size: 100 @@ -79,3 +93,4 @@ btcstaking-tracker: retry-submit-unbonding-interval: 1m max-jitter-interval: 30s btcnetparams: regtest + max-slashing-concurrency: 10 From 6d422a92f77f5b39207b78ea2d80a5cf8c398783 Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Wed, 25 Sep 2024 16:50:25 +1000 Subject: [PATCH 10/10] fix jq not found --- .../post-deployment.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/deployments/btc-staking-integration-bitcoind/post-deployment.sh b/deployments/btc-staking-integration-bitcoind/post-deployment.sh index 414e2748..c1a46073 100755 --- a/deployments/btc-staking-integration-bitcoind/post-deployment.sh +++ b/deployments/btc-staking-integration-bitcoind/post-deployment.sh @@ -1,5 +1,15 @@ #!/bin/bash +echo "Installing dependencies" + +docker exec babylondnode0 /bin/sh -c ' + apt-get install -y make git bash gcc curl jq +' + +docker exec ibcsim-bcd /bin/sh -c ' + apt-get install -y make git bash gcc curl jq +' + echo "Creating keyrings and sending funds to Babylon Node Consumers" [[ "$(uname)" == "Linux" ]] && chown -R 1138:1138 .testnets/eotsmanager