Skip to content

Commit

Permalink
Merge branch 'develop' into feat-bitcoin-Replace-By-Fee
Browse files Browse the repository at this point in the history
  • Loading branch information
ws4charlie authored Jan 8, 2025
2 parents c507687 + 47c9444 commit b991a37
Show file tree
Hide file tree
Showing 28 changed files with 278 additions and 1,011 deletions.
71 changes: 0 additions & 71 deletions .github/actions/build-docker-images-generic/action.yml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/actions/build-docker-images/action.yml

This file was deleted.

86 changes: 0 additions & 86 deletions .github/workflows/docker-build-and-push.yml

This file was deleted.

66 changes: 0 additions & 66 deletions Dockerfile

This file was deleted.

47 changes: 2 additions & 45 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ ifdef UPGRADE_TEST_FROM_SOURCE
zetanode-upgrade: e2e-images
@echo "Building zetanode-upgrade from source"
$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime-source \
--build-arg OLD_VERSION='release/v23' \
--build-arg OLD_VERSION='release/v24' \
--build-arg NODE_VERSION=$(NODE_VERSION) \
--build-arg NODE_COMMIT=$(NODE_COMMIT)
.
Expand All @@ -336,7 +336,7 @@ else
zetanode-upgrade: e2e-images
@echo "Building zetanode-upgrade from binaries"
$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime \
--build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v23.1.5' \
--build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v24.0.0' \
--build-arg NODE_VERSION=$(NODE_VERSION) \
--build-arg NODE_COMMIT=$(NODE_COMMIT) \
.
Expand Down Expand Up @@ -482,49 +482,6 @@ stop-eth-node-mainnet:
clean-eth-node-mainnet:
cd contrib/rpc/ethereum && DOCKER_TAG=$(DOCKER_TAG) docker-compose down -v

#ZETA

#FULL-NODE-RPC-FROM-BUILT-IMAGE
start-zetacored-rpc-mainnet:
cd contrib/rpc/zetacored && bash init_docker_compose.sh mainnet image $(DOCKER_TAG)

stop-zetacored-rpc-mainnet:
cd contrib/rpc/zetacored && bash kill_docker_compose.sh mainnet false

clean-zetacored-rpc-mainnet:
cd contrib/rpc/zetacored && bash kill_docker_compose.sh mainnet true

#FULL-NODE-RPC-FROM-BUILT-IMAGE
start-zetacored-rpc-testnet:
cd contrib/rpc/zetacored && bash init_docker_compose.sh athens3 image $(DOCKER_TAG)

stop-zetacored-rpc-testnet:
cd contrib/rpc/zetacored && bash kill_docker_compose.sh athens3 false

clean-zetacored-rpc-testnet:
cd contrib/rpc/zetacored && bash kill_docker_compose.sh athens3 true

#FULL-NODE-RPC-FROM-LOCAL-BUILD
start-zetacored-rpc-mainnet-localbuild:
cd contrib/rpc/zetacored && bash init_docker_compose.sh mainnet localbuild $(DOCKER_TAG)

stop-zetacored-rpc-mainnet-localbuild:
cd contrib/rpc/zetacored && bash kill_docker_compose.sh mainnet false

clean-zetacored-rpc-mainnet-localbuild:
cd contrib/rpc/zetacored && bash kill_docker_compose.sh mainnet true

#FULL-NODE-RPC-FROM-LOCAL-BUILD
start-zetacored-rpc-testnet-localbuild:
cd contrib/rpc/zetacored && bash init_docker_compose.sh athens3 localbuild $(DOCKER_TAG)

stop-zetacored-rpc-testnet-localbuild:
cd contrib/rpc/zetacored && bash kill_docker_compose.sh athens3 false

clean-zetacored-rpc-testnet-localbuild:
cd contrib/rpc/zetacored && bash kill_docker_compose.sh athens3 true


###############################################################################
### Debug Tools ###
###############################################################################
Expand Down
6 changes: 3 additions & 3 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# CHANGELOG

## Unreleased
## v25.0.0

### Features

* [3235](https://github.com/zeta-chain/node/pull/3235) - add /systemtime telemetry endpoint (zetaclient)
* [3317](https://github.com/zeta-chain/node/pull/3317) - add configurable signer latency correction (zetaclient)

* [3320](https://github.com/zeta-chain/node/pull/3320) - add zetaclient minimum version check

### Tests

Expand All @@ -15,7 +15,7 @@
* [3095](https://github.com/zeta-chain/node/pull/3095) - initialize simulation tests for custom zetachain modules
* [3276](https://github.com/zeta-chain/node/pull/3276) - add Solana E2E performance tests and improve Solana outbounds performance

## Refactor
### Refactor

* [3170](https://github.com/zeta-chain/node/pull/3170) - revamp TSS package in zetaclient
* [3291](https://github.com/zeta-chain/node/pull/3291) - revamp zetaclient initialization (+ graceful shutdown)
Expand Down
Loading

0 comments on commit b991a37

Please sign in to comment.