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.

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

fix: approval expired height bug #191

Merged
merged 18 commits into from
Mar 13, 2023
Merged

fix: approval expired height bug #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ea0c0bc
fix: bypass v2 auth for test (#152) (#153)
will-2012 Feb 27, 2023
2f83809
feat: update grpc metadata getway (#151)
BarryTong65 Feb 28, 2023
48b5627
feat: storage provider refactor (#168)
will-2012 Mar 6, 2023
65cde20
fix: refactor metadata (#170)
BarryTong65 Mar 7, 2023
1caafea
feat: piece store adds minio storage type (#169)
sysvm Mar 7, 2023
b7ddee4
feat: implement manager module (#172)
will-2012 Mar 8, 2023
a7779a8
feat: add localup script (#171)
will-2012 Mar 8, 2023
6bf2b80
doc: add link to doc (#180)
joeylichang Mar 10, 2023
f60b10a
ci: add branch naming rules (#179)
sysvm Mar 10, 2023
cb9537f
docs: add change log for release v0.0.3 (#182)
joeylichang Mar 10, 2023
e810e1c
fix: PR links
joeylichang Mar 13, 2023
c68c26a
fix: delete uncommited PR
joeylichang Mar 13, 2023
5ab1449
feat: add check billing (#173)
will-2012 Mar 13, 2023
f141ba7
build: change to go 1.18
joeylichang Mar 13, 2023
747091d
build: rich readme content
joeylichang Mar 13, 2023
e8a50a1
fix: add deploy link to readme
joeylichang Mar 13, 2023
f5d5968
fix: fix approval expired height bug (#189)
will-2012 Mar 13, 2023
a3802c9
Merge branch 'master' into develop
joeylichang Mar 13, 2023
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
24 changes: 23 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,27 @@ make install-tools
```shell
bash build.sh &&
cd build &&
./gnfd-sp --version

# show version
./gnfd-sp version
Greenfield Storage Provider
__ _ __
_____/ /_____ _________ _____ ____ ____ _________ _ __(_)___/ /__ _____
/ ___/ __/ __ \/ ___/ __ / __ / _ \ / __ \/ ___/ __ \ | / / / __ / _ \/ ___/
(__ ) /_/ /_/ / / / /_/ / /_/ / __/ / /_/ / / / /_/ / |/ / / /_/ / __/ /
/____/\__/\____/_/ \__,_/\__, /\___/ / .___/_/ \____/|___/_/\__,_/\___/_/
/____/ /_/

Version : v0.0.3
Branch : master
Commit : e332362ec59724e143725dc5a5a0dacae3be73be
Build : go1.19.1 darwin amd64 2023-03-13 14:11

# show help
./gnfd-sp help
```

## Deployment
[Deploy SP](docs/tutorial/01-deployment.md)

[Setup Local Test](docs/tutorial/03-localup.md)
4 changes: 2 additions & 2 deletions model/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ const (
const (
// DefaultStreamBufSize defines gateway stream forward payload buf size
DefaultStreamBufSize = 64 * 1024
// DefaultExpiredHeight defines approval expired height
DefaultExpiredHeight = 100
// DefaultTimeoutHeight defines approval timeout height
DefaultTimeoutHeight = 100
)

// define downloader constants
Expand Down
4 changes: 2 additions & 2 deletions pkg/greenfield/query_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
)

// GetCurrentHeight the block height sub one as the stable height.
func (greenfield *Greenfield) GetCurrentHeight(ctx context.Context) (int64, error) {
func (greenfield *Greenfield) GetCurrentHeight(ctx context.Context) (uint64, error) {
status, err := greenfield.getCurrentClient().GnfdCompositeClient().RpcClient.TmClient.Status(ctx)
if err != nil {
log.Errorw("failed to query status", "error", err)
Expand All @@ -27,7 +27,7 @@ func (greenfield *Greenfield) GetCurrentHeight(ctx context.Context) (int64, erro
if height > 0 {
height = height - 1
}
return height, nil
return uint64(height), nil
}

// HasAccount returns an indication of the existence of address.
Expand Down
11 changes: 9 additions & 2 deletions service/gateway/admin_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ func (g *Gateway) getApprovalHandler(w http.ResponseWriter, r *http.Request) {
return
}

currentHeight, err := g.chain.GetCurrentHeight(context.Background())
if err != nil {
log.Errorw("failed to query current height", "error", err)
errDescription = makeErrorDescription(err)
return
}

switch actionName {
case createBucketApprovalAction:
var (
Expand All @@ -75,7 +82,7 @@ func (g *Gateway) getApprovalHandler(w http.ResponseWriter, r *http.Request) {
errDescription = InvalidHeader
return
}
msg.PrimarySpApproval = &types.Approval{ExpiredHeight: model.DefaultExpiredHeight}
msg.PrimarySpApproval = &types.Approval{ExpiredHeight: currentHeight + model.DefaultTimeoutHeight}
approvalSignature, err = g.signer.SignBucketApproval(context.Background(), &msg)
if err != nil {
log.Errorw("failed to sign create bucket approval", "error", err)
Expand All @@ -100,7 +107,7 @@ func (g *Gateway) getApprovalHandler(w http.ResponseWriter, r *http.Request) {
errDescription = InvalidHeader
return
}
msg.PrimarySpApproval = &types.Approval{ExpiredHeight: model.DefaultExpiredHeight}
msg.PrimarySpApproval = &types.Approval{ExpiredHeight: currentHeight + model.DefaultTimeoutHeight}
approvalSignature, err = g.signer.SignObjectApproval(context.Background(), &msg)
if err != nil {
log.Errorw("failed to sign create object approval", "error", err)
Expand Down