fix: merge base to main #62

SebastianElvis · 2024-09-23T02:47:33Z

Resolves #300

This PR merges base branch to main

NOTE: all comments in this PR are addressed in #315

* Init * Update babylon-private reference * Revert "CI: Remove redundant SSH key logic (#218)"

* Add create and check FPs by chain support * Add consumer FP registration check * go lint * Improve error handling * Make chainID string * Adjust comment

…340)

…inalizedBlock()` (#347)

When error occurs, `block` is `nil` and `block.Height` will cause a nil pointer panic. Uncovered in local deployment

…cessed when e2e tests fails (#405)

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.

.github/workflows/ci.yml

+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.23'
+      - name: Run e2e Babylon tests
+        run: make test-e2e-babylon
+
+  e2e_bcd:


.github/workflows/ci.yml

+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.23'
+      - name: Run e2e BCD tests
+        run: make test-e2e-bcd
+
+  e2e_op:


.github/workflows/publish.yml

+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.23'
+      - name: Run e2e Babylon tests
+        run: make test-e2e-babylon
+
+  e2e_bcd:


Lazar955

amazing work, will continue reviewing as there's quite a lot of new code for a single session, some comments

cosmwasmclient/query/tendermint.go

itest/babylon/babylon_test_manager.go

itest/bytecode/version.txt

clientcontroller/babylon/babylon.go

gitferry

Great work! I didn't look into details about consumer implementations. Comments mostly about some questions and cleanups. No blocker from my side.

.github/workflows/publish.yml

clientcontroller/babylon/babylon.go

gitferry · 2025-02-04T04:24:53Z

clientcontroller/babylon/babylon.go

+	if res == nil {
+		return &types.TxResponse{}, nil


how could this case happen?

This was actually introduced at #124 by you 😅 Do you remember any context?

clientcontroller/babylon/babylon.go

metrics/tools/go.mod

metrics/tools/tools.go

gitferry · 2025-02-04T04:55:07Z

tools/go.mod

types/pub_rand_commit.go

gitferry · 2025-02-04T05:00:47Z

Is this compatible with phase-2?

Lazar955

Still not done with the review, half way through

cosmwasmclient/client/client.go

SebastianElvis · 2025-02-05T05:24:56Z

Is this compatible with phase-2?

I think so, as the Babylon interfaces used by FP are not changed between Babylon phase-2/3. The e2e test also passes

Nevertheless, I'm also concerned that this merge might mess up with the FP for phase-2, and would require another round of security audit. In this case @KonradStaniec Should we release FP for phase-2 like what we do in Babylon node?

gitferry · 2025-02-05T06:12:28Z

I think so, as the Babylon interfaces used by FP are not changed between Babylon phase-2/3. The e2e test also passes

Nevertheless, I'm also concerned that this merge might mess up with the FP for phase-2, and would require another round of security audit. In this case @KonradStaniec Should we release FP for phase-2 like what we do in Babylon node?

We probably should do this

KonradStaniec · 2025-02-05T08:13:44Z

Scanned the pr and it seems:

that it does not modify the core logic (fp_instance) that much, which is good
it adds a lot of of new code, which indeed will be trouble some in case of audits. Not to mention any future incidents etc.

So, I agree that we can't mix integration and v1 effort here.

I think the easiest solution is what @SebastianElvis proposed here i.e

create long running release/v1.x branch before merging this pr to main
from release/v1.x branch cut the release of v1.0.0-rc.0 finality provider
later progress with backports from main as in Babylon repo.

There will be some additional over head, but:

the efforts will be neatly separated (i.e v1 FP is strictly for Babylon, v2 will be for Babylon + Integrations)
rc.X versions still do not promise stability so we can extend this period for some time.

Does anybody has any other suggestion / ideas ? :)

Lazar955

Amazing work! Let's merge other PR's into this

SebastianElvis · 2025-02-06T01:57:10Z

create long running release/v1.x branch before merging this pr to main

from release/v1.x branch cut the release of v1.0.0-rc.0 finality provider

later progress with backports from main as in Babylon repo.

Agree with this plan. Will wait for more review and the v1 release before merging this PR.

This PR fixes comments to #62 and adds changelog for it

.github/workflows/publish.yml

+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.23'
+      - name: Run e2e BCD tests
+        run: make test-e2e-bcd
+
+  e2e_op:


This PR fixes some bugs found through local deployment babylonlabs-io/babylon-integration-deployment#32

Resolves #31 This PR provides the setup for phase-3 devnet 6. TODOs - [x] Tag Babylon snapshot - [x] Merge babylonlabs-io/finality-provider#62 - [x] Merge babylonlabs-io/btc-staker#114 - [x] Tag btc-staker snapshot - [x] Tag Babylon contract - [x] Merge babylonlabs-io/babylon-sdk#80 - [x] Tag Babylon SDK snapshot - [x] Fix deployment - [x] Tag Babylon - [x] Tag Babylon SDK - [x] Merge babylonlabs-io/finality-provider#335 - [x] Merge babylonlabs-io/finality-provider#333 - [x] Tag finality-provider

maurolacy and others added 30 commits June 5, 2024 21:17

Consumer chain finality provider (#276)

b79ac31

* Init * Update babylon-private reference * Revert "CI: Remove redundant SSH key logic (#218)"

Consumer FP registration test (#278)

2fe3761

* Add create and check FPs by chain support * Add consumer FP registration check * go lint * Improve error handling * Make chainID string * Adjust comment

fix flaky e2e test

c8ef884

cd: Allows base/consumer-chain-support branch to run push_docker job (#…

d033913

…340)

feat: support op-stack based L2 consumer chain (#348)

01dbfb5

refactor: QueryLatestFinalizedBlocks(count uint64) -> `QueryLatestF…

