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.

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

BTC staking integration deployment after migration #3

Merged
merged 9 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This repository contains artifacts and instructions for setting up and running a

4. **Repository Setup**:
```shell
git clone [email protected]:babylonchain/babylon-deployment.git
git clone [email protected]:babylonlabs-io/babylon-integration-deployment.git
git submodule init && git submodule update
```

Expand Down
2 changes: 1 addition & 1 deletion babylon-private
2 changes: 1 addition & 1 deletion btc-staker-phase-3
Submodule btc-staker-phase-3 updated 52 files
+0 −107 .circleci/config.yml
+20 −0 .github/workflows/ci.yml
+24 −0 .github/workflows/publish.yml
+85 −85 CHANGELOG.md
+11 −18 Dockerfile
+3 −3 LICENSE
+2 −2 Makefile
+6 −6 README.md
+42 −45 babylonclient/babyloncontroller.go
+5 −8 babylonclient/interface.go
+1 −1 babylonclient/msgsender.go
+52 −18 babylonclient/pop.go
+3 −3 babylonclient/utils.go
+2 −2 cmd/stakercli/admin/admin.go
+3 −3 cmd/stakercli/daemon/daemoncommands.go
+0 −2 cmd/stakercli/helpers/flags.go
+3 −3 cmd/stakercli/main.go
+99 −0 cmd/stakercli/transaction/parsers.go
+0 −69 cmd/stakercli/transaction/staking.go
+315 −203 cmd/stakercli/transaction/transactions.go
+220 −47 cmd/stakercli/transaction/transactions_test.go
+4 −4 cmd/stakerd/main.go
+55 −30 docs/create-phase1-staking.md
+26 −0 example/global-params.json
+10 −10 go.mod
+14 −10 go.sum
+104 −41 itest/babylon_node_handler.go
+1 −1 itest/bitcoind_node_setup.go
+35 −19 itest/e2e_restaking_test.go
+91 −61 itest/e2e_test.go
+1 −1 itest/log.go
+115 −125 proto/transaction.pb.go
+6 −7 proto/transaction.proto
+47 −12 staker/babylontypes.go
+8 −8 staker/events.go
+2 −2 staker/feeestimator.go
+2 −2 staker/nodebackend.go
+110 −90 staker/stakerapp.go
+3 −3 staker/stakercontroller.go
+42 −77 staker/types.go
+2 −2 stakercfg/babylon.go
+1 −1 stakercfg/config.go
+24 −36 stakerdb/trackedtranactionstore.go
+5 −6 stakerdb/trackedtransactionstore_test.go
+3 −5 stakerservice/client/rpcclient.go
+23 −31 stakerservice/service.go
+2 −2 stakerservice/stakerdresponses.go
+10 −11 tools/go.mod
+12 −10 tools/go.sum
+1 −1 tools/tools.go
+89 −9 walletcontroller/client.go
+22 −1 walletcontroller/interface.go
14 changes: 7 additions & 7 deletions contrib/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ endif
all: bitcoinsim

bitcoindsim:
docker build --platform "linux/amd64" --tag babylonchain/bitcoindsim:$(BITCOINDSIM_TAG) -f bitcoindsim/Dockerfile \
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 babylonchain/ibcsim-gaia -f ibcsim-gaia/Dockerfile \
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 babylonchain/ibcsim-bcd -f ibcsim-bcd/Dockerfile \
--tag babylonlabs-io/ibcsim-bcd -f ibcsim-bcd/Dockerfile \
$(shell git rev-parse --show-toplevel)/contrib/images/ibcsim-bcd

btcdsim-rmi:
docker rmi babylonchain/btcdsim 2>/dev/null; true
docker rmi babylonlabs-io/btcdsim 2>/dev/null; true

bitcoindsim-rmi:
docker rmi babylonchain/bitcoindsim 2>/dev/null; true
docker rmi babylonlabs-io/bitcoindsim 2>/dev/null; true

ibcsim-gaia-rmi:
docker rmi babylonchain/ibcsim-gaia 2>/dev/null; true
docker rmi babylonlabs-io/ibcsim-gaia 2>/dev/null; true

ibcsim-bcd-rmi:
docker rmi babylonchain/ibcsim-bcd 2>/dev/null; true
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
8 changes: 4 additions & 4 deletions contrib/images/ibcsim-bcd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ WORKDIR /work

ENV GO111MODULE on
ENV RELAYER_TAG v2.5.2
ENV BABYLON_SDK_TAG v0.2.0-rc.1
ENV BABYLON_SDK_TAG v0.3.0-rc.0

# Install the relayer
RUN git clone https://github.com/cosmos/relayer.git
RUN cd relayer && git fetch origin && git checkout ${RELAYER_TAG} && make install && cd -

# Install bcd
RUN git clone https://github.com/babylonchain/babylon-sdk.git
RUN git clone https://github.com/babylonlabs-io/babylon-sdk.git

