Skip to content

Commit

Permalink
Merge pull request #71 from informalsystems/ph/v0.38.x-upgrade
Browse files Browse the repository at this point in the history
Upgrade CometMock to be compatible with v0.38.x CometBFT/v0.50.0-rc.1 Cosmos SDK
  • Loading branch information
p-offtermatt authored Oct 10, 2023
2 parents 621841c + 34ab1a0 commit c8f55fe
Show file tree
Hide file tree
Showing 18 changed files with 1,761 additions and 539 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ on:
schedule:
- cron: '38 20 * * *'
push:
branches: [ "main", "v0.37.x", "v0.34.x" ]
branches: [ "main", "v0.38.x", "v0.37.x", "v0.34.x" ]
# Publish semver tags as releases.
tags: [ 'v*.*.*' ]
pull_request:
branches: [ "main", "v0.37.x", "v0.34.x" ]
branches: [ "main", "v0.38.x", "v0.37.x", "v0.34.x" ]

env:
# Use docker.io for Docker Hub if empty
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ on:
push:
branches:
- main
- v0.38.x
- v0.37.x
- v0.34.x
pull_request:
branches:
- main
- v0.38.x
- v0.37.x
- v0.34.x
jobs:
Expand Down
8 changes: 8 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ defaults:
- "{{ author }}"

pull_request_rules:
- name: Backport patches to the v0.38.x branch
conditions:
- base=main
- label=A:backport/v0.38.x
actions:
backport:
branches:
- v0.38.x
- name: Backport patches to the v0.37.x branch
conditions:
- base=main
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine
FROM golang:1.21-alpine

ENV PACKAGES curl make git libc-dev bash gcc linux-headers
RUN apk add --no-cache $PACKAGES
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-test
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# import simd from ibc-go
FROM ghcr.io/cosmos/simapp:v0.47 AS simapp-builder
FROM ghcr.io/cosmos/simapp:0.50.0-rc.1 AS simapp-builder

FROM golang:1.20-alpine as cometmock-builder
FROM golang:1.21-alpine as cometmock-builder

ENV PACKAGES curl make git libc-dev bash gcc linux-headers
RUN apk add --no-cache $PACKAGES
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ controlling which validators sign blocks,

On a technical level, CometMock communicates with applications via ABCI through GRPC or TSP (Tendermint Socket Protocol) calls. It calls BeginBlock, DeliverTx, EndBlock and Commit like CometBFT does during normal execution.

Currently, CometMock maintains releases compatible with CometBFT v0.37 and v0.34, see branches [v0.34.x](https://github.com/informalsystems/CometMock/tree/v0.34.x) and [v0.37.x](https://github.com/informalsystems/CometMock/tree/v0.37.x). It offers *many* of the RPC endpoints offered by Comet (see https://docs.cometbft.com/v0.34/rpc/ and https://docs.cometbft.com/v0.37/rpc/ for the respective version of the interface),
Currently, CometMock maintains releases compatible with CometBFT v0.38, v0.37 and v0.34, see branches [v0.34.x](https://github.com/informalsystems/CometMock/tree/v0.34.x), [v0.37.x](https://github.com/informalsystems/CometMock/tree/v0.37.x) and [v0.38.x](https://github.com/informalsystems/CometMock/tree/v0.38.x). It offers *many* of the RPC endpoints offered by Comet (see https://docs.cometbft.com/v0.34/rpc/, https://docs.cometbft.com/v0.37/rpc/ and https://docs.cometbft.com/v0.38/rpc/ for the respective version of the interface),
in particular it supports the subset used by Gorelayer (https://github.com/cosmos/relayer/).
See the endpoints offered here: [https://github.com/informalsystems/CometMock/cometmock/rpc_server/routes.go#L30C2-L53](https://github.com/informalsystems/CometMock/blob/main/cometmock/rpc_server/routes.go)

Expand Down
Loading

0 comments on commit c8f55fe

Please sign in to comment.