2cc4a79

…inalizedBlock()` (#347)

fix: fix lint/e2e error (#365)

74a575a

e2e: wasmd setup (#364)

4d9ab4d

feat: wasmd clients (#368)

aa0b45f

refactor: remove unused config in wasmd client (#376)

db20361

refactor: update TxResponse with generic Events (#377)

ae5f150

tests: submit finality sig to contract using admin (#374)

77aa7b5

feat: OPStack L2 consumer controller (#379)

c8d7d87

fix: typo in OPStack clientcontroller (#384)

1f0ceb7

feat: the queries for OPStack L2 consumer (#383)

fef9405

feat: query activated height (#387)

d9ae69c

feat: queries for OPStack L2 (#392)

a6f03b6

feat: cosmwasm consumer queries (#381)

6d7b6ba

chore: bump babylon and fix pub rand consumer query (#382)

9182921

chore: fix nil pointer (#394)

693ea70

When error occurs, `block` is `nil` and `block.Height` will cause a nil pointer panic. Uncovered in local deployment

chore: remove duplicate codes (#396)

9d06176

test: add e2e tests for opL2Stack consumer controller (#398)

663f7aa

test: add e2e tests for opL2Stack consumer controller - 2/x (#400)

36c9a39

fix: fast sync for consumer (#401)

f5336cc

fix: revert the pr #401 commit (#402)

80d32c8

fix: init pubrand empty issue (#404)

fd43ce4

chore: add clean-e2e command to kill dangling babylond or wasmd pro…

a098d66

…cessed when e2e tests fails (#405)

refactor: expose a few private names from e2e test (#406)

17e8099

fix: parse cw data with null (#408)

00ee33b

chore: fix typo and duplicated codes (#409)

c069b0a

SebastianElvis and others added 2 commits February 3, 2025 18:00

Merge branch 'main' into merbe-main-to-base-2025

8a8f4de

github-advanced-security bot found potential problems Feb 3, 2025

View reviewed changes

SebastianElvis changed the title ~~[DO NOT MERGE] Diff between dev and base branch~~ fix: merge base to main Feb 3, 2025

SebastianElvis requested review from gitferry, KonradStaniec, Lazar955, RafilxTenfen, gusin13 and maurolacy February 3, 2025 11:24

SebastianElvis marked this pull request as ready for review February 3, 2025 11:50

Lazar955 reviewed Feb 3, 2025

View reviewed changes

cosmwasmclient/query/tendermint.go Outdated Show resolved Hide resolved

itest/babylon/babylon_test_manager.go Outdated Show resolved Hide resolved

itest/bytecode/version.txt Show resolved Hide resolved

Lazar955 reviewed Feb 3, 2025

View reviewed changes

clientcontroller/babylon/babylon.go Outdated Show resolved Hide resolved

SebastianElvis mentioned this pull request Feb 4, 2025

fix: fix comments to base branch #315

Merged

gitferry approved these changes Feb 4, 2025

View reviewed changes

Lazar955 reviewed Feb 4, 2025

View reviewed changes

cosmwasmclient/client/client.go Outdated Show resolved Hide resolved

SebastianElvis mentioned this pull request Feb 5, 2025

e2e: use Docker container for bcd in Cosmos integration e2e tests #322

Open

Lazar955 approved these changes Feb 5, 2025

View reviewed changes

SebastianElvis mentioned this pull request Feb 6, 2025

phase-3 devnet 6 setup babylonlabs-io/babylon-integration-deployment#32

Merged

13 tasks

fix: fix comments to base branch (#315)

5a3dee2

This PR fixes comments to #62 and adds changelog for it

github-advanced-security bot found potential problems Feb 6, 2025

View reviewed changes

fix: config validation and flaky babylon e2e (#325)

a8a436a

This PR fixes some bugs found through local deployment babylonlabs-io/babylon-integration-deployment#32

KonradStaniec approved these changes Feb 10, 2025

View reviewed changes

filippos47 merged commit 57fed8d into main Feb 10, 2025
38 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: merge base to main #62

fix: merge base to main #62

SebastianElvis commented Sep 23, 2024 •

edited

Loading

Lazar955 left a comment

gitferry left a comment

gitferry Feb 4, 2025

SebastianElvis Feb 5, 2025

gitferry Feb 4, 2025

gitferry commented Feb 4, 2025

Lazar955 left a comment

SebastianElvis commented Feb 5, 2025 •

edited

Loading

gitferry commented Feb 5, 2025

KonradStaniec commented Feb 5, 2025 •

edited

Loading

Lazar955 left a comment

SebastianElvis commented Feb 6, 2025

fix: merge base to main #62

fix: merge base to main #62

Conversation

SebastianElvis commented Sep 23, 2024 • edited Loading

Lazar955 left a comment

Choose a reason for hiding this comment

gitferry left a comment

Choose a reason for hiding this comment

gitferry Feb 4, 2025

Choose a reason for hiding this comment

SebastianElvis Feb 5, 2025

Choose a reason for hiding this comment

gitferry Feb 4, 2025

Choose a reason for hiding this comment

gitferry commented Feb 4, 2025

Lazar955 left a comment

Choose a reason for hiding this comment

SebastianElvis commented Feb 5, 2025 • edited Loading

gitferry commented Feb 5, 2025

KonradStaniec commented Feb 5, 2025 • edited Loading

Lazar955 left a comment

Choose a reason for hiding this comment

SebastianElvis commented Feb 6, 2025

SebastianElvis commented Sep 23, 2024 •

edited

Loading

SebastianElvis commented Feb 5, 2025 •

edited

Loading

KonradStaniec commented Feb 5, 2025 •

edited

Loading