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

Jump to bottom

Forward slashing events to the contract for processing #187

Merged
merged 10 commits into from
Sep 6, 2024
Merged

Forward slashing events to the contract for processing #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eaa506d
init slashing
vuong177 Aug 1, 2024
8877fd9
foward jailed list to native staking contract
Aug 22, 2024
60f190d
nit
vuong177 Aug 22, 2024
aa0f830
Merge branch 'main' into vuong/handle-slashing
vuong177 Aug 26, 2024
bcf1dae
Separate provider app and consumer app
trinitys7 Aug 30, 2024
3b26cde
Finish logic and test slashing provider chain
trinitys7 Aug 30, 2024
1f64b04
Fix build
trinitys7 Sep 4, 2024
911ad39
Build push docker
trinitys7 Sep 4, 2024
06877db
Fix build push docker
trinitys7 Sep 4, 2024
c67c5b2
merge main
trinitys7 Sep 6, 2024
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
13 changes: 12 additions & 1 deletion .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ jobs:
- name: Publish to GitHub Packages
uses: docker/build-push-action@v4
with:
file: consumer.Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
tags: |
ghcr.io/osmosis-labs/meshconsumerd:latest

- name: Publish to GitHub Packages
uses: docker/build-push-action@v4
with:
file: provider.Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: |
ghcr.io/osmosis-labs/meshproviderd:latest
8 changes: 4 additions & 4 deletions Dockerfile → consumer.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ COPY . /code
# then log output of file /code/bin/meshd
# then ensure static linking
RUN cd demo/ && LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build \
&& file /code/demo/build/meshd \
&& file /code/demo/build/meshconsumerd \
&& echo "Ensuring binary is statically linked ..." \
&& (file /code/demo/build/meshd | grep "statically linked")
&& (file /code/demo/build/meshconsumerd | grep "statically linked")

# --------------------------------------------------------
FROM alpine:3.17

COPY --from=go-builder /code/demo/build/meshd /usr/bin/meshd
COPY --from=go-builder /code/demo/build/meshconsumerd /usr/bin/meshconsumerd

# Install dependencies used for Starship
RUN apk add --no-cache curl make bash jq sed
Expand All @@ -38,4 +38,4 @@ WORKDIR /opt
# rest server, tendermint p2p, tendermint rpc
EXPOSE 1317 26656 26657

CMD ["/usr/bin/meshd", "version"]
CMD ["/usr/bin/meshconsumerd", "version"]
19 changes: 13 additions & 6 deletions demo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,30 @@ ifeq ($(OS),Windows_NT)
$(error mesh demo server not supported)
exit 1
else
go build -mod=readonly $(BUILD_FLAGS) -o $(BUILD_DIR)/$(APPNAME) ./cmd/meshd
go build -mod=readonly $(BUILD_FLAGS) -o $(BUILD_DIR)/meshconsumerd ./cmd/meshconsumerd
go build -mod=readonly $(BUILD_FLAGS) -o $(BUILD_DIR)/meshproviderd ./cmd/meshproviderd
endif

build-vendored:
go build -mod=vendor $(BUILD_FLAGS) -o $(BUILD_DIR)/$(APPNAME) ./cmd/meshd
go build -mod=vendor $(BUILD_FLAGS) -o $(BUILD_DIR)/meshconsumerd ./cmd/meshconsumerd
go build -mod=vendor $(BUILD_FLAGS) -o $(BUILD_DIR)/meshproviderd ./cmd/meshproviderd

build-linux-static:
go mod vendor # quick hack to make local dependencies work in Docker
mkdir -p $(BUILD_DIR)
docker build --tag osmosis/meshd:local ./
docker create --name meshd_temp osmosis/meshd:local
docker cp meshd_temp:/usr/bin/meshd $(BUILD_DIR)/
docker build --tag osmosis/meshconsumerd:local -f consumer.Dockerfile ./
docker build --tag osmosis/meshproviderd:local -f provider.Dockerfile ./
docker create --name meshd_temp osmosis/meshconsumerd:local
docker cp meshd_temp:/usr/bin/meshconsumerd $(BUILD_DIR)/
docker rm -f meshd_temp
docker create --name meshd_temp osmosis/meshproviderd:local
docker cp meshd_temp:/usr/bin/meshproviderd $(BUILD_DIR)/
docker rm -f meshd_temp
rm -rf vendor/

install:
go install -mod=readonly $(BUILD_FLAGS) ./cmd/meshd
go install -mod=readonly $(BUILD_FLAGS) ./cmd/meshconsumerd
go install -mod=readonly $(BUILD_FLAGS) ./cmd/meshproviderd

########################################
### Testing
Expand Down
Loading
Loading