zoneconcierge: permissioned integration #291

SebastianElvis · 2024-11-22T06:18:07Z

Resolves https://github.com/babylonlabs-io/pm/issues/44

This PR implements the permissioned integration and generic consumer registry, including

generic consumer registry compatible with Cosmos/ETH L2 consumers
parameter for governance gating consumer addition
ensuring IBC channel creation only when the IBC light client is in consumer registry
removing the Cosmos consumer registration upon IBC handshake in Babylon
removing the Cosmos consumer registration upon IBC handshake in Babylon contract
fuzz tests for Cosmos integration
e2e tests for Cosmos integration

ADR: https://github.com/babylonlabs-io/pm/pull/121
Accompanying PR in the contract side: babylonlabs-io/babylon-contract#87

There are two TODOs that will be addressed in subsequent PRs:

msg for removing registered consumer
fuzz/e2e test for ETH L2 integrations

Add finality contract instantiation

Adapt slashing tests

This reverts commit 837cd10.

This reverts commit 75482f0.

…egration

Accompanying with babylonlabs-io/babylon#291 This PR - bumps contract against the latest Babylon base branch - fixes all failed tests due to the bump - implements the consumer side logic of permissioned integration, mostly removing auto consumer registration

maurolacy

Partial review of the build targets / scripts and proto files.

Will review the code next.

.github/workflows/ci.yml

Makefile

contrib/images/ibcsim-bcd/Dockerfile

proto/babylon/btcstaking/v1/packet.proto

proto/babylon/btcstkconsumer/v1/btcstkconsumer.proto

proto/babylon/btcstkconsumer/v1/params.proto

proto/babylon/btcstkconsumer/v1/tx.proto

proto/babylon/zoneconcierge/v1/packet.proto

SebastianElvis · 2024-12-02T04:28:35Z

Thanks @maurolacy for the comments! I have revised all of them and answered some questions. Please feel free to take a look again

TODO before merging

merge chore: bump contract babylon-sdk#65

maurolacy

Looks good to me. Still have to take a look at tests (~~and related PR, next~~), but approving to unblock.

test/e2e/bytecode/babylon_contract.wasm

x/btcstaking/keeper/grpc_query.go

x/btcstkconsumer/types/expected_keepers.go

x/btcstkconsumer/types/params.go

Makefile

.github/workflows/ci.yml

contrib/images/ibcsim-bcd/Dockerfile

maurolacy

Some more comments related to tests / general setup.

test/e2e/btc_staking_integration_e2e_test.go

x/btcstkconsumer/keeper/msg_server.go

x/btcstkconsumer/keeper/msg_server_test.go

maurolacy · 2024-12-02T12:14:10Z

E2e tests are failing in my local:

    --- PASS: TestBCDConsumerIntegrationTestSuite/Test1ChainStartup (2.04s)
    --- PASS: TestBCDConsumerIntegrationTestSuite/Test2RegisterAndIntegrateConsumer (129.87s)
    --- PASS: TestBCDConsumerIntegrationTestSuite/Test3CreateConsumerFinalityProvider (13.45s)
    --- PASS: TestBCDConsumerIntegrationTestSuite/Test4RestakeDelegationToMultipleFPs (123.90s)
    --- FAIL: TestBCDConsumerIntegrationTestSuite/Test5ActivateDelegation (45.31s)
    --- FAIL: TestBCDConsumerIntegrationTestSuite/Test6ConsumerFPRewardsGeneration (60.96s)
    --- PASS: TestBCDConsumerIntegrationTestSuite/Test7BabylonFPCascadedSlashing (21.50s)
    --- FAIL: TestBCDConsumerIntegrationTestSuite/Test8ConsumerFPCascadedSlashing (378.03s)

maurolacy · 2024-12-02T12:34:22Z

Retrying the tests with rebuilt docker images. The IBC transfer back timeout should be extended still by five seconds or so.

maurolacy and others added 30 commits November 20, 2024 13:52

Fix: Consumer integration e2e test deps

41284f3

Fix: e2e test targets

427dc45

Disable broken / failing e2e tests from e2e target

bd8c221

Update copy / download contracts scripts

63f33d0

Update contracts to latest v0.11.0

53c3f30

Update babylon-sdk tag to (WIP) rewards e2e branch

b5b2d6a

Add babylon-sdk as sub-module

66ce706

Use babylon-sdk submodule ref during ibcsim-bcd build

326ec1e

