Skip to content

Commit

Permalink
proto and config
Browse files Browse the repository at this point in the history
  • Loading branch information
SebastianElvis committed Jul 26, 2024
1 parent 02f16d2 commit 0fff12f
Show file tree
Hide file tree
Showing 56 changed files with 1,862 additions and 1,855 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ init-testnet-dirs: ## Initialize directories for testnet, creates a ./.testnets
# need to create the dir before hand so that the docker container has write access to the `.testnets` dir
# regardless of the user it uses
mkdir -p $(CURDIR)/.testnets && chmod o+w $(CURDIR)/.testnets
$(DOCKER) run --rm -v $(CURDIR)/.testnets:/home/babylon/.testnets:Z babylonchain/babylond \
$(DOCKER) run --rm -v $(CURDIR)/.testnets:/home/babylon/.testnets:Z babylonlabs-io/babylond \
babylond testnet init-files --v 4 -o /home/babylon/.testnets \
--starting-ip-address 192.168.10.2 --keyring-backend=test \
--chain-id chain-test --btc-confirmation-depth 2 --additional-sender-account true \
Expand Down
10 changes: 5 additions & 5 deletions contrib/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ RELAYER_TAG := $(shell grep '^ENV RELAYER_TAG' cosmos-relayer/Dockerfile | cut -
all: babylond cosmos-relayer

babylond: babylond-rmi
docker build --tag babylonchain/babylond -f babylond/Dockerfile \
docker build --tag babylonlabs-io/babylond -f babylond/Dockerfile \
$(shell git rev-parse --show-toplevel)

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

cosmos-relayer: cosmos-relayer-rmi
docker build --tag babylonchain/cosmos-relayer:${RELAYER_TAG} -f cosmos-relayer/Dockerfile \
docker build --tag babylonlabs-io/cosmos-relayer:${RELAYER_TAG} -f cosmos-relayer/Dockerfile \
$(shell git rev-parse --show-toplevel)/contrib/images/cosmos-relayer
docker tag babylonchain/cosmos-relayer:${RELAYER_TAG} babylonchain/cosmos-relayer:latest
docker tag babylonlabs-io/cosmos-relayer:${RELAYER_TAG} babylonlabs-io/cosmos-relayer:latest

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

.PHONY: all babylond cosmos-relayer babylond-rmi cosmos-relayer-rmi
2 changes: 1 addition & 1 deletion contrib/images/babylond/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN addgroup --gid 1137 --system babylon && adduser --uid 1137 --gid 1137 --syst
RUN apt-get update && apt-get install -y bash curl jq wget

# Label should match your github repo
LABEL org.opencontainers.image.source="https://github.com/babylonchain/babylond:${VERSION}"
LABEL org.opencontainers.image.source="https://github.com/babylonlabs-io/babylond:${VERSION}"

# Install libraries
# Cosmwasm - Download correct libwasmvm version
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3"
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 @@ -23,7 +23,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:

babylondnode2:
container_name: babylondnode2
image: "babylonchain/babylond"
image: "babylonlabs-io/babylond"
environment:
- LOG=${LOG:-babylond.log}
command: >
Expand All @@ -65,7 +65,7 @@ services:

babylondnode3:
container_name: babylondnode3
image: "babylonchain/babylond"
image: "babylonlabs-io/babylond"
environment:
- LOG=${LOG:-babylond.log}
command: >
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/containers/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ type ImageConfig struct {
//nolint:deadcode
const (
// name of babylon container produced by running `make localnet-build-env`
BabylonContainerName = "babylonchain/babylond"
BabylonContainerName = "babylonlabs-io/babylond"

hermesRelayerRepository = "informalsystems/hermes"
hermesRelayerTag = "v1.8.2"
// Built using the `build-cosmos-relayer-docker` target on an Intel (amd64) machine and pushed to ECR
cosmosRelayerRepository = "public.ecr.aws/t9e9i3h0/cosmos-relayer"
// TODO: Replace with version tag once we have a working version
cosmosRelayerTag = "main"
cosmosRelayerTag = "main"
)

// NewImageConfig returns ImageConfig needed for running e2e test.
Expand Down
7 changes: 5 additions & 2 deletions test/e2e/scripts/download_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -o nounset -o pipefail
command -v shellcheck >/dev/null && shellcheck "$0"

OWNER="babylonchain"
OWNER="babylonlabs-io"
REPO="babylon-contract"
CONTRACT="babylon_contract"
OUTPUT_FOLDER="$(dirname "$0")/../bytecode"
Expand All @@ -20,7 +20,10 @@ GH_TAGS="$GH_REPO/releases/tags/$TAG"
AUTH="Authorization: token $GITHUB_API_TOKEN"

# Validate token
curl -o /dev/null -sH "$AUTH" $GH_REPO || { echo "Error: Invalid repo, token or network issue!"; exit 1; }
curl -o /dev/null -sH "$AUTH" $GH_REPO || {
echo "Error: Invalid repo, token or network issue!"
exit 1
}

# Read asset tags
RESPONSE=$(curl -sH "$AUTH" "$GH_TAGS")
Expand Down
120 changes: 60 additions & 60 deletions x/btccheckpoint/types/btccheckpoint.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0fff12f

Please sign in to comment.