Merge remote-tracking branch 'origin/staging' into sprint-1.12

0chain · Jan 21, 2024 · 6f48750 · 6f48750
2 parents 9bc91c6 + 6da82b9
commit 6f48750
Show file tree

Hide file tree

Showing 37 changed files with 265 additions and 196 deletions.
diff --git a/core/transaction/entity.go b/core/transaction/entity.go
@@ -138,6 +138,7 @@ const (
 	STORAGESC_WRITE_POOL_LOCK           = "write_pool_lock"
 	STORAGESC_WRITE_POOL_UNLOCK         = "write_pool_unlock"
 	STORAGESC_UPDATE_SETTINGS           = "update_settings"
+	ADD_HARDFORK                        = "add_hardfork"
 	STORAGESC_COLLECT_REWARD            = "collect_reward"
 	STORAGESC_KILL_BLOBBER              = "kill_blobber"
 	STORAGESC_KILL_VALIDATOR            = "kill_validator"
@@ -166,6 +167,7 @@ const (
 	ZCNSC_ADD_AUTHORIZER           = "add-authorizer"
 	ZCNSC_AUTHORIZER_HEALTH_CHECK  = "authorizer-health-check"
 	ZCNSC_DELETE_AUTHORIZER        = "delete-authorizer"
+	ZCNSC_COLLECT_REWARD 	       = "collect-rewards"
 
 	ESTIMATE_TRANSACTION_COST = `/v1/estimate_txn_fee`
 	FEES_TABLE                = `/v1/fees_table`

diff --git a/zboxcore/mocks/AllocationChange.go b/zboxcore/mocks/AllocationChange.go
diff --git a/zboxcore/mocks/EncryptionScheme.go b/zboxcore/mocks/EncryptionScheme.go
diff --git a/zboxcore/mocks/FileNameBuilder.go b/zboxcore/mocks/FileNameBuilder.go
diff --git a/zboxcore/mocks/Hasher.go b/zboxcore/mocks/Hasher.go
diff --git a/zboxcore/mocks/HttpClient.go b/zboxcore/mocks/HttpClient.go
diff --git a/zboxcore/mocks/LiveUploadReader.go b/zboxcore/mocks/LiveUploadReader.go
diff --git a/zboxcore/mocks/M3u8Writer.go b/zboxcore/mocks/M3u8Writer.go
diff --git a/zboxcore/mocks/RefEntity.go b/zboxcore/mocks/RefEntity.go
diff --git a/zboxcore/mocks/SCRestAPIHandler.go b/zboxcore/mocks/SCRestAPIHandler.go
diff --git a/zboxcore/mocks/SignFunc.go b/zboxcore/mocks/SignFunc.go
diff --git a/zboxcore/mocks/StatusCallback.go b/zboxcore/mocks/StatusCallback.go
diff --git a/zboxcore/mocks/Suite.go b/zboxcore/mocks/Suite.go
diff --git a/zboxcore/sdk/chunked_upload_blobber.go b/zboxcore/sdk/chunked_upload_blobber.go
@@ -400,6 +400,6 @@ func (sb *ChunkedUploadBlobber) processWriteMarker(
 		}
 		size += change.GetSize()
 	}
-
+	rootRef.CalculateHash()
 	return rootRef, lR.LatestWM, size, fileIDMeta, nil
 }
diff --git a/zboxcore/sdk/downloadworker.go b/zboxcore/sdk/downloadworker.go
@@ -373,10 +373,13 @@ func (req *DownloadRequest) processDownload(ctx context.Context) {
 	}
 	fRef := req.fRef
 	if fRef != nil && fRef.ActualFileHash == emptyFileDataHash {
-		if req.statusCallback != nil {
-			req.statusCallback.Completed(
-				req.allocationID, remotePathCB, fRef.Name, "", len(emptyFileDataHash), op)
+		logger.Logger.Info("File is empty")
+		_, err := req.fileHandler.Write([]byte(emptyFileDataHash))
+		if err != nil {
+			req.errorCB(errors.Wrap(err, "Write file failed"), remotePathCB)
+			return
 		}
+		req.fileHandler.Sync() //nolint
 		return
 	}
 	size, chunksPerShard, blocksPerShard := req.size, req.chunksPerShard, req.blocksPerShard

diff --git a/zcnbridge/mocks/EthereumClient.go b/zcnbridge/mocks/EthereumClient.go
diff --git a/zcnbridge/mocks/JobResult.go b/zcnbridge/mocks/JobResult.go