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.

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

chore: pull main to feat 457 #465

Merged
merged 103 commits into from
Jan 31, 2025
Merged
Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
2207f55
integration: set up `x/btcstkconsumer` module (#206)
SebastianElvis Mar 13, 2024
88f891c
F/consumer chain registry (#205)
maurolacy Mar 13, 2024
f4b88ab
F/consumer chain registry 2 (#209)
maurolacy Mar 13, 2024
873cfce
F/register codecs (#210)
maurolacy Mar 15, 2024
7928f66
F/consumer FP registry (#216)
maurolacy Mar 20, 2024
a4d244c
F/consumer fp registry 2 (#220)
maurolacy Mar 20, 2024
65657d1
handling restaked BTC delegations to consumer FPs (#222)
SebastianElvis Mar 22, 2024
0c5d6aa
F/consumer chain cli (#221)
maurolacy Mar 22, 2024
76efc0d
Update CHANGELOG
Mar 22, 2024
ce164ea
fix: only calculating Babylon FPs for FP set rotation (#223)
SebastianElvis Mar 25, 2024
5c15e74
Update CHANGELOG
Mar 25, 2024
b98b20e
fix
SebastianElvis Apr 2, 2024
0a6e9f8
R/consumer chain 2 (#224)
maurolacy Apr 3, 2024
c94b5f5
linting validateRestakedFPs
SebastianElvis Apr 16, 2024
4c1e0d5
proto: define IBC packet formats for PoS integration (#229)
SebastianElvis Apr 22, 2024
56b21f4
zoneconcierge: let zoneconcierge hold a pointer to btcstaking module …
SebastianElvis Apr 22, 2024
4601ff5
tests: Add pos-integration E2E Tests (#225)
gusin13 Apr 22, 2024
27f7072
chore: fix some proto formats for IBC packets (#234)
SebastianElvis Apr 25, 2024
78120b3
chore: rename chain to consumer for PoS integration (#233)
SebastianElvis Apr 25, 2024
038943a
btcstkconsumer: separate IBC packet for provider / consumer (#237)
SebastianElvis Apr 30, 2024
8f134e1
feat: Store btcstaking events in kv store and send IBC packet (#235)
gusin13 Apr 30, 2024
1ed7149
tests: btcstaking events e2e tests (#240)
gusin13 May 16, 2024
61ef003
release v0.2.0 rc0 (#245)
SebastianElvis May 17, 2024
49663ec
cd: Allows base/consumer-chain-support branch to run push_docker job …
hiepmai-babylonchain May 20, 2024
5f8413b
btcstkconsumer: RPC functions for BTC staking consumer module (#247)
SebastianElvis May 20, 2024
5701ec9
Fix/babylon update (#253)
maurolacy May 28, 2024
a0ec504
tests: Add undelegation and fp voting power test cases (#254)
gusin13 May 29, 2024
5d00627
feat: Add `cosmwasm_2_0` to `wasmCapabilities` (#255)
lesterli Jun 13, 2024
db66211
feat: Add Grpc querier (#257)
lesterli Jun 18, 2024
265678f
chore: remove aarch64 wasm (#261)
lesterli Jun 20, 2024
fdd9040
Fix rebase error
Jul 8, 2024
e57fefc
Fix rebase error / Simplify testutil btcstaking helpers
Jul 8, 2024
253dab4
fix: panic to merge proto files (#264)
lesterli Jul 5, 2024
e7658c2
U/contracts 0.7 (#270)
maurolacy Jul 10, 2024
0a646a3
Fix: Add stker_addr to active btc delegation
Jul 10, 2024
a6a6fc7
Update contracts from rebase branch
Jul 11, 2024
6f1b119
Fix: btc staking integration rebase errors
Jul 12, 2024
8531b8b
Fix: ExecCmd vs ExecTxCmd inconsistency
Jul 12, 2024
6c9ffa0
Fix in passing: docker warning
Jul 12, 2024
d1afabf
Fix syntax
Jul 12, 2024
d63dc74
proto-lint
Jul 12, 2024
33db0a6
proto-gen
Jul 12, 2024
b924ff0
Sanitize code path to avoid gosec warning
Jul 12, 2024
735e248
Increase Go min version to 1.22
Jul 12, 2024
fead9dc
Increase go version in CI
Jul 12, 2024
b83688b
Increase Go version in babylon container
Jul 12, 2024
30f2a15
Workaround consumer and babylon FP creation for staking integration t…
Jul 13, 2024
d1c5b08
Revert "Workaround consumer and babylon FP creation for staking integ…
Jul 15, 2024
a0e86bc
Comment pop.Verify out
Jul 15, 2024
dbf026c
fix fp gen
SebastianElvis Jul 15, 2024
5cdf5bb
fix gosec
SebastianElvis Jul 15, 2024
3d8f190
chore: rename del Babylon address in e2e (#273)
SebastianElvis Jul 17, 2024
6ecfdf4
Merge branch 'dev' into try-rebase-dev
SebastianElvis Jul 30, 2024
ce31233
fix compile
SebastianElvis Jul 30, 2024
d77e0cb
fix all tests
SebastianElvis Jul 30, 2024
74a24c9
Merge pull request #1 from babylonlabs-io/try-rebase-dev
SebastianElvis Aug 1, 2024
bd458da
feat: Automatic consumer registration (#11)
gusin13 Aug 14, 2024
20c5405
Merge branch 'dev' into merge-dev
SebastianElvis Aug 16, 2024
b03a1d8
fix e2e
SebastianElvis Aug 16, 2024
6bcadbc
Merge pull request #13 from babylonlabs-io/merge-dev-1
SebastianElvis Aug 17, 2024
81ee356
Add Consumer packet data defs / gens (#15)
maurolacy Aug 28, 2024
7942dae
tests: bcd setup in e2e (#57)
gusin13 Sep 11, 2024
35a5a1b
feat: Babylon FP cascaded slashing (#69)
gusin13 Sep 17, 2024
d6b39e8
Merge branch 'main' into try-rebase
SebastianElvis Sep 19, 2024
59a2486
fix compile
SebastianElvis Sep 19, 2024
747ca8e
feat(ADR-025): Enable jailing and unjailing (#80)
gitferry Sep 19, 2024
063241e
fix compile/tests
SebastianElvis Sep 20, 2024
bca42f1
accommodate timestamped pub rand for e2e
SebastianElvis Sep 20, 2024
0e661b3
Merge pull request #83 from babylonlabs-io/try-rebase
SebastianElvis Sep 23, 2024
a6f728b
Merge branch 'main' into base/consumer-chain-support
SebastianElvis Sep 23, 2024
a98269d
feat: Consumer FP cascaded slashing (#85)
gusin13 Sep 25, 2024
3520b05
f/Better IBC transfer tests (#128)
maurolacy Oct 4, 2024
8ee2c85
chore: gh sync workflow from main to base (#133)
gusin13 Oct 15, 2024
d10dd40
Merge branch 'main' into rebase-devnet-5
SebastianElvis Nov 14, 2024
540d59f
fix conflicts
SebastianElvis Nov 14, 2024
1be1c2b
fix compile
SebastianElvis Nov 15, 2024
098751b
Merge branch 'main' into rebase-devnet-5
SebastianElvis Nov 18, 2024
579d66c
fix tests and disable v1 upgrade e2e
SebastianElvis Nov 20, 2024
3aa1afc
Merge pull request #266 from babylonlabs-io/rebase-devnet-5
SebastianElvis Nov 20, 2024
ad3e100
F/consumer rewards e2e (#301)
maurolacy Nov 27, 2024
4898d8d
zoneconcierge: permissioned integration (#291)
SebastianElvis Dec 3, 2024
9300461
feat: add the slashing msg handler for op consumer fp (#327)
lesterli Dec 7, 2024
72654c8
e2e: remove e2e related to BTC staking integration (#339)
SebastianElvis Dec 13, 2024
e901f1c
fix: remove unused deps in `.proto` files (#355)
lesterli Dec 18, 2024
92ed24c
Merge branch 'main' into merge-main-to-base-2025
SebastianElvis Jan 13, 2025
e2651ab
fix compile and tests
SebastianElvis Jan 13, 2025
c06b2fe
fix lint
SebastianElvis Jan 13, 2025
abeef54
Merge pull request #399 from babylonlabs-io/merge-main-to-base-2025
filippos47 Jan 14, 2025
cbfb705
Merge branch 'main' into merge-base-2025-2
SebastianElvis Jan 14, 2025
9fa494b
Merge pull request #403 from babylonlabs-io/merge-base-2025-2
filippos47 Jan 14, 2025
873f123
fix: fix comments to the base branch (#418)
SebastianElvis Jan 17, 2025
eaf20a1
fix: fix comments to the base branch 2 (#424)
SebastianElvis Jan 22, 2025
3221f11
Merge branch 'main' into merge-main-to-base-0122
SebastianElvis Jan 22, 2025
3273ea8
Merge pull request #432 from babylonlabs-io/merge-main-to-base-0122
filippos47 Jan 22, 2025
10905e7
Merge pull request #402 from babylonlabs-io/base/consumer-chain-support
filippos47 Jan 23, 2025
2b8c528
chore: remove `cosmos/relayer` dependency (#429)
Lazar955 Jan 23, 2025
abc2272
chore: fix flaky test `FuzzCreateBTCDelegationWithParamsFromBtcHeight…
KonradStaniec Jan 27, 2025
1038c81
fix: swagger doc gen incentive v1 (#443)
RafilxTenfen Jan 27, 2025
367f8c0
Reject forks if the first header is already known (#445)
KonradStaniec Jan 27, 2025
02612f9
backport changelog update (#454)
KonradStaniec Jan 28, 2025
83af4ad
chore: update cosmos provider to expose public functions (#458)
RafilxTenfen Jan 29, 2025
70b63e6
Merge branch 'main' of github.com:babylonlabs-io/babylon into feat/rm…
RafilxTenfen Jan 31, 2025
58e9e40
fix: lint
RafilxTenfen Jan 31, 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
Prev Previous commit
Next Next commit
fix: remove unused deps in .proto files (#355)
## Summary

This PR removes unused dependencies in `.proto` files, addressing the
protobuf generation issue outlined in
[babylon-contract/issues/101](babylonlabs-io/babylon-contract#101).


## Test Plan

```
make proto-lint
```
lesterli authored Dec 18, 2024
commit e901f1c4ca8f8adf26d617b4265d6d66346d26d2
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -20,6 +20,15 @@ jobs:
run-integration-tests: false
run-lint: true

proto_lint:
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Run proto lint
run: |
make proto-lint

docker_pipeline:
uses: babylonlabs-io/.github/.github/workflows/reusable_docker_pipeline.yml@v0.7.0
secrets: inherit
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -411,7 +411,7 @@ protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(pro

proto-all: proto-gen proto-swagger-gen ## Generate all protobuf related files

proto-gen: ## Generate protobuf files
proto-gen: proto-lint ## Generate protobuf files
@echo "Generating Protobuf files"
@$(protoImage) sh ./proto/scripts/protocgen.sh

@@ -425,7 +425,7 @@ proto-format: ## Format protobuf files
proto-lint: ## Lint protobuf files
@$(protoImage) buf lint --error-format=json

.PHONY: proto-gen proto-swagger-gen proto-format prot-lint
.PHONY: proto-gen proto-swagger-gen proto-format proto-lint

###############################################################################
### Docker ###
3 changes: 1 addition & 2 deletions proto/babylon/btcstaking/v1/events.proto
Original file line number Diff line number Diff line change
@@ -2,13 +2,12 @@ syntax = "proto3";
package babylon.btcstaking.v1;

import "gogoproto/gogo.proto";
import "cosmos/staking/v1beta1/staking.proto";
import "babylon/btcstaking/v1/btcstaking.proto";
import "cosmos_proto/cosmos.proto";
import "amino/amino.proto";

option go_package = "github.com/babylonlabs-io/babylon/x/btcstaking/types";

// EventNewFinalityProvider is the event emitted when new finality provider is created
message EventNewFinalityProvider {
FinalityProvider fp = 1;
}
1 change: 0 additions & 1 deletion proto/babylon/btcstkconsumer/v1/btcstkconsumer.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
syntax = "proto3";
package babylon.btcstkconsumer.v1;

import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";

option go_package = "github.com/babylonlabs-io/babylon/x/btcstkconsumer/types";
1 change: 0 additions & 1 deletion proto/babylon/checkpointing/v1/query.proto
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ package babylon.checkpointing.v1;
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "google/protobuf/timestamp.proto";
import "babylon/checkpointing/v1/bls_key.proto";
import "babylon/checkpointing/v1/checkpoint.proto";
import "cosmos/base/query/v1beta1/pagination.proto";

1 change: 0 additions & 1 deletion proto/babylon/finality/v1/tx.proto
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ import "tendermint/crypto/proof.proto";
import "cosmos_proto/cosmos.proto";
import "cosmos/msg/v1/msg.proto";
import "babylon/finality/v1/params.proto";
import "babylon/finality/v1/finality.proto";

// Msg defines the Msg service.
service Msg {
1 change: 0 additions & 1 deletion proto/babylon/incentive/query.proto
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ package babylon.incentive;
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "babylon/incentive/params.proto";
import "babylon/incentive/incentive.proto";
import "cosmos/base/v1beta1/coin.proto";

option go_package = "github.com/babylonlabs-io/babylon/x/incentive/types";
1 change: 0 additions & 1 deletion proto/babylon/mint/v1/query.proto
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ package babylon.mint.v1;

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "babylon/mint/v1/mint.proto";
import "google/protobuf/timestamp.proto";

option go_package = "github.com/babylonlabs-io/babylon/x/mint/types";