Skip to content

Commit

Permalink
Merge branch 'develop' into test/deposit-btc-refund
Browse files Browse the repository at this point in the history
  • Loading branch information
swift1337 authored Jun 19, 2024
2 parents fcbc852 + d4a9f7d commit 3839a78
Show file tree
Hide file tree
Showing 44 changed files with 9 additions and 3,274 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/syncing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ body:
- type: dropdown
attributes:
label: Does your machine match the technical requirements?
description: See https://www.zetachain.com/docs/validators/requirements/
description: See https://www.zetachain.com/docs/nodes/start-here/requirements/
options:
- "Yes"
- "No"
- type: dropdown
attributes:
label: Have you completed the setup?
description: See https://www.zetachain.com/docs/validators/setup/
description: See https://www.zetachain.com/docs/nodes/start-here/setup/
options:
- "Yes"
- "No"
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile-localnet
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ RUN mkdir -p /root/.zetacored/cosmovisor/genesis/bin && \
ENV PATH /root/.zetacored/cosmovisor/current/bin/:/root/.zetaclientd/upgrades/current/:${PATH}

COPY contrib/localnet/scripts /root
COPY contrib/localnet/preparams /root/preparams
COPY contrib/localnet/ssh_config /root/.ssh/config
COPY contrib/localnet/zetacored /root/zetacored
COPY contrib/localnet/tss /root/tss

RUN chmod 755 /root/*.sh

Expand Down
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
* [2233](https://github.com/zeta-chain/node/pull/2233) - fix `IsSupported` flag not properly updated in zetaclient's context
* [2243](https://github.com/zeta-chain/node/pull/2243) - fix incorrect bitcoin outbound height in the CCTX outbound parameter
* [2256](https://github.com/zeta-chain/node/pull/2256) - fix rate limiter falsely included reverted non-withdraw cctxs
* [2327](https://github.com/zeta-chain/node/pull/2327) - partially cherry picked the fix to Bitcoin outbound dust amount

### CI

Expand Down
1 change: 0 additions & 1 deletion contrib/localnet/preparams/PreParams_zetaclient0.json

This file was deleted.

1 change: 0 additions & 1 deletion contrib/localnet/preparams/PreParams_zetaclient1.json

This file was deleted.

1 change: 0 additions & 1 deletion contrib/localnet/preparams/PreParams_zetaclient2.json

This file was deleted.

Loading

0 comments on commit 3839a78

Please sign in to comment.