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

feat: merge base branch to main #402

Merged
merged 94 commits into from
Jan 23, 2025
Merged

feat: merge base branch to main #402

merged 94 commits into from
Jan 23, 2025

Conversation

SebastianElvis
Copy link
Member

@SebastianElvis SebastianElvis commented Jan 14, 2025 •
edited
Loading

This PR merges the base branch with phase-3 codebase to main.

Comparison between base and main: https://babylonlabs.atlassian.net/wiki/spaces/BABYLON/pages/5905879

SebastianElvis and others added 30 commits July 4, 2024 15:42
@SebastianElvis
integration: set up x/btcstkconsumer module (#206)
2207f55
@maurolacy
F/consumer chain registry (#205)
88f891c 
* Add chain register struct
* Add chain registry
* Add chain registry test
* Add chain registry queries
* Add chain registry queries tests
* Add register chain msg
* Add register chain msg routing / impl
* Update proto/babylon/zoneconcierge/v1/tx.proto
* Flatten chain register proto
* Remove authority from register chain msg
* Add chain not registered check
* Add chain already registered check
* Update / fix comment
* Add registry related queries to rpc server
* Fix indentation
* Fix: Add signer field to register chain msg
* Fix: Own / unique query param / response for list registry
@maurolacy @SebastianElvis
F/consumer chain registry 2 (#209)
f4b88ab 
* Move btcstkconsumer proto files under v1/ for consistency
* Move register chain protos from zoneconcierge to btcstkconsumer
* Refactor chain registry into btcstkconsumer
* Fix: proto / code lints
* Pass chain register pointer

Co-authored-by: Runchao Han <[email protected]>
@maurolacy
F/register codecs (#210)
873cfce 
* Register zoneconcierge msg codecs
* Register btcstkconsumer msg codecs
@maurolacy
F/consumer FP registry (#216)
7928f66 
* Add chain id to finality provider
* Add finality provider registry
* Update fps per chain id registry
* Remove commented line
* FP registers only non-canonical chains
* Add FP registry test
* Add registered chain check
* Add registration check to fp registry test
* Remove optional from chain id
* Add own CZ chains FPs store
* Store CZ chains FPs in their own store
* Adjust names / tests
* Refactor fp consumer registry
* Adapt tests
* Rename for clarity
* Add FP CZ chains registry queries
* Add FP consumer query tests
* Adapt test
* Add chain id to fp query response
* Remove useless slash condition check
* Improve error msg
* Move type builder to types package
@maurolacy
F/consumer fp registry 2 (#220)
a4d244c 
* Add chains per FP BTC PubKey store
* Ensure CZ chains FP does not already exist
* Fix: Return err explicitly instead of nil
@SebastianElvis
handling restaked BTC delegations to consumer FPs (#222)
65657d1
@maurolacy
F/consumer chain cli (#221)
0c5d6aa 
* Fix typos
* Add register chain cli tx
* Add chain id to btcstaking create-finality-provider
* Add get finality provider by chain queries
* Add registered chains cli queries
* Add FZ FP chain id query type
* Add get CZ FP chain getter / query
* Add grpc query. Adjust grpc query paths
* Add CZ FP registered chain cli query cmd
* Fix: Add tx flags for register chain cmd
* Turn consumer chain id into a flag instead of a param
* Fix params module import
* Add hook to query consumer fps through btcstaking
Update CHANGELOG
76efc0d
@SebastianElvis
fix: only calculating Babylon FPs for FP set rotation (#223)
ce164ea
Update CHANGELOG
5c15e74
@SebastianElvis
fix
b98b20e
@maurolacy
R/consumer chain 2 (#224)
0a6e9f8 
* Rename consumer keys for clarity
* Rename btc staking consumer methods
* Rename consumer delegation private methods
* Move consumer delegations to btcstaking
* Refactor BTC delegations into one store
* Simplify logic
* Improve comments
@SebastianElvis
linting validateRestakedFPs
c94b5f5
@SebastianElvis
proto: define IBC packet formats for PoS integration (#229)
4c1e0d5
@SebastianElvis
zoneconcierge: let zoneconcierge hold a pointer to btcstaking module (#…
56b21f4 
…232)
@gusin13
tests: Add pos-integration E2E Tests (#225)
4601ff5
@SebastianElvis
chore: fix some proto formats for IBC packets (#234)
27f7072
@SebastianElvis
chore: rename chain to consumer for PoS integration (#233)
78120b3
@SebastianElvis
btcstkconsumer: separate IBC packet for provider / consumer (#237)
038943a
@gusin13
feat: Store btcstaking events in kv store and send IBC packet (#235)
8f134e1
@gusin13
tests: btcstaking events e2e tests (#240)
1ed7149
@SebastianElvis
release v0.2.0 rc0 (#245)
61ef003
@hiepmai-babylonchain
cd: Allows base/consumer-chain-support branch to run push_docker job (#…
49663ec 
…248)
@SebastianElvis
btcstkconsumer: RPC functions for BTC staking consumer module (#247)
5f8413b
@maurolacy
Fix/babylon update (#253)
5701ec9 
* Add needed (for babylon as Consumer) staking capability
* Upgrade contracts from latest babylon-contract
* Support Mac arm64 arch in passing for copy local wasm
* Fix: FP fields protobuf sequence numbers
* Update contracts to latest
* Fix: make proto-gen
* Trim unused fields from new finality provider IBC msg
* Update protobuf gens
* Update code refs
@gusin13
tests: Add undelegation and fp voting power test cases (#254)
a0ec504
@lesterli
feat: Add cosmwasm_2_0 to wasmCapabilities (#255)
5d00627
@lesterli
feat: Add Grpc querier (#257)
db66211
@lesterli
chore: remove aarch64 wasm (#261)
265678f
@SebastianElvis
Copy link
Member Author

Thanks @RafilxTenfen for the second wave of comments. Addressed them in #424

maurolacy
maurolacy approved these changes Jan 21, 2025
View reviewed changes
Copy link
Contributor

@maurolacy maurolacy left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Reviewed more or less everything, except for the re-added zoneconcierge module. Perhaps it's a good idea to compare the x/zoneconcierge directory here with the latest version (before deletion) from main; to confirm we're not losing any potential new addition there.

CHANGELOG.md Outdated
@@ -31,7 +31,35 @@ Ref: https://keepachangelog.com/en/1.0.0/

# Changelog

All notable changes to this project will be documented in this file.
## [Unreleased](https://github.com/babylonchain/babylon-private/tree/HEAD)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This need updating. Likely after merge.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, addressed at a7e939d

KonradStaniec
KonradStaniec approved these changes Jan 21, 2025
View reviewed changes
Copy link
Collaborator

@KonradStaniec KonradStaniec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! just minor comments about changelog.

Lets wait for other core team members approval before merging though.

CHANGELOG.md Outdated

[Full Changelog](https://github.com/babylonchain/babylon-private/compare/euphrates-0.1.0-rc.1...euphrates-v0.2.0-rc.0)

## [euphrates-0.1.0-rc.1](https://github.com/babylonchain/babylon-private/tree/euphrates-0.1.0-rc.1) (2024-03-25)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tbh I would delete all those sub points and in ## Unreleased section add Babylon Multi staking support
pointing to this pr. (probably under State breaking sub titlte`)

And in this pr description add links to most relevat pr's

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, addressed at a7e939d

RafilxTenfen
RafilxTenfen approved these changes Jan 21, 2025
View reviewed changes
Copy link
Contributor

@RafilxTenfen RafilxTenfen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after the merge of #424

Lazar955
Lazar955 approved these changes Jan 21, 2025
View reviewed changes
Copy link
Member

@Lazar955 Lazar955 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! Let's not forget to merge #424

@SebastianElvis
Copy link
Member Author

Created #431 to track the task for tightening the cross-module dependencies. Cannot find the discussion anymore so put it here

github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 22, 2025
View reviewed changes
.github/workflows/ci.yml Outdated
Comment on lines 197 to 230
if: false
needs: [e2e-docker-build-babylon, e2e-docker-build-e2e-init-chain]
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Download babylon artifact
uses: actions/download-artifact@v4
with:
name: babylond-${{ github.sha }}
path: /tmp
- name: Download init-chain artifact
uses: actions/download-artifact@v4
with:
name: init-chain
path: /tmp
- name: Docker load babylond
run: |
docker load < /tmp/docker-babylond.tar.gz

- name: Docker load init chain
run: |
docker load < /tmp/docker-init-chain.tar.gz

- name: Cache Go
uses: actions/setup-go@v5
with:
go-version: 1.23
- name: Run e2e TestSoftwareUpgradeV1TestnetTestSuite
run: |
sudo make test-e2e-cache-upgrade-v1
- name: Dump docker logs on failure
if: failure()
uses: jwalton/gh-docker-logs@v2
uses: jwalton/gh-docker-logs@v2

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions Job or Workflow does not set permissions
.github/workflows/ci.yml
sudo make test-e2e-cache-upgrade-v1
- name: Dump docker logs on failure
if: failure()
uses: jwalton/gh-docker-logs@v2
uses: jwalton/gh-docker-logs@v2

Check warning

Code scanning / CodeQL

Unpinned tag for a non-immutable Action in workflow Medium

Unpinned 3rd party Action 'ci' step
Uses Step
Loading
uses 'jwalton/gh-docker-logs' with ref 'v2', not a pinned commit hash
gitferry
gitferry approved these changes Jan 23, 2025
View reviewed changes
Copy link
Member

@gitferry gitferry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for addressing all the comments. No blocker from my side. Let's go!

@KonradStaniec KonradStaniec mentioned this pull request Jan 23, 2025
Merged
@filippos47 filippos47 merged commit 10905e7 into main Jan 23, 2025
24 checks passed
@filippos47 filippos47 deleted the base/consumer-chain-support branch January 29, 2025 09:53
SebastianElvis added a commit to babylonlabs-io/babylon-sdk that referenced this pull request Feb 3, 2025
@SebastianElvis
fix: bump babylon and fix instantiate-babylon-contracts cmd (#78)
1254d0d 
This PR bumps Babylon version and fixes a bug in the
`instantiate-babylon-contracts` cmd, found during debugging e2e tests

TODOs before merge

- [x] merge babylonlabs-io/babylon#402
- [x] change to babylon main branch snapshot version
filippos47 added a commit to babylonlabs-io/finality-provider that referenced this pull request Feb 3, 2025
@filippos47
fix: merge main to base (#281)
56354ad 
Resolves #300 

This PR merges the latest `main` to the base branch.

- [x] merge babylonlabs-io/babylon#402
- [x] fix linters / unit tests
- [x] fix e2e

NOTE: CI pipelines using Docker registry do not work for some reason,
asking devops atm. All e2e tests pass locally.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RafilxTenfen RafilxTenfen RafilxTenfen approved these changes

@gitferry gitferry gitferry approved these changes

@KonradStaniec KonradStaniec KonradStaniec approved these changes

@maurolacy maurolacy maurolacy approved these changes

@Lazar955 Lazar955 Lazar955 approved these changes

@vitsalis vitsalis Awaiting requested review from vitsalis

@samricotta samricotta Awaiting requested review from samricotta

@gusin13 gusin13 Awaiting requested review from gusin13

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@SebastianElvis @gitferry @KonradStaniec @maurolacy @Lazar955 @RafilxTenfen @filippos47 @gusin13 @hiepmai-babylonchain @lesterli