Merge pull request #399 from babylonlabs-io/merge-main-to-base-2025

fix: merge main to base
babylonlabs-io · Jan 14, 2025 · abeef54 · abeef54
2 parents e901f1c + c06b2fe
commit abeef54
Show file tree

Hide file tree

Showing 283 changed files with 399,975 additions and 3,153 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -147,6 +147,28 @@ jobs:
         run: |
           make test-e2e-cache-btc-staking
 
+  e2e-run-btc-rewards:
+    needs: [e2e-docker-build-babylon]
+    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: Docker load babylond
+        run: |
+          docker load < /tmp/docker-babylond.tar.gz
+      - name: Cache Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.23
+      - name: Run e2e TestBTCRewardsDistribution
+        run: |
+          make test-e2e-cache-btc-rewards
+
   e2e-run-btc-staking-pre-approval:
     needs: [e2e-docker-build-babylon]
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,10 +20,16 @@ jobs:
       run-lint: true
 
   docker_pipeline:
-    uses: babylonlabs-io/.github/.github/workflows/reusable_docker_pipeline.yml@v0.7.0
+    uses: babylonlabs-io/.github/.github/workflows/reusable_docker_pipeline.yml@v0.10.2
     needs: ["lint_test"]
     secrets: inherit
+    permissions:
+      # required for all workflows
+      security-events: write
+      # required to fetch internal or private CodeQL packs
+      packages: read
     with:
       publish: true
       dockerfile: ./contrib/images/babylond/Dockerfile
       repoName: babylond
+      docker_scan: true
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,103 +1,77 @@
 run:
   timeout: 5m
+# TODO: enable all linters
+linters:
   disable-all: true
   enable:
     - asasalint
     - asciicheck
     - bidichk
-    - bodyclose
-    - containedctx
-    - contextcheck
-    - cyclop
+    # - bodyclose
+    # - containedctx
+    # - contextcheck
     - decorder
-    - depguard
-    - dogsled
-    - dupl
+    # - dogsled
     - durationcheck
     - errcheck
     - errchkjson
     - errname
-    - errorlint
-    - execinquery
-    - exhaustive
-    - exhaustivestruct
-    - exhaustruct
-    - exportloopref
+    # - errorlint
+    # - exhaustive
     - forbidigo
-    - forcetypeassert
-    - funlen
-    - gci
-    - gochecknoglobals
-    - gochecknoinits
-    - gocognit
+    # - forcetypeassert
     - goconst
     - gocritic
-    - gocyclo
-    - godot
-    - godox
-    - goerr113
-    - gofumpt
+    # - gocyclo
     - goheader
-    - golint
-    - gomnd
-    - gomoddirectives
     - gomodguard
     - goprintffuncname
-    - gosec
     - gosimple
     - govet
     - grouper
-    - ifshort
     - importas
     - ineffassign
-    - interfacebloat
-    - interfacer
-    - ireturn
-    - lll
     - loggercheck
-    - maintidx
+    # - maintidx
     - makezero
-    - maligned
     - misspell
     - nakedret
-    - nestif
     - nilerr
-    - nilnil
-    - nlreturn
+    # - nlreturn
     - noctx
-    - nolintlint
-    - nonamedreturns
-    - nosnakecase
     - nosprintfhostport
-    - paralleltest
-    - prealloc
-    - predeclared
-    - promlinter
+    # - paralleltest
     - reassign
-    - revive
+    # - revive
     - rowserrcheck
-    - scopelint
     - sqlclosecheck
     - staticcheck
-    - structcheck
-    - stylecheck
-    - tagliatelle
+    # - stylecheck
     - tenv
     - testableexamples
-    - testpackage
-    - thelper
-    - tparallel
+    # - tparallel
     - typecheck
     - unconvert
     - unparam
-    - unused
     - usestdlibvars
-    - varcheck
-    - varnamelen
+    - unused
     - wastedassign
     - whitespace
-    - wrapcheck
-    - wsl
+    # - wrapcheck
 
 issues:
   max-same-issues: 0
+  # Default: https://golangci-lint.run/usage/false-positives/#default-exclusions
+  exclude-dirs:
+    - e2etest
+  exclude-rules:
+    # Exclude some linters from running on tests files.
+    - path: _test\.go
+      linters:
+        - gocyclo
+        - errcheck
+        - dupl
+        - gosec
+    - path-except: _test\.go
+      linters:
+        - forbidigo
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -65,19 +65,138 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## Unreleased
 