RUN mkdir -p /root/.ssh && ssh-keyscan github.com >> /root/.ssh/known_hosts
RUN git config --global url."[email protected]:".insteadOf "https://github.com/"
ENV GOPRIVATE=github.com/babylonchain/*
ENV GOPRIVATE=github.com/babylonlabs-io/*

RUN --mount=type=secret,id=sshKey,target=/root/.ssh/id_rsa cd babylon-sdk && git fetch origin && git checkout ${BABYLON_SDK_TAG} && make install && cd -

Expand All @@ -44,7 +44,7 @@ RUN apt-get update && apt-get install -y bash curl jq wget
COPY --from=build-env /work/babylon-sdk/demo/go.mod /tmp
RUN WASMVM_VERSION=$(grep github.com/CosmWasm/wasmvm /tmp/go.mod | cut -d' ' -f2) && \
wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm.$(uname -m).so \
-O /lib/libwasmvm.$(uname -m).so && \
-O /lib/libwasmvm.$(uname -m).so && \
# verify checksum
wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \
sha256sum /lib/libwasmvm.$(uname -m).so | grep $(cat /tmp/checksums.txt | grep libwasmvm.$(uname -m) | cut -d ' ' -f 1)
Expand Down
30 changes: 0 additions & 30 deletions contrib/images/ibcsim-gaia/Dockerfile

This file was deleted.

86 changes: 0 additions & 86 deletions contrib/images/ibcsim-gaia/wrapper.sh

This file was deleted.

2 changes: 1 addition & 1 deletion covenant-emulator
Submodule covenant-emulator updated 0 files
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
; Logging level for all subsystems {trace, debug, info, warn, error, fatal}
LogLevel = debug

; the name of the consumer chain
ChainName = wasm
; the type of the consumer chain
ChainType = wasm

; The number of Schnorr public randomness for each commitment
NumPubRand = 100
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
babylondnode0:
container_name: babylondnode0
image: "babylonchain/babylond"
image: "babylonlabs-io/babylond"
command: >
babylond --home /babylondhome start --log_format 'plain' 2>&1 | tee /babylondhome/babylond.log
cap_add:
Expand All @@ -21,7 +21,7 @@ services:

babylondnode1:
container_name: babylondnode1
image: "babylonchain/babylond"
image: "babylonlabs-io/babylond"
command: >
babylond --home /babylondhome start --log_format 'plain' 2>&1 | tee /babylondhome/babylond.log
cap_add:
Expand All @@ -43,7 +43,7 @@ services:
build:
context: contrib/images/bitcoindsim/
dockerfile: ./Dockerfile
image: babylonchain/bitcoindsim:latest
image: babylonlabs-io/bitcoindsim:latest
platform: linux/amd64
container_name: bitcoindsim
networks:
Expand All @@ -69,7 +69,7 @@ services:

vigilante-reporter:
container_name: vigilante-reporter
image: babylonchain/vigilante
image: babylonlabs-io/vigilante
command: >
vigilante reporter --config /home/vigilante/config/vigilante.yml 2>&1 | tee /home/vigilante/config/reporter.log
networks:
Expand All @@ -84,7 +84,7 @@ services:

vigilante-submitter:
container_name: vigilante-submitter
image: babylonchain/vigilante
image: babylonlabs-io/vigilante
command: >
vigilante submitter --config /home/vigilante/config/vigilante.yml 2>&1 | tee /home/vigilante/config/submitter.log
networks:
Expand All @@ -99,7 +99,7 @@ services:

vigilante-monitor:
container_name: vigilante-monitor
image: babylonchain/vigilante
image: babylonlabs-io/vigilante
command: >
vigilante monitor --config /home/vigilante/config/vigilante.yml --genesis /home/vigilante/config/bbnconfig/genesis.json 2>&1 | tee /home/vigilante/config/monitor.log
networks:
Expand All @@ -114,7 +114,7 @@ services:

vigilante-bstracker:
container_name: vigilante-bstracker
image: babylonchain/vigilante
image: babylonlabs-io/vigilante
command: >
vigilante bstracker --config /home/vigilante/config/vigilante.yml 2>&1 | tee /home/vigilante/config/unbonding-watcher.log
networks:
Expand All @@ -129,7 +129,7 @@ services:

btc-staker:
container_name: btc-staker
image: babylonchain/btc-staker
image: babylonlabs-io/btc-staker
networks:
localnet:
ipv4_address: 192.168.10.11
Expand All @@ -144,7 +144,7 @@ services:

finality-provider:
container_name: finality-provider
image: babylonchain/finality-provider
image: babylonlabs-io/finality-provider
command: fpd start
networks:
localnet:
Expand All @@ -159,7 +159,7 @@ services:

consumer-fp:
container_name: consumer-fp
image: babylonchain/finality-provider
image: babylonlabs-io/finality-provider
command: fpd start
networks:
localnet:
Expand All @@ -174,7 +174,7 @@ services:

eotsmanager:
container_name: eotsmanager
image: babylonchain/finality-provider
image: babylonlabs-io/finality-provider
command: eotsd start
networks:
localnet:
Expand All @@ -189,7 +189,7 @@ services:

consumer-eotsmanager:
container_name: consumer-eotsmanager
image: babylonchain/finality-provider
image: babylonlabs-io/finality-provider
command: eotsd start
networks:
localnet:
Expand All @@ -202,7 +202,7 @@ services:

covenant-emulator:
container_name: covenant-emulator
image: babylonchain/covenant-emulator
image: babylonlabs-io/covenant-emulator
command: covd start
networks:
localnet:
Expand All @@ -215,7 +215,7 @@ services:

ibcsim-bcd:
container_name: ibcsim-bcd
image: babylonchain/ibcsim-bcd
image: babylonlabs-io/ibcsim-bcd
ports:
- "5183:5183"
volumes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
; Logging level for all subsystems {trace, debug, info, warn, error, fatal}
LogLevel = debug

; the name of the consumer chain
ChainName = babylon
; the type of the consumer chain
ChainType = babylon

; The number of Schnorr public randomness for each commitment
NumPubRand = 100
Expand Down
Loading