From 7c458813f99bffab6ee22df20fd6da8aac2e6b80 Mon Sep 17 00:00:00 2001 From: annielz Date: Tue, 21 Oct 2025 14:43:46 +0800 Subject: [PATCH 1/6] feat: modify gvg withdraw and dockerfile --- Dockerfile | 2 +- go.mod | 2 +- go.sum | 12 ++++++------ x/virtualgroup/keeper/msg_server.go | 8 +++++--- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index cbb1b0155..bbecb2c71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ ARG USER_GID=1000 ENV CGO_CFLAGS="-O -D__BLST_PORTABLE__" ENV CGO_CFLAGS_ALLOW="-O -D__BLST_PORTABLE__" -ENV PACKAGES ca-certificates libstdc++ +ENV PACKAGES ca-certificates libstdc++ curl jq bash ENV WORKDIR=/app RUN apk add --no-cache $PACKAGES \ diff --git a/go.mod b/go.mod index 451bf7b3e..1e6556458 100644 --- a/go.mod +++ b/go.mod @@ -183,7 +183,7 @@ replace ( github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v1.3.2-0.20250421115205-d0c58e3042cf github.com/cometbft/cometbft-db => github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 - github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1-0.20251014054900-003354fe83f6 + github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1 github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/wercker/journalhook => github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117 diff --git a/go.sum b/go.sum index 66a7263a2..0655b3497 100644 --- a/go.sum +++ b/go.sum @@ -76,12 +76,12 @@ github.com/bnb-chain/greenfield-cometbft v1.3.2-0.20250421115205-d0c58e3042cf h1 github.com/bnb-chain/greenfield-cometbft v1.3.2-0.20250421115205-d0c58e3042cf/go.mod h1:KHJjaV8GR/HLVUNpA8l+ro8clFSlwEbyNZIujf8c27w= github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 h1:XcWulGacHVRiSCx90Q8Y//ajOrLNBQWR/KDB89dy3cU= github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1/go.mod h1:ey1CiK4bYo1RBNJLRiVbYr5CMdSxci9S/AZRINLtppI= -github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1-0.20251014054900-003354fe83f6 h1:lntekn2IqPDKfVxBNWAy4IHXeOyTpEVkD3ZCkSzL4wY= -github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1-0.20251014054900-003354fe83f6/go.mod h1:2bwmwdXYBISnQoMwgAcZTVGt21lMsHZSeeeMByTvDlQ= -github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210 h1:GHPbV2bC+gmuO6/sG0Tm8oGal3KKSRlyE+zPscDjlA8= -github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210/go.mod h1:vhsZxXE9tYJeYB5JR4hPhd6Pc/uPf7j1T8IJ7p9FdeM= -github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210 h1:FLVOn4+OVbsKi2+YJX5kmD27/4dRu4FW7xCXFhzDO5s= -github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM= +github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1 h1:yAQ4H6q83VQV7xI+uY4d/F80XcXB+0t6gux5piOJSas= +github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1/go.mod h1:3yqFQxEw05CP1uCyKZtUJjP5N5E+OYALrfJnSWLTE6c= +github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20250424012533-3644b91a4a5c h1:+kWAQ4r5KXkReB7IE9Z91mtOUNeIKG0KRjC/v7kuxP0= +github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20250424012533-3644b91a4a5c/go.mod h1:YzvJKV9ZaLfB0Bt5NiTId53lhMUFDmeBJpFddWNoDeQ= +github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20250424012533-3644b91a4a5c h1:0LTfgCXv6gk3PubhFMQwRHgo510hxeyacOHuv9ADebA= +github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20250424012533-3644b91a4a5c/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM= github.com/bnb-chain/greenfield-iavl v0.20.1 h1:y3L64GU99otNp27/xLVBTDbv4eroR6CzoYz0rbaVotM= github.com/bnb-chain/greenfield-iavl v0.20.1/go.mod h1:oLksTs8dfh7DYIKBro7hbRQ+ewls7ghJ27pIXlbEXyI= github.com/btcsuite/btcd v0.23.0 h1:V2/ZgjfDFIygAX3ZapeigkVBoVUtOJKSwrhZdlpSvaA= diff --git a/x/virtualgroup/keeper/msg_server.go b/x/virtualgroup/keeper/msg_server.go index 59d193d69..2df550c6b 100644 --- a/x/virtualgroup/keeper/msg_server.go +++ b/x/virtualgroup/keeper/msg_server.go @@ -300,9 +300,11 @@ func (k msgServer) Withdraw(goCtx context.Context, req *types.MsgWithdraw) (*typ } if err := ctx.EventManager().EmitTypedEvents(&types.EventUpdateGlobalVirtualGroup{ - Id: req.GlobalVirtualGroupId, - StoreSize: gvg.StoredSize, - TotalDeposit: gvg.TotalDeposit, + Id: req.GlobalVirtualGroupId, + PrimarySpId: gvg.PrimarySpId, + StoreSize: gvg.StoredSize, + TotalDeposit: gvg.TotalDeposit, + SecondarySpIds: gvg.SecondarySpIds, }); err != nil { return nil, err } From 9c6b73e0a4d6681ec9c9af564d7c49bfc65c198b Mon Sep 17 00:00:00 2001 From: annielz Date: Tue, 21 Oct 2025 11:56:14 +0800 Subject: [PATCH 2/6] feat: add tmp docker ci --- .github/workflows/docker-ci.yml | 44 +++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/docker-ci.yml diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml new file mode 100644 index 000000000..5b78ae8a8 --- /dev/null +++ b/.github/workflows/docker-ci.yml @@ -0,0 +1,44 @@ +name: Docker + +on: + push: + branches: [ feat-gvg-docker-tag ] + +env: + IMAGE_NAME: ghcr.io/${{ github.repository }} + IMAGE_SOURCE: https://github.com/${{ github.repository }} + + +jobs: + # Push image to GitHub Packages. + push: + runs-on: ubuntu-latest + if: github.event_name == 'push' + + steps: + - uses: actions/checkout@v3 + + - name: Build image + run: | + docker build . \ + --label "org.opencontainers.image.source=${IMAGE_SOURCE}" \ + --label "org.opencontainers.image.revision=$(git rev-parse HEAD)" \ + --label "org.opencontainers.image.version=$(git describe --tags --abbrev=0)" \ + --label "org.opencontainers.image.licenses=LGPL-3.0,AGPL-3.0" \ + -f ./Dockerfile -t "${IMAGE_NAME}" + + - name: Login to GHCR + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Push image + run: | + VERSION=pr-$(echo "${{ github.event.number }}") + VERSION=gvg-param-rule-update + echo IMAGE_NAME=$IMAGE_NAME + echo VERSION=$VERSION + docker tag $IMAGE_NAME $IMAGE_NAME:$VERSION + docker push $IMAGE_NAME:$VERSION From e8606543b105632780ee93b58612abbdff35d046 Mon Sep 17 00:00:00 2001 From: annielz Date: Wed, 22 Oct 2025 11:40:15 +0800 Subject: [PATCH 3/6] feat: update docker tag name --- .github/workflows/docker-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 5b78ae8a8..83e3890c9 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -37,7 +37,7 @@ jobs: - name: Push image run: | VERSION=pr-$(echo "${{ github.event.number }}") - VERSION=gvg-param-rule-update + VERSION=gvg-dockerfile-updates-1022 echo IMAGE_NAME=$IMAGE_NAME echo VERSION=$VERSION docker tag $IMAGE_NAME $IMAGE_NAME:$VERSION From e57ff9d2b08ecfef08ddb60f6fa591b22deb5027 Mon Sep 17 00:00:00 2001 From: annielz Date: Tue, 28 Oct 2025 10:43:56 +0800 Subject: [PATCH 4/6] Revert "feat: update docker tag name" This reverts commit e8606543b105632780ee93b58612abbdff35d046. --- .github/workflows/docker-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 83e3890c9..5b78ae8a8 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -37,7 +37,7 @@ jobs: - name: Push image run: | VERSION=pr-$(echo "${{ github.event.number }}") - VERSION=gvg-dockerfile-updates-1022 + VERSION=gvg-param-rule-update echo IMAGE_NAME=$IMAGE_NAME echo VERSION=$VERSION docker tag $IMAGE_NAME $IMAGE_NAME:$VERSION From 14d72c436d2c3e4306bf905adab8707ab9e95259 Mon Sep 17 00:00:00 2001 From: annielz Date: Tue, 28 Oct 2025 10:44:07 +0800 Subject: [PATCH 5/6] Revert "feat: add tmp docker ci" This reverts commit 9c6b73e0a4d6681ec9c9af564d7c49bfc65c198b. --- .github/workflows/docker-ci.yml | 44 --------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .github/workflows/docker-ci.yml diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml deleted file mode 100644 index 5b78ae8a8..000000000 --- a/.github/workflows/docker-ci.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Docker - -on: - push: - branches: [ feat-gvg-docker-tag ] - -env: - IMAGE_NAME: ghcr.io/${{ github.repository }} - IMAGE_SOURCE: https://github.com/${{ github.repository }} - - -jobs: - # Push image to GitHub Packages. - push: - runs-on: ubuntu-latest - if: github.event_name == 'push' - - steps: - - uses: actions/checkout@v3 - - - name: Build image - run: | - docker build . \ - --label "org.opencontainers.image.source=${IMAGE_SOURCE}" \ - --label "org.opencontainers.image.revision=$(git rev-parse HEAD)" \ - --label "org.opencontainers.image.version=$(git describe --tags --abbrev=0)" \ - --label "org.opencontainers.image.licenses=LGPL-3.0,AGPL-3.0" \ - -f ./Dockerfile -t "${IMAGE_NAME}" - - - name: Login to GHCR - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Push image - run: | - VERSION=pr-$(echo "${{ github.event.number }}") - VERSION=gvg-param-rule-update - echo IMAGE_NAME=$IMAGE_NAME - echo VERSION=$VERSION - docker tag $IMAGE_NAME $IMAGE_NAME:$VERSION - docker push $IMAGE_NAME:$VERSION From 44619e8d72e7c8f7f345a21ac27da740a4931a37 Mon Sep 17 00:00:00 2001 From: annielz Date: Tue, 28 Oct 2025 11:21:25 +0800 Subject: [PATCH 6/6] feat: prepare for v1.10.5 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91797330b..dd67eecf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## V1.10.5 +This release contains 2 new feature + +Features: +* [#659] https://github.com/bnb-chain/greenfield/pull/659 feat: dep update +* [#668] https://github.com/bnb-chain/greenfield/pull/668 feat: modify gvg withdraw and dockerfile and prepare for v1.10.5 + + +## V1.10.4 +This release introduces the Tundra upgrade. +* [#661] https://github.com/bnb-chain/greenfield/pull/661 fix: fix a data issue in virtual group + ## V1.10.1 This release contains 1 new feature