Merge pull request #1483 from 0chain/fix/v1-rootsig

dabasov · web-flow · commit 1af14153ba7b · 2024-10-23T14:49:04.000+03:00
fix signature payload for v1
diff --git a/code/go/0chain.net/blobbercore/handler/file_command_update.go b/code/go/0chain.net/blobbercore/handler/file_command_update.go
@@ -150,7 +150,7 @@ func (cmd *UpdateFileCommand) ProcessContent(ctx context.Context, allocationObj
 		if fileOutputData.ContentSize != cmd.fileChanger.Size {
 			return result, common.NewError("upload_error", fmt.Sprintf("File size mismatch. Expected: %d, Actual: %d", cmd.fileChanger.Size, fileOutputData.ContentSize))
 		}
-		hash := cmd.fileChanger.ActualHash + cmd.fileChanger.ValidationRoot
+		hash := cmd.fileChanger.ActualFileHashSignature + cmd.fileChanger.ValidationRoot
 		if allocationObj.IsStorageV2() {
 			hashData := fmt.Sprintf("%s:%s:%s:%s", cmd.fileChanger.ActualHash, cmd.fileChanger.ValidationRoot, cmd.fileChanger.FixedMerkleRoot, node.Self.ID)
 			hash = encryption.Hash(hashData)
diff --git a/code/go/0chain.net/blobbercore/handler/file_command_upload.go b/code/go/0chain.net/blobbercore/handler/file_command_upload.go
@@ -162,7 +162,7 @@ func (cmd *UploadFileCommand) ProcessContent(ctx context.Context, allocationObj
 		if fileOutputData.ContentSize != cmd.fileChanger.Size {
 			return result, common.NewError("upload_error", fmt.Sprintf("File size mismatch. Expected: %d, Actual: %d", cmd.fileChanger.Size, fileOutputData.ContentSize))
 		}
-		hash := cmd.fileChanger.ActualHash + cmd.fileChanger.ValidationRoot
+		hash := cmd.fileChanger.ActualFileHashSignature + cmd.fileChanger.ValidationRoot
 		if allocationObj.IsStorageV2() {
 			hashData := fmt.Sprintf("%s:%s:%s:%s", cmd.fileChanger.ActualHash, cmd.fileChanger.ValidationRoot, cmd.fileChanger.FixedMerkleRoot, node.Self.ID)
 			hash = encryption.Hash(hashData)

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func (cmd *UpdateFileCommand) ProcessContent(ctx context.Context, allocationObj`
`150`	`150`	`if fileOutputData.ContentSize != cmd.fileChanger.Size {`
`151`	`151`	`return result, common.NewError("upload_error", fmt.Sprintf("File size mismatch. Expected: %d, Actual: %d", cmd.fileChanger.Size, fileOutputData.ContentSize))`
`152`	`152`	`}`
`153`		`- hash := cmd.fileChanger.ActualHash + cmd.fileChanger.ValidationRoot`
	`153`	`+ hash := cmd.fileChanger.ActualFileHashSignature + cmd.fileChanger.ValidationRoot`
`154`	`154`	`if allocationObj.IsStorageV2() {`
`155`	`155`	`hashData := fmt.Sprintf("%s:%s:%s:%s", cmd.fileChanger.ActualHash, cmd.fileChanger.ValidationRoot, cmd.fileChanger.FixedMerkleRoot, node.Self.ID)`
`156`	`156`	`hash = encryption.Hash(hashData)`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ func (cmd *UploadFileCommand) ProcessContent(ctx context.Context, allocationObj`
`162`	`162`	`if fileOutputData.ContentSize != cmd.fileChanger.Size {`
`163`	`163`	`return result, common.NewError("upload_error", fmt.Sprintf("File size mismatch. Expected: %d, Actual: %d", cmd.fileChanger.Size, fileOutputData.ContentSize))`
`164`	`164`	`}`
`165`		`- hash := cmd.fileChanger.ActualHash + cmd.fileChanger.ValidationRoot`
	`165`	`+ hash := cmd.fileChanger.ActualFileHashSignature + cmd.fileChanger.ValidationRoot`
`166`	`166`	`if allocationObj.IsStorageV2() {`
`167`	`167`	`hashData := fmt.Sprintf("%s:%s:%s:%s", cmd.fileChanger.ActualHash, cmd.fileChanger.ValidationRoot, cmd.fileChanger.FixedMerkleRoot, node.Self.ID)`
`168`	`168`	`hash = encryption.Hash(hashData)`