Revert "Session key"

Hitenjain14 · web-flow · commit 1ba6e489acb9 · 2024-10-29T01:52:13.000+05:30
diff --git a/code/go/0chain.net/blobbercore/allocation/entity.go b/code/go/0chain.net/blobbercore/allocation/entity.go
@@ -62,9 +62,8 @@ type Allocation struct {
 	TimeUnit         time.Duration    `gorm:"column:time_unit;not null;default:172800000000000"`
 	StartTime        common.Timestamp `gorm:"column:start_time;not null"`
 	// Ending and cleaning
-	CleanedUp             bool   `gorm:"column:cleaned_up;not null;default:false"`
-	Finalized             bool   `gorm:"column:finalized;not null;default:false"`
-	OwnerSigningPublicKey string `gorm:"column:owner_signing_public_key;size:512;not null" json:"owner_signing_public_key"`
+	CleanedUp bool `gorm:"column:cleaned_up;not null;default:false"`
+	Finalized bool `gorm:"column:finalized;not null;default:false"`
 
 	// FileOptions to define file restrictions on an allocation for third-parties
 	// default 00000000 for all crud operations suggesting only owner has the below listed abilities.
diff --git a/code/go/0chain.net/blobbercore/allocation/file_changer_base.go b/code/go/0chain.net/blobbercore/allocation/file_changer_base.go
@@ -52,9 +52,8 @@ type BaseFileChanger struct {
 	EncryptedKeyPoint string `json:"encrypted_key_point,omitempty"`
 	CustomMeta        string `json:"custom_meta,omitempty"`
 
-	ChunkSize        int64 `json:"chunk_size,omitempty"` // the size of achunk. 64*1024 is default
-	IsFinal          bool  `json:"is_final,omitempty"`   // current chunk is last or not
-	SignatureVersion int   `json:"signature_version,omitempty"`
+	ChunkSize int64 `json:"chunk_size,omitempty"` // the size of achunk. 64*1024 is default
+	IsFinal   bool  `json:"is_final,omitempty"`   // current chunk is last or not
 
 	ChunkStartIndex int    `json:"chunk_start_index,omitempty"` // start index of chunks.
 	ChunkEndIndex   int    `json:"chunk_end_index,omitempty"`   // end index of chunks. all chunks MUST be uploaded one by one because of CompactMerkleTree
diff --git a/code/go/0chain.net/blobbercore/allocation/file_changer_update.go b/code/go/0chain.net/blobbercore/allocation/file_changer_update.go
@@ -106,7 +106,6 @@ func (nf *UpdateFileChanger) ApplyChange(ctx context.Context, rootRef *reference
 	fileRef.ChunkSize = nf.ChunkSize
 	fileRef.IsPrecommit = true
 	fileRef.FilestoreVersion = filestore.VERSION
-	fileRef.SignatureVersion = nf.SignatureVersion
 
 	return rootRef, nil
 }
@@ -174,7 +173,6 @@ func (nf *UpdateFileChanger) ApplyChangeV2(ctx context.Context, allocationRoot,
 		PathLevel:               len(strings.Split(strings.TrimRight(nf.Path, "/"), "/")),
 		NumBlocks:               int64(math.Ceil(float64(nf.Size*1.0) / float64(nf.ChunkSize))),
 		NumUpdates:              refResult.NumUpdates + 1,
-		SignatureVersion:        nf.SignatureVersion,
 	}
 	nf.storageVersion = 1
 	newFile.FileMetaHash = encryption.Hash(newFile.GetFileMetaHashDataV2())
diff --git a/code/go/0chain.net/blobbercore/allocation/file_changer_upload.go b/code/go/0chain.net/blobbercore/allocation/file_changer_upload.go
@@ -130,7 +130,6 @@ func (nf *UploadFileChanger) applyChange(ctx context.Context, rootRef *reference
 		HashToBeComputed:        true,
 		IsPrecommit:             true,
 		FilestoreVersion:        filestore.VERSION,
-		SignatureVersion:        nf.SignatureVersion,
 	}
 
 	fileID, ok := fileIDMeta[newFile.Path]
@@ -198,7 +197,6 @@ func (nf *UploadFileChanger) ApplyChangeV2(ctx context.Context, allocationRoot,
 		PathLevel:               len(strings.Split(strings.TrimRight(nf.Path, "/"), "/")),
 		NumBlocks:               int64(math.Ceil(float64(nf.Size*1.0) / float64(nf.ChunkSize))),
 		NumUpdates:              1,
-		SignatureVersion:        nf.SignatureVersion,
 	}
 	nf.storageVersion = 1
 	newFile.FileMetaHash = encryption.Hash(newFile.GetFileMetaHashDataV2())
diff --git a/code/go/0chain.net/blobbercore/allocation/protocol.go b/code/go/0chain.net/blobbercore/allocation/protocol.go
@@ -110,8 +110,8 @@ func FetchAllocationFromEventsDB(ctx context.Context, allocationID string, alloc
 	a.TimeUnit = sa.TimeUnit
 	a.FileOptions = sa.FileOptions
 	a.StartTime = sa.StartTime
+	// Only for testing purpose
 	a.StorageVersion = uint8(sa.StorageVersion)
-	a.OwnerSigningPublicKey = sa.OwnerSigningPublicKey
 
 	m := map[string]interface{}{
 		"allocation_id":  a.ID,
diff --git a/code/go/0chain.net/blobbercore/allocation/workers.go b/code/go/0chain.net/blobbercore/allocation/workers.go
@@ -246,7 +246,6 @@ func updateAllocationInDB(ctx context.Context, a *Allocation, sa *transaction.St
 	a.Tx = sa.Tx
 	a.OwnerID = sa.OwnerID
 	a.OwnerPublicKey = sa.OwnerPublicKey
-	a.OwnerSigningPublicKey = sa.OwnerSigningPublicKey
 
 	// // update fields
 	a.Expiration = sa.Expiration
@@ -264,7 +263,6 @@ func updateAllocationInDB(ctx context.Context, a *Allocation, sa *transaction.St
 	updateMap["finalized"] = a.Finalized
 	updateMap["file_options"] = a.FileOptions
 	updateMap["blobber_size"] = a.BlobberSize
-	updateMap["owner_signing_public_key"] = a.OwnerSigningPublicKey
 
 	updateOption := func(alloc *Allocation) {
 		alloc.Tx = a.Tx
@@ -275,7 +273,6 @@ func updateAllocationInDB(ctx context.Context, a *Allocation, sa *transaction.St
 		alloc.Finalized = a.Finalized
 		alloc.FileOptions = a.FileOptions
 		alloc.BlobberSize = a.BlobberSize
-		alloc.OwnerSigningPublicKey = a.OwnerSigningPublicKey
 	}
 
 	// update terms
diff --git a/code/go/0chain.net/blobbercore/allocation/zcn.go b/code/go/0chain.net/blobbercore/allocation/zcn.go
@@ -52,8 +52,6 @@ func SyncAllocation(allocationId string) (*Allocation, error) {
 	alloc.Finalized = sa.Finalized
 	alloc.TimeUnit = sa.TimeUnit
 	alloc.FileOptions = sa.FileOptions
-	alloc.StorageVersion = uint8(sa.StorageVersion)
-	alloc.OwnerSigningPublicKey = sa.OwnerSigningPublicKey
 
 	// related terms
 	terms := make([]*Terms, 0, len(sa.BlobberDetails))
diff --git a/code/go/0chain.net/blobbercore/challenge/protocol.go b/code/go/0chain.net/blobbercore/challenge/protocol.go
@@ -5,14 +5,13 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
+	"github.com/0chain/blobber/code/go/0chain.net/core/transaction"
+	coreTxn "github.com/0chain/gosdk/core/transaction"
 	"math/rand"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/0chain/blobber/code/go/0chain.net/core/transaction"
-	coreTxn "github.com/0chain/gosdk/core/transaction"
-
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/allocation"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/filestore"
@@ -367,7 +366,6 @@ func (cr *ChallengeEntity) getPostDataV2(ctx context.Context, allocationObj *all
 			FixedMerkleRoot:         ref.FixedMerkleRoot,
 			Size:                    ref.Size,
 			FileMetaHash:            ref.FileMetaHash,
-			SignatureVersion:        ref.SignatureVersion,
 		}
 		postData["meta"] = metaRef
 	}
diff --git a/code/go/0chain.net/blobbercore/handler/file_command_update.go b/code/go/0chain.net/blobbercore/handler/file_command_update.go
@@ -155,15 +155,7 @@ func (cmd *UpdateFileCommand) ProcessContent(ctx context.Context, allocationObj
 			hashData := fmt.Sprintf("%s:%s:%s:%s", cmd.fileChanger.ActualHash, cmd.fileChanger.ValidationRoot, cmd.fileChanger.FixedMerkleRoot, node.Self.ID)
 			hash = encryption.Hash(hashData)
 		}
-		var (
-			err    error
-			verify bool
-		)
-		if cmd.fileChanger.SignatureVersion == reference.SignatureV2 {
-			verify, err = encryption.VerifyEd25519(allocationObj.OwnerSigningPublicKey, cmd.fileChanger.ValidationRootSignature, hash)
-		} else {
-			verify, err = encryption.Verify(allocationObj.OwnerPublicKey, cmd.fileChanger.ValidationRootSignature, hash)
-		}
+		verify, err := encryption.Verify(allocationObj.OwnerPublicKey, cmd.fileChanger.ValidationRootSignature, hash)
 		if err != nil || !verify {
 			logging.Logger.Error("UpdateFileCommand.VerifySignature", zap.Error(err))
 			return result, common.NewError("update_error", "Failed to verify validation root signature. ")
diff --git a/code/go/0chain.net/blobbercore/handler/file_command_upload.go b/code/go/0chain.net/blobbercore/handler/file_command_upload.go
@@ -167,15 +167,7 @@ func (cmd *UploadFileCommand) ProcessContent(ctx context.Context, allocationObj
 			hashData := fmt.Sprintf("%s:%s:%s:%s", cmd.fileChanger.ActualHash, cmd.fileChanger.ValidationRoot, cmd.fileChanger.FixedMerkleRoot, node.Self.ID)
 			hash = encryption.Hash(hashData)
 		}
-		var (
-			err    error
-			verify bool
-		)
-		if cmd.fileChanger.SignatureVersion == reference.SignatureV2 {
-			verify, err = encryption.VerifyEd25519(allocationObj.OwnerSigningPublicKey, cmd.fileChanger.ValidationRootSignature, hash)
-		} else {
-			verify, err = encryption.Verify(allocationObj.OwnerPublicKey, cmd.fileChanger.ValidationRootSignature, hash)
-		}
+		verify, err := encryption.Verify(allocationObj.OwnerPublicKey, cmd.fileChanger.ValidationRootSignature, hash)
 		if err != nil || !verify {
 			logging.Logger.Error("UploadFileCommand.VerifySignature", zap.Error(err))
 			return result, common.NewError("upload_error", "Failed to verify validation root signature. ")
diff --git a/code/go/0chain.net/blobbercore/reference/ref.go b/code/go/0chain.net/blobbercore/reference/ref.go
@@ -28,7 +28,6 @@ const (
 
 	DIR_LIST_TAG  = "dirlist"
 	FILE_LIST_TAG = "filelist"
-	SignatureV2   = 1
 )
 
 var (
@@ -92,7 +91,6 @@ type Ref struct {
 	NumUpdates        int64          `gorm:"column:num_of_updates" json:"num_of_updates"`
 	NumBlockDownloads int64          `gorm:"column:num_of_block_downloads" json:"num_of_block_downloads"`
 	FilestoreVersion  int            `gorm:"column:filestore_version" json:"-"`
-	SignatureVersion  int            `gorm:"column:signature_version" json:"signature_version" filelist:"signature_version"`
 	IsEmpty           bool           `gorm:"-" dirlist:"is_empty"`
 	HashToBeComputed  bool           `gorm:"-"`
 	prevID            int64          `gorm:"-"`
@@ -150,7 +148,6 @@ type PaginatedRef struct { //Gorm smart select fields.
 	EncryptedKey            string `gorm:"column:encrypted_key" json:"encrypted_key,omitempty"`
 	EncryptedKeyPoint       string `gorm:"column:encrypted_key_point" json:"encrypted_key_point,omitempty"`
 	FileMetaHash            string `gorm:"column:file_meta_hash;size:64;not null" dirlist:"file_meta_hash" filelist:"file_meta_hash"`
-	SignatureVersion        int    `gorm:"column:signature_version" json:"signature_version,omitempty" filelist:"signature_version"`
 
 	CreatedAt common.Timestamp `gorm:"column:created_at" json:"created_at,omitempty"`
 	UpdatedAt common.Timestamp `gorm:"column:updated_at" json:"updated_at,omitempty"`
@@ -169,7 +166,6 @@ type RefMeta struct {
 	FixedMerkleRoot         string `json:"fixed_merkle_root"`
 	Size                    int64  `json:"size"`
 	FileMetaHash            string `json:"file_meta_hash"`
-	SignatureVersion        int    `json:"signature_version"`
 }
 
 // GetReferenceLookup hash(allocationID + ":" + path)
diff --git a/code/go/0chain.net/core/encryption/keys.go b/code/go/0chain.net/core/encryption/keys.go
@@ -2,8 +2,6 @@ package encryption
 
 import (
 	"bufio"
-	"crypto/ed25519"
-	"encoding/hex"
 	"io"
 	"strings"
 
@@ -15,10 +13,8 @@ import (
 	"github.com/herumi/bls-go-binary/bls"
 )
 
-/*
-ReadKeys - reads a publicKey and a privateKey from a Reader.
-They are assumed to be in two separate lines one followed by the other
-*/
+/*ReadKeys - reads a publicKey and a privateKey from a Reader.
+They are assumed to be in two separate lines one followed by the other*/
 func ReadKeys(reader io.Reader) (publicKey, privateKey, publicIp, port string) {
 	scanner := bufio.NewScanner(reader)
 	scanner.Scan()
@@ -48,38 +44,14 @@ func Verify(publicKey, signature, hash string) (bool, error) {
 	return false, common.NewError("invalid_signature_scheme", "Invalid signature scheme. Please check configuration")
 }
 
-// VerifyEd25519 - verify the signature using the public key
-func VerifyEd25519(publicKey, signature, hash string) (bool, error) {
-	if len(publicKey) == 0 {
-		return false, common.NewError("invalid_public_key", "Invalid public key")
-	}
-	if len(signature) == 0 {
-		return false, common.NewError("invalid_signature", "Invalid signature")
-	}
-	sig, err := hex.DecodeString(signature)
-	if err != nil {
-		return false, err
-	}
-	pub, err := hex.DecodeString(publicKey)
-	if err != nil {
-		return false, err
-	}
-	msg, err := hex.DecodeString(hash)
-	if err != nil {
-		return false, err
-	}
-	return ed25519.Verify(pub, msg, sig), nil
-}
-
 // If input is normal herumi/bls public key, it returns it immmediately.
-//
-//	So this is completely backward compatible with herumi/bls.
-//
+//   So this is completely backward compatible with herumi/bls.
 // If input is MIRACL public key, convert it to herumi/bls public key.
 //
 // This is an example of the raw public key we expect from MIRACL
 var miraclExamplePK = `0418a02c6bd223ae0dfda1d2f9a3c81726ab436ce5e9d17c531ff0a385a13a0b491bdfed3a85690775ee35c61678957aaba7b1a1899438829f1dc94248d87ed36817f6dfafec19bfa87bf791a4d694f43fec227ae6f5a867490e30328cac05eaff039ac7dfc3364e851ebd2631ea6f1685609fc66d50223cc696cb59ff2fee47ac`
 
+//
 // This is an example of the same MIRACL public key serialized with ToString().
 // pk ([1bdfed3a85690775ee35c61678957aaba7b1a1899438829f1dc94248d87ed368,18a02c6bd223ae0dfda1d2f9a3c81726ab436ce5e9d17c531ff0a385a13a0b49],[039ac7dfc3364e851ebd2631ea6f1685609fc66d50223cc696cb59ff2fee47ac,17f6dfafec19bfa87bf791a4d694f43fec227ae6f5a867490e30328cac05eaff])
 func MiraclToHerumiPK(pk string) string {
diff --git a/code/go/0chain.net/core/transaction/entity.go b/code/go/0chain.net/core/transaction/entity.go
@@ -53,21 +53,20 @@ type BlobberAllocation struct {
 }
 
 type StorageAllocation struct {
-	ID                    string               `json:"id"`
-	Tx                    string               `json:"tx"`
-	OwnerPublicKey        string               `json:"owner_public_key"`
-	OwnerID               string               `json:"owner_id"`
-	Size                  int64                `json:"size"`
-	UsedSize              int64                `json:"used_size"`
-	Expiration            common.Timestamp     `json:"expiration_date"`
-	BlobberDetails        []*BlobberAllocation `json:"blobber_details"`
-	Finalized             bool                 `json:"finalized"`
-	TimeUnit              time.Duration        `json:"time_unit"`
-	WritePool             uint64               `json:"write_pool"`
-	FileOptions           uint16               `json:"file_options"`
-	StartTime             common.Timestamp     `json:"start_time"`
-	StorageVersion        int                  `json:"storage_version"`
-	OwnerSigningPublicKey string               `json:"owner_signing_public_key"`
+	ID             string               `json:"id"`
+	Tx             string               `json:"tx"`
+	OwnerPublicKey string               `json:"owner_public_key"`
+	OwnerID        string               `json:"owner_id"`
+	Size           int64                `json:"size"`
+	UsedSize       int64                `json:"used_size"`
+	Expiration     common.Timestamp     `json:"expiration_date"`
+	BlobberDetails []*BlobberAllocation `json:"blobber_details"`
+	Finalized      bool                 `json:"finalized"`
+	TimeUnit       time.Duration        `json:"time_unit"`
+	WritePool      uint64               `json:"write_pool"`
+	FileOptions    uint16               `json:"file_options"`
+	StartTime      common.Timestamp     `json:"start_time"`
+	StorageVersion int                  `json:"storage_version"`
 
 	DataShards   int64 `json:"data_shards"`
 	ParityShards int64 `json:"parity_shards"`
diff --git a/code/go/0chain.net/validatorcore/storage/challenge_handler.go b/code/go/0chain.net/validatorcore/storage/challenge_handler.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/hex"
 	"encoding/json"
+	"github.com/0chain/gosdk/zboxcore/sdk"
 	"io"
 	"net/http"
 	"strings"
@@ -13,7 +14,6 @@ import (
 	"github.com/0chain/blobber/code/go/0chain.net/core/common"
 	"github.com/0chain/blobber/code/go/0chain.net/core/logging"
 	"github.com/0chain/blobber/code/go/0chain.net/core/node"
-	"github.com/0chain/blobber/code/go/0chain.net/core/transaction"
 
 	"go.uber.org/zap"
 	"golang.org/x/crypto/sha3"
@@ -42,12 +42,14 @@ func challengeHandler(ctx context.Context, r *http.Request) (interface{}, error)
 
 	time.Sleep(1 * time.Second)
 
-	allocationObj, err := requestAllocation(challengeObj.AllocationID)
+	sdkAlloc, err := sdk.GetAllocation(challengeObj.AllocationID)
 	if err != nil {
 		logging.Logger.Error("Error getting allocation from chain", zap.String("allocation_id", challengeObj.AllocationID), zap.Error(err))
 		return nil, common.NewError("invalid_parameters", "Allocation could not be verified. "+err.Error())
 	}
 
+	allocationObj := sdkAllocToBlobberAlloc(sdkAlloc)
+
 	err = challengeRequest.VerifyChallenge(challengeObj, allocationObj)
 	if err != nil {
 		updateStats(false)
@@ -59,31 +61,17 @@ func challengeHandler(ctx context.Context, r *http.Request) (interface{}, error)
 	return ValidValidationTicket(challengeObj, challengeRequest.ChallengeID, challengeHash)
 }
 
-func requestAllocation(allocID string) (allocation *Allocation, err error) {
-	var b []byte
-	b, err = transaction.MakeSCRestAPICall(
-		transaction.STORAGE_CONTRACT_ADDRESS,
-		"/allocation",
-		map[string]string{"allocation": allocID})
-	if err != nil {
-		return
-	}
-	sa := new(transaction.StorageAllocation)
-	err = json.Unmarshal(b, sa)
-	if err != nil {
-		return
-	}
-	allocation = &Allocation{
-		ID:                    sa.ID,
-		DataShards:            sa.DataShards,
-		ParityShards:          sa.ParityShards,
-		Size:                  sa.Size,
-		Expiration:            sa.Expiration,
-		Owner:                 sa.OwnerID,
-		OwnerPublicKey:        sa.OwnerPublicKey,
-		OwnerSigningPublicKey: sa.OwnerSigningPublicKey,
+func sdkAllocToBlobberAlloc(sdkAlloc *sdk.Allocation) *Allocation {
+	return &Allocation{
+		ID:             sdkAlloc.ID,
+		DataShards:     sdkAlloc.DataShards,
+		ParityShards:   sdkAlloc.ParityShards,
+		Size:           sdkAlloc.Size,
+		Owner:          sdkAlloc.Owner,
+		OwnerPublicKey: sdkAlloc.OwnerPublicKey,
+		UsedSize:       sdkAlloc.Stats.UsedSize,
+		Expiration:     common.Timestamp(sdkAlloc.Expiration),
 	}
-	return
 }
 
 func NewChallengeRequest(r *http.Request) (*ChallengeRequest, string, error) {
diff --git a/code/go/0chain.net/validatorcore/storage/models.go b/code/go/0chain.net/validatorcore/storage/models.go
diff --git a/code/go/0chain.net/validatorcore/storage/models_test.go b/code/go/0chain.net/validatorcore/storage/models_test.go
diff --git a/goose/migrations/1730098482_session_key.sql b/goose/migrations/1730098482_session_key.sql

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@ func (nf UpdateFileChanger) ApplyChange(ctx context.Context, rootRef reference`
`106`	`106`	`fileRef.ChunkSize = nf.ChunkSize`
`107`	`107`	`fileRef.IsPrecommit = true`
`108`	`108`	`fileRef.FilestoreVersion = filestore.VERSION`
`109`		`- fileRef.SignatureVersion = nf.SignatureVersion`
`110`	`109`
`111`	`110`	`return rootRef, nil`
`112`	`111`	`}`
`@@ -174,7 +173,6 @@ func (nf *UpdateFileChanger) ApplyChangeV2(ctx context.Context, allocationRoot,`
`174`	`173`	`PathLevel: len(strings.Split(strings.TrimRight(nf.Path, "/"), "/")),`
`175`	`174`	`NumBlocks: int64(math.Ceil(float64(nf.Size*1.0) / float64(nf.ChunkSize))),`
`176`	`175`	`NumUpdates: refResult.NumUpdates + 1,`
`177`		`- SignatureVersion: nf.SignatureVersion,`
`178`	`176`	`}`
`179`	`177`	`nf.storageVersion = 1`
`180`	`178`	`newFile.FileMetaHash = encryption.Hash(newFile.GetFileMetaHashDataV2())`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ func (nf UploadFileChanger) applyChange(ctx context.Context, rootRef reference`
`130`	`130`	`HashToBeComputed: true,`
`131`	`131`	`IsPrecommit: true,`
`132`	`132`	`FilestoreVersion: filestore.VERSION,`
`133`		`- SignatureVersion: nf.SignatureVersion,`
`134`	`133`	`}`
`135`	`134`
`136`	`135`	`fileID, ok := fileIDMeta[newFile.Path]`
`@@ -198,7 +197,6 @@ func (nf *UploadFileChanger) ApplyChangeV2(ctx context.Context, allocationRoot,`
`198`	`197`	`PathLevel: len(strings.Split(strings.TrimRight(nf.Path, "/"), "/")),`
`199`	`198`	`NumBlocks: int64(math.Ceil(float64(nf.Size*1.0) / float64(nf.ChunkSize))),`
`200`	`199`	`NumUpdates: 1,`
`201`		`- SignatureVersion: nf.SignatureVersion,`
`202`	`200`	`}`
`203`	`201`	`nf.storageVersion = 1`
`204`	`202`	`newFile.FileMetaHash = encryption.Hash(newFile.GetFileMetaHashDataV2())`