这是indexloc提供的服务，不要输入任何密码
Skip to content

chore: bump bbn v3, contracts, bbn sdk #595

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

Merged
merged 4 commits into from
Aug 7, 2025
Merged

chore: bump bbn v3, contracts, bbn sdk #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d43e167
wip debug cosmos
Lazar955 Aug 7, 2025
d1889a2
cosmos e2e pass
Lazar955 Aug 7, 2025
89b2ce3
✍️ changelog
Lazar955 Aug 7, 2025
c7cf23a
rm skip on flaky test
Lazar955 Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
rollup: sparse pub rand commit leftovers
* [#594](https://github.com/babylonlabs-io/finality-provider/pull/594)
chore(rollup): remove allowlist requirement for starting rollup FP
* [#595](https://github.com/babylonlabs-io/finality-provider/pull/595)
chore: bump bbn v3, contracts, bbn sdk

## v1.1.0-rc.1

Expand Down
14 changes: 6 additions & 8 deletions bsn/cosmos/clientcontroller/consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ func (wc *CosmwasmConsumerController) QueryLatestBlockHeight(ctx context.Context

func (wc *CosmwasmConsumerController) QueryFinalityActivationBlockHeight(ctx context.Context) (uint64, error) {
// Construct the query message
queryMsg := QueryMsgActivatedHeight{
ActivatedHeight: struct{}{},
queryMsg := QueryMsgFinalityConfig{
FinalityConfig: struct{}{},
}

// Marshal the query message to JSON
Expand All @@ -357,21 +357,19 @@ func (wc *CosmwasmConsumerController) QueryFinalityActivationBlockHeight(ctx con
}

// Query the smart contract state
dataFromContract, err := wc.QuerySmartContractState(ctx, wc.cfg.BtcStakingContractAddress, string(queryMsgBytes))
dataFromContract, err := wc.QuerySmartContractState(ctx, wc.cfg.BtcFinalityContractAddress, string(queryMsgBytes))
if err != nil {
return 0, fmt.Errorf("failed to query smart contract state: %w", err)
}

// Unmarshal the response
var resp struct {
Height uint64 `json:"height"`
}
err = json.Unmarshal(dataFromContract.Data, &resp) // #nosec G115
var fcr FinalityConfigResponse
err = json.Unmarshal(dataFromContract.Data, &fcr) // #nosec G115
if err != nil {
return 0, fmt.Errorf("failed to unmarshal response: %w", err)
}

return resp.Height, nil
return fcr.FinalityActivationHeight, nil
}

func (wc *CosmwasmConsumerController) QueryLatestBlock(ctx context.Context) (fptypes.BlockDescription, error) {
Expand Down
18 changes: 17 additions & 1 deletion bsn/cosmos/clientcontroller/msg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ type BlocksQuery struct {
}

type QueryMsgActivatedHeight struct {
ActivatedHeight struct{} `json:"activated_height"`
ActivationHeight struct{} `json:"activation_height"`
}

type QueryMsgFinalitySignature struct {
Expand Down Expand Up @@ -254,3 +254,19 @@ type FinalityProviderPowerQuery struct {
type ConsumerFpPowerResponse struct {
Power uint64 `json:"power"`
}

type QueryMsgFinalityConfig struct {
FinalityConfig struct{} `json:"config"`
}

type FinalityConfigResponse struct {
Denom string `json:"denom"`
BabylonAddr string `json:"babylon"`
StakingAddr string `json:"staking"`
MaxActiveFinalityProviders uint32 `json:"max_active_finality_providers"`
MinPubRand uint64 `json:"min_pub_rand"`
RewardInterval uint64 `json:"reward_interval"`
MissedBlocksWindow uint64 `json:"missed_blocks_window"`
JailDuration uint64 `json:"jail_duration"`
FinalityActivationHeight uint64 `json:"finality_activation_height"`
}
Binary file modified bsn/cosmos/e2e/bytecode/babylon_contract.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified bsn/cosmos/e2e/bytecode/btc_finality.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified bsn/cosmos/e2e/bytecode/btc_light_client.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified bsn/cosmos/e2e/bytecode/btc_staking.wasm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion bsn/cosmos/e2e/bytecode/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d4514978c5efa305c9499919e0ebecf1a7c5b959
v0.16.0
1 change: 0 additions & 1 deletion finality-provider/service/rand_committer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package service
import (
"context"
"fmt"

"github.com/avast/retry-go/v4"
bbntypes "github.com/babylonlabs-io/babylon/v3/types"
ccapi "github.com/babylonlabs-io/finality-provider/clientcontroller/api"
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
cosmossdk.io/errors v1.0.2
cosmossdk.io/math v1.5.3
github.com/avast/retry-go/v4 v4.5.1
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250801111417-fe7557c41640
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250801111417-fe7557c41640
github.com/babylonlabs-io/babylon/v3 v3.0.0-snapshot.250724
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250807100855-be35b2768ee4
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250807100855-be35b2768ee4
github.com/babylonlabs-io/babylon/v3 v3.0.0-rc.0
github.com/btcsuite/btcd v0.24.2
github.com/btcsuite/btcd/btcec/v2 v2.3.5
github.com/btcsuite/btcd/btcutil v1.1.6
Expand Down Expand Up @@ -53,7 +53,7 @@ require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250801111417-fe7557c41640 // indirect
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250807100855-be35b2768ee4 // indirect
github.com/bytedance/sonic v1.13.2 // indirect
github.com/bytedance/sonic/loader v0.2.4 // indirect
github.com/cloudwego/base64x v0.1.5 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,14 +733,14 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250801111417-fe7557c41640 h1:qmKEMW32brnRKppRSrr444NogIAnyhkixrywV2TdtY8=
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250801111417-fe7557c41640/go.mod h1:wiUnE2pmhPUcRdbksOyyIM9yGl8PpDUHJFJ6o6jHyIA=
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250801111417-fe7557c41640 h1:TnLJOxVm4gvfvQm9JExEivREojfbaZRdBK5hdPufH3A=
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250801111417-fe7557c41640/go.mod h1:KEu5zoOSTTJyyAzTqVKHIt8jyDaMxzxrMS9WjffoAdA=
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250801111417-fe7557c41640 h1:0znOGQ1Mh0l7OrGKGiN9Jd/Vu/YZ6LMmTSoiqIYoHmI=
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250801111417-fe7557c41640/go.mod h1:seS4E882FYvlzi07MpIgtCtcC7AISJp1oo30AWMbGfE=
github.com/babylonlabs-io/babylon/v3 v3.0.0-snapshot.250724 h1:XzJaFcFhRFNKcY5cupE0CZ9yvr37U+ea8wnf7qJw0Lk=
github.com/babylonlabs-io/babylon/v3 v3.0.0-snapshot.250724/go.mod h1:kZirEr92KRSK1amofhTL/mz4+KYn/oikr+F+4kFqWgQ=
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250807100855-be35b2768ee4 h1:04BVRH6J4+vrWzztANtzpHDBUSe3fiQD+OPWakZGGnc=
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250807100855-be35b2768ee4/go.mod h1:BlT+EaE0WgQWQUB+bl0cIWU+dApr1m9BMZ1Sc2aJq8Q=
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250807100855-be35b2768ee4 h1:UqR1NnjqvvyMr24Bz2r5pB2IBTXc7wqoKwsh+qKdkXo=
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250807100855-be35b2768ee4/go.mod h1:tN8GYFLwFcUzRItCR+p5Q+ZYy7S4NiTw/bBwltgh56s=
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250807100855-be35b2768ee4 h1:JKvhVl+T+jjYy24eaoyYZrOamqWpDp13Vph9Dmh4rQM=
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250807100855-be35b2768ee4/go.mod h1:seS4E882FYvlzi07MpIgtCtcC7AISJp1oo30AWMbGfE=
github.com/babylonlabs-io/babylon/v3 v3.0.0-rc.0 h1:o/VZIhfV4axGhsTo6X8+UX8in9KelBCr6al6YZQhmKc=
github.com/babylonlabs-io/babylon/v3 v3.0.0-rc.0/go.mod h1:7QpvIvZTClWlm1hNz4ivb3I522XrOJC5UcnqDGiwi08=
github.com/babylonlabs-io/tokenfactory v0.50.6-wasmvm2 h1:7wtBLjwncBsYgc+LlW4eir/bGcycrhpbz7PkUVADzBc=
github.com/babylonlabs-io/tokenfactory v0.50.6-wasmvm2/go.mod h1:L8XfncoH1M6fOrzqfRVQZePqo54ZlTDdatUpEr0Iz/E=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
Expand Down
6 changes: 3 additions & 3 deletions tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23.8
toolchain go1.23.10

require (
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250801111417-fe7557c41640
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250807100855-be35b2768ee4
github.com/cosmos/relayer/v2 v2.5.3
)

Expand Down Expand Up @@ -48,8 +48,8 @@ require (
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
github.com/avast/retry-go/v4 v4.5.1 // indirect
github.com/aws/aws-sdk-go v1.49.0 // indirect
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250801111417-fe7557c41640 // indirect
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250801111417-fe7557c41640 // indirect
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250807100855-be35b2768ee4 // indirect
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250807100855-be35b2768ee4 // indirect
github.com/babylonlabs-io/babylon/v3 v3.0.0-snapshot.250724 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
Expand Down
24 changes: 12 additions & 12 deletions tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,8 +636,8 @@ cosmossdk.io/store v1.1.2 h1:3HOZG8+CuThREKv6cn3WSohAc6yccxO3hLzwK6rBC7o=
cosmossdk.io/store v1.1.2/go.mod h1:60rAGzTHevGm592kFhiUVkNC9w7gooSEn5iUBPzHQ6A=
cosmossdk.io/tools/confix v0.1.2 h1:2hoM1oFCNisd0ltSAAZw2i4ponARPmlhuNu3yy0VwI4=
cosmossdk.io/tools/confix v0.1.2/go.mod h1:7XfcbK9sC/KNgVGxgLM0BrFbVcR/+6Dg7MFfpx7duYo=
cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ=
cosmossdk.io/x/circuit v0.1.1/go.mod h1:B6f/urRuQH8gjt4eLIXfZJucrbreuYrKh5CSjaOxr+Q=
cosmossdk.io/x/circuit v0.2.0 h1:RJPMBQWCQU77EcM9HDTBnqRhq21fcUxgWZl7BZylJZo=
cosmossdk.io/x/circuit v0.2.0/go.mod h1:CjiGXDeZs64nMv0fG+QmvGVTcn7n3Sv4cDszMRR2JqU=
cosmossdk.io/x/evidence v0.2.0 h1:o72zbmgCM7U0v7z7b0XnMB+NqX0tFamqb1HHkQbhrZ0=
cosmossdk.io/x/evidence v0.2.0/go.mod h1:zx/Xqy+hnGVzkqVuVuvmP9KsO6YCl4SfbAetYi+k+sE=
cosmossdk.io/x/feegrant v0.2.0 h1:oq3WVpoJdxko/XgWmpib63V1mYy9ZQN/1qxDajwGzJ8=
Expand Down Expand Up @@ -727,12 +727,12 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250801111417-fe7557c41640 h1:qmKEMW32brnRKppRSrr444NogIAnyhkixrywV2TdtY8=
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250801111417-fe7557c41640/go.mod h1:wiUnE2pmhPUcRdbksOyyIM9yGl8PpDUHJFJ6o6jHyIA=
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250801111417-fe7557c41640 h1:TnLJOxVm4gvfvQm9JExEivREojfbaZRdBK5hdPufH3A=
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250801111417-fe7557c41640/go.mod h1:KEu5zoOSTTJyyAzTqVKHIt8jyDaMxzxrMS9WjffoAdA=
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250801111417-fe7557c41640 h1:0znOGQ1Mh0l7OrGKGiN9Jd/Vu/YZ6LMmTSoiqIYoHmI=
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250801111417-fe7557c41640/go.mod h1:seS4E882FYvlzi07MpIgtCtcC7AISJp1oo30AWMbGfE=
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250807100855-be35b2768ee4 h1:04BVRH6J4+vrWzztANtzpHDBUSe3fiQD+OPWakZGGnc=
github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20250807100855-be35b2768ee4/go.mod h1:BlT+EaE0WgQWQUB+bl0cIWU+dApr1m9BMZ1Sc2aJq8Q=
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250807100855-be35b2768ee4 h1:UqR1NnjqvvyMr24Bz2r5pB2IBTXc7wqoKwsh+qKdkXo=
github.com/babylonlabs-io/babylon-sdk/tests/e2e v0.0.0-20250807100855-be35b2768ee4/go.mod h1:tN8GYFLwFcUzRItCR+p5Q+ZYy7S4NiTw/bBwltgh56s=
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250807100855-be35b2768ee4 h1:JKvhVl+T+jjYy24eaoyYZrOamqWpDp13Vph9Dmh4rQM=
github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20250807100855-be35b2768ee4/go.mod h1:seS4E882FYvlzi07MpIgtCtcC7AISJp1oo30AWMbGfE=
github.com/babylonlabs-io/babylon/v3 v3.0.0-snapshot.250724 h1:XzJaFcFhRFNKcY5cupE0CZ9yvr37U+ea8wnf7qJw0Lk=
github.com/babylonlabs-io/babylon/v3 v3.0.0-snapshot.250724/go.mod h1:kZirEr92KRSK1amofhTL/mz4+KYn/oikr+F+4kFqWgQ=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
Expand Down Expand Up @@ -887,8 +887,8 @@ github.com/cosmos/ibc-apps/modules/rate-limiting/v10 v10.1.0 h1:Wpa3gDW2tNxxdcUz
github.com/cosmos/ibc-apps/modules/rate-limiting/v10 v10.1.0/go.mod h1:0NWhkh5Ok8t/qHWOn8LUZsG5rTxhwQWyrsI3xu1/PO0=
github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI=
github.com/cosmos/ibc-go/modules/capability v1.0.1/go.mod h1:rquyOV262nGJplkumH+/LeYs04P3eV8oB7ZM4Ygqk4E=
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 v10.1.1 h1:mbdtYhi77oF7hKCPAnK6MJX8BqeiaUPnsdWm+1CYugo=
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 v10.1.1/go.mod h1:KkndDnWkEY1c1VnX0cpES7dDJzm7PKlBMdKLDZB3Ww8=
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 v10.3.0 h1:m7ngaGY7/eeBC7Ly+/sGrUKCp/HNMeKWao8ksWlxH8Q=
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 v10.3.0/go.mod h1:T4hi2bTWs+37XOhXyKNNL6knOVDvmb4TtHxSmhXsyfM=
github.com/cosmos/ibc-go/v10 v10.3.0 h1:w5DkHih8qn15deAeFoTk778WJU+xC1krJ5kDnicfUBc=
github.com/cosmos/ibc-go/v10 v10.3.0/go.mod h1:CthaR7n4d23PJJ7wZHegmNgbVcLXCQql7EwHrAXnMtw=
github.com/cosmos/ibc-go/v8 v8.0.0 h1:QKipnr/NGwc+9L7NZipURvmSIu+nw9jOIWTJuDBqOhg=
Expand Down Expand Up @@ -1464,8 +1464,8 @@ github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
Expand Down