Skip to content

Commit 46095e0

Browse files
authored
Merge pull request #1526 from 0chain/fix/hardfork-backward-compatibility
Fix/hardfork backward compatibility
2 parents 5c05385 + d08a6bc commit 46095e0

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

code/go/0chain.net/blobbercore/handler/auth_ticket.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/0chain/blobber/code/go/0chain.net/core/encryption"
77
"github.com/0chain/blobber/code/go/0chain.net/core/node"
88
"github.com/0chain/common/core/common"
9+
"github.com/0chain/gosdk/zcncore"
910
"net/http"
1011
)
1112

@@ -34,14 +35,21 @@ type AuthTicketResponse struct {
3435
//
3536
// 200: AuthTicketResponse
3637
func GenerateAuthTicket(ctx context.Context, r *http.Request) (interface{}, error) {
38+
3739
clientID := r.URL.Query().Get("client_id")
3840
if clientID == "" {
3941
return nil, common.NewError("missing_client_id", "client_id is required")
4042
}
4143

4244
round := r.URL.Query().Get("round")
4345

44-
signature, err := node.Self.Sign(encryption.Hash(fmt.Sprintf("%s_%s", clientID, round)))
46+
payload := encryption.Hash(fmt.Sprintf("%s_%s", clientID, round))
47+
48+
if isActivated, err := zcncore.IsHardforkActivated("hermes"); err != nil || !isActivated {
49+
payload = clientID
50+
}
51+
52+
signature, err := node.Self.Sign(payload)
4553
if err != nil {
4654
return nil, common.NewError("signature_failed", "signature failed")
4755
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.5
66

77
require (
88
github.com/0chain/errors v1.0.3
9-
github.com/0chain/gosdk v1.18.15
9+
github.com/0chain/gosdk v1.18.18-0.20250106145917-0f4cb303af5c
1010
github.com/DATA-DOG/go-sqlmock v1.5.0
1111
github.com/didip/tollbooth/v6 v6.1.2
1212
github.com/go-openapi/runtime v0.26.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI=
4040
github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw=
4141
github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
4242
github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
43-
github.com/0chain/gosdk v1.18.15 h1:jujBBRAv2xendebjdoC6nMmoVl5w+uhDrKBqokIvxKI=
44-
github.com/0chain/gosdk v1.18.15/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw=
43+
github.com/0chain/gosdk v1.18.18-0.20250106145917-0f4cb303af5c h1:OhtnsZKkWJpUzzDJdsPpBeOv5qhksPbQ1QL2exxsQgY=
44+
github.com/0chain/gosdk v1.18.18-0.20250106145917-0f4cb303af5c/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw=
4545
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4646
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
4747
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=

0 commit comments

Comments
 (0)