Merge branch 'sprint-1.10' into replace-with-multiops

0chain · Aug 24, 2023 · 883a8bb · 883a8bb
2 parents 5e2a551 + e154a63
commit 883a8bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/code/go/0chain.net/blobbercore/allocation/file_changer_base.go b/code/go/0chain.net/blobbercore/allocation/file_changer_base.go
@@ -45,8 +45,9 @@ type BaseFileChanger struct {
 	ThumbnailSize     int64  `json:"thumbnail_size"`
 	ThumbnailFilename string `json:"thumbnail_filename"`
 
-	EncryptedKey string `json:"encrypted_key,omitempty"`
-	CustomMeta   string `json:"custom_meta,omitempty"`
+	EncryptedKey      string `json:"encrypted_key,omitempty"`
+	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

diff --git a/code/go/0chain.net/blobbercore/reference/ref.go b/code/go/0chain.net/blobbercore/reference/ref.go
@@ -59,6 +59,7 @@ type Ref struct {
 	ActualThumbnailSize     int64  `gorm:"column:actual_thumbnail_size;not null;default:0" filelist:"actual_thumbnail_size"`
 	ActualThumbnailHash     string `gorm:"column:actual_thumbnail_hash;size:64;not null" filelist:"actual_thumbnail_hash"`
 	EncryptedKey            string `gorm:"column:encrypted_key;size:64" filelist:"encrypted_key"`
+	EncryptedKeyPoint       string `gorm:"column:encrypted_key_point;size:64" filelist:"encrypted_key_point"`
 	Children                []*Ref `gorm:"-"`
 	childrenLoaded          bool
 	CreatedAt               common.Timestamp `gorm:"column:created_at;index:idx_created_at,sort:desc" dirlist:"created_at" filelist:"created_at"`
@@ -118,6 +119,7 @@ type PaginatedRef struct { //Gorm smart select fields.
 	ActualThumbnailSize     int64  `gorm:"column:actual_thumbnail_size" json:"actual_thumbnail_size,omitempty"`
 	ActualThumbnailHash     string `gorm:"column:actual_thumbnail_hash" json:"actual_thumbnail_hash,omitempty"`
 	EncryptedKey            string `gorm:"column:encrypted_key" json:"encrypted_key,omitempty"`
+	EncryptedKeyPoint       string `gorm:"column:encrypted_key_point" json:"encrypted_key_point,omitempty"`
 
 	CreatedAt common.Timestamp `gorm:"column:created_at" json:"created_at,omitempty"`
 	UpdatedAt common.Timestamp `gorm:"column:updated_at" json:"updated_at,omitempty"`

diff --git a/goose/migrations/001_blobber_meta.sql b/goose/migrations/001_blobber_meta.sql
@@ -332,6 +332,7 @@ CREATE TABLE public.reference_objects (
     actual_thumbnail_size bigint DEFAULT 0 NOT NULL,
     actual_thumbnail_hash character varying(64) NOT NULL,
     encrypted_key character varying(64),
+    encrypted_key_point character varying(64),
     created_at bigint,
     updated_at bigint,
     deleted_at timestamp with time zone,