+### Improvements
+
+- [#391](https://github.com/babylonlabs-io/babylon/pull/391) Fix e2e `TestBTCRewardsDistribution` flunky
+check of rewards
+
+## v1.0.0-rc3
+
+### Bug fixes
+
+- [#374](https://github.com/babylonlabs-io/babylon/pull/374) Fix non-consecutive finalization
+of the block in `TallyBlocks` function
+- [#378](https://github.com/babylonlabs-io/babylon/pull/378) Fix give out rewards
+with gaps of unfinalized blocks
+- [#385](https://github.com/babylonlabs-io/babylon/pull/385) Fix epoching module
+ante handler to return from antehandler chain only in case of error
+
+## v1.0.0-rc2
+
+### Bug fixes
+
+- [#371](https://github.com/babylonlabs-io/babylon/pull/371) Do not prune BTC
+reward tracker structures at the slash of finality provider.
+
+## v1.0.0-rc.1
+
+### Improvements
+
+- [#306](https://github.com/babylonlabs-io/babylon/pull/306) feat: improve BTC reward distribution with
+virtual block periods for each finality provider that has delegations and reward tracker structures.
+- [#338](https://github.com/babylonlabs-io/babylon/pull/338) Add print BIP-340 in
+`debug pubkey-raw` subcommand
+- [#316](https://github.com/babylonlabs-io/babylon/pull/316) Add testnet upgrade data
+- [#326](https://github.com/babylonlabs-io/babylon/pull/326) docs: btcstaking:
+Update btcstaking module docs to include EOI
+- [#348](https://github.com/babylonlabs-io/babylon/pull/348) refactory `PrivateSigner`
+and module account vars in appparams
+- [#351](https://github.com/babylonlabs-io/babylon/pull/351) docs: Add state
+transition docs.
+- [#358](https://github.com/babylonlabs-io/babylon/pull/358) Remove unused deps in `.proto` files
+- [#364](https://github.com/babylonlabs-io/babylon/pull/364) Add testnet upgrade data
+
+### Bug fixes
+
+- [#324](https://github.com/babylonlabs-io/babylon/pull/324) Fix decrementing
+jailed fp counter
+- [#352](https://github.com/babylonlabs-io/babylon/pull/352) Fix: withdrawal cli
+for rewards
+
+### State Machine Breaking
+
+- [#341](https://github.com/babylonlabs-io/babylon/pull/341) Select parameters
+for pre-approval flow based on BTC LC tip height
+- [#360](https://github.com/babylonlabs-io/babylon/pull/360) Refactor rewarding
+- [#365](https://github.com/babylonlabs-io/babylon/pull/365) Reject outdated finality votes
+
+## v0.18.2
+
+### Bug fixes
+
+- [#342](https://github.com/babylonlabs-io/babylon/pull/342) Fix non-determinism while jailing
+
+## v0.18.1
+
+- [#328](https://github.com/babylonlabs-io/babylon/pull/328) Fix btc activation height validation in genesis
+
+## v0.18.0
+
+### Improvements
+
+- [#309](https://github.com/babylonlabs-io/babylon/pull/309) feat(adr-036): custom withdrawal address
+- [#305](https://github.com/babylonlabs-io/babylon/pull/305) chore: add more error logs to `VerifyInclusionProofAndGetHeight`
+- [#304](https://github.com/babylonlabs-io/babylon/pull/304) Add highest voted height to finality provider
+- [#314](https://github.com/babylonlabs-io/babylon/pull/314) Require exact unbonding time in delegation
+- [#317](https://github.com/babylonlabs-io/babylon/pull/317) Enforce that EOI
+delegations using correct parameters version
+
+### State Machine Breaking
+
+- [#310](https://github.com/babylonlabs-io/babylon/pull/310) implement adr-37 -
+making params valid for btc light client ranges
+
+### Bug fixes
+
+- [#318](https://github.com/babylonlabs-io/babylon/pull/318) Fix BTC delegation status check
+to relay on UnbondingTime in delegation
+
+## v0.17.2
+
+### Improvements
+
+- [#311](https://github.com/babylonlabs-io/babylon/pull/311) Enforce version 2
+for unbonding transactions
+
+## v0.17.1
+
+### Bug fixes
+
+- [#289](https://github.com/babylonlabs-io/babylon/pull/289) hotfix: Invalid minUnbondingTime for verifying inclusion proof
+
+## v0.17.0
+
+### State Breaking
+
+- [278](https://github.com/babylonlabs-io/babylon/pull/278) Allow unbonding time to be min unbonding value
+
+### Improvements
+
+- [#264](https://github.com/babylonlabs-io/babylon/pull/264) bump docker workflow
+version to 0.10.2, fix some Dockerfile issues
+- [#284](https://github.com/babylonlabs-io/babylon/pull/284) Update cosmos sdk math dependency
+- [#285](https://github.com/babylonlabs-io/babylon/pull/285) Update cometbft dependency
+version
 
 ### Bug fixes
 
 - [#270](https://github.com/babylonlabs-io/babylon/pull/270) Validate there is only
 one finality provider key in the staking request
+- [#270](https://github.com/babylonlabs-io/babylon/pull/277) Panic due to possible
+nil params response
+
+## v0.16.1
 
 ### API Breaking
 
 - [#273](https://github.com/babylonlabs-io/babylon/pull/273) Add full staking tx to BTC delegation creation event
+
 ## v0.16.0
 
 ### Improvements
 
+* [#242](https://github.com/babylonlabs-io/babylon/pull/242) Add
+ResumeFinalityProposal and handler
 * [#258](https://github.com/babylonlabs-io/babylon/pull/258) fix go releaser
 and trigger by github action
 * [#252](https://github.com/babylonlabs-io/babylon/pull/252) Fix

diff --git a/Makefile b/Makefile
@@ -281,6 +281,9 @@ test-e2e-cache-btc-timestamping:
 test-e2e-cache-btc-staking:
 	go test -run TestBTCStakingTestSuite -mod=readonly -timeout=60m -v $(PACKAGES_E2E) --tags=e2e
 
+test-e2e-cache-btc-rewards:
+	go test -run TestBTCRewardsDistribution -mod=readonly -timeout=60m -v $(PACKAGES_E2E) --tags=e2e
+
 test-e2e-cache-btc-staking-pre-approval:
 	go test -run TestBTCStakingPreApprovalTestSuite -mod=readonly -timeout=60m -v $(PACKAGES_E2E) --tags=e2e
 

diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ document about its design and implementation.
 ## Joining the testnet
 
 Please follow the instructions on the [User
-Guides](https://docs.babylonchain.io/docs/user-guides/overview).
+Guides](https://github.com/babylonlabs-io/networks/blob/main/bbn-test-5/README.md).
 
 ## Contributing
 

diff --git a/app/ante/ante_btc_validation_decorator.go b/app/ante/ante_btc_validation_decorator.go
@@ -24,7 +24,6 @@ func NewBtcValidationDecorator(
 }
 
 func (bvd BtcValidationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
-
 	// only do this validation when handling mempool addition. During DeliverTx they
 	// should be performed by btclightclient and btccheckpoint modules
 	if ctx.IsCheckTx() || ctx.IsReCheckTx() {

diff --git a/app/app.go b/app/app.go
@@ -26,6 +26,7 @@ import (
 	"github.com/babylonlabs-io/babylon/app/ante"
 	appkeepers "github.com/babylonlabs-io/babylon/app/keepers"
 	appparams "github.com/babylonlabs-io/babylon/app/params"
+	"github.com/babylonlabs-io/babylon/app/signer"
 	"github.com/babylonlabs-io/babylon/app/upgrades"
 	"github.com/babylonlabs-io/babylon/client/docs"
 	bbn "github.com/babylonlabs-io/babylon/types"
@@ -208,7 +209,7 @@ func NewBabylonApp(
 	loadLatest bool,
 	skipUpgradeHeights map[int64]bool,
 	invCheckPeriod uint,
-	privSigner *appkeepers.PrivSigner,
+	privSigner *signer.PrivSigner,
 	appOpts servertypes.AppOptions,
 	wasmOpts []wasmkeeper.Option,
 	baseAppOptions ...func(*baseapp.BaseApp),
@@ -815,7 +816,7 @@ func BlockedAddresses() map[string]bool {
 	}
 
 	// allow the following addresses to receive funds
-	delete(modAccAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String())
+	delete(modAccAddrs, appparams.AccGov.String())
 
 	return modAccAddrs
 }