Add finality contract instantiation

init

3ec459a

Add finality contract to e2e test setup

b2e98f0

Adapt slashing tests

Improve flaky IBC transfer back checks

f7e6b4f

Clean network before staking tests

9db92ee

Add consumer rewards test to bcd suite

837cd10

Update rewards e2e branch to latest

06a6aec

Rename to cc for consistency

21e977a

Add balance / balances grpc queries to consumer controller

ce11ec8

Revert "Add consumer rewards test to bcd suite"

8506e9e

This reverts commit 837cd10.

some rename

fd0f423

Now add consumer rewards test to bcd suite

75482f0

Revert "Now add consumer rewards test to bcd suite"

45059e0

This reverts commit 75482f0.

Now really add consumer rewards test to bcd suite

44917f0

Update rewards e2e branch to latest

bfa37b7

Add extra empty rewards check

b5325e9

Remove TODO

75f0103

rm auto consumer reg

2db01d0

ensure IBC light client existence upon IBC handshake

5a3862d

some tests

3929eb2

adjust e2e

84ee829

Move babylon-sdk to v0.6.0 tag

3738ab0

Fix gosimple lint

0ea6c23

bump contract

ff186b8

maurolacy force-pushed the f/consumer-reward-e2e branch from bc2e4bd to c71d416 Compare November 27, 2024 07:00

Base automatically changed from f/consumer-reward-e2e to base/consumer-chain-support November 27, 2024 07:28

SebastianElvis added 4 commits November 27, 2024 19:47

Merge branch 'base/consumer-chain-support' into feat/permissioned-int…

ac4ce0e

…egration

fix

0e03967

minor

6e1079a

try

eeacea5

SebastianElvis force-pushed the feat/permissioned-integration branch from c008aa5 to eeacea5 Compare November 28, 2024 03:10

SebastianElvis added 4 commits November 28, 2024 14:24

debug

a77060b

fix bcd image

6deca9e

minor

5b6f5c5

fix e2e

de84d88

SebastianElvis requested review from maurolacy and gusin13 November 28, 2024 04:16

SebastianElvis marked this pull request as ready for review November 28, 2024 04:16

SebastianElvis requested a review from a team as a code owner November 28, 2024 04:16

maurolacy reviewed Nov 29, 2024

View reviewed changes

SebastianElvis added 2 commits December 2, 2024 15:14

pr comments

c725217

point babylon sdk to main

6fec03a

SebastianElvis requested a review from maurolacy December 2, 2024 04:28

fix

a3f6322

maurolacy approved these changes Dec 2, 2024

View reviewed changes

maurolacy reviewed Dec 2, 2024

View reviewed changes

contrib/images/ibcsim-bcd/Dockerfile Outdated Show resolved Hide resolved

maurolacy reviewed Dec 2, 2024

View reviewed changes

test/e2e/btc_staking_integration_e2e_test.go Outdated Show resolved Hide resolved

x/btcstkconsumer/keeper/msg_server.go Show resolved Hide resolved

x/btcstkconsumer/keeper/msg_server_test.go Show resolved Hide resolved

pr comments

d8eccac

SebastianElvis merged commit 4898d8d into base/consumer-chain-support Dec 3, 2024
20 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

zoneconcierge: permissioned integration #291

zoneconcierge: permissioned integration #291

SebastianElvis commented Nov 22, 2024 •

edited

Loading

maurolacy left a comment

SebastianElvis commented Dec 2, 2024 •

edited

Loading

maurolacy left a comment •

edited

Loading

maurolacy left a comment

maurolacy commented Dec 2, 2024

maurolacy commented Dec 2, 2024 •

edited

Loading

zoneconcierge: permissioned integration #291

zoneconcierge: permissioned integration #291

Conversation

SebastianElvis commented Nov 22, 2024 • edited Loading

maurolacy left a comment

Choose a reason for hiding this comment

SebastianElvis commented Dec 2, 2024 • edited Loading

maurolacy left a comment • edited Loading

Choose a reason for hiding this comment

maurolacy left a comment

Choose a reason for hiding this comment

maurolacy commented Dec 2, 2024

maurolacy commented Dec 2, 2024 • edited Loading

SebastianElvis commented Nov 22, 2024 •

edited

Loading

SebastianElvis commented Dec 2, 2024 •

edited

Loading

maurolacy left a comment •

edited

Loading

maurolacy commented Dec 2, 2024 •

edited

Loading