From 41b1f3ff2ee74f0b9c8a6f4b0d70655733098e48 Mon Sep 17 00:00:00 2001 From: arkadiuszos4chain Date: Tue, 26 Mar 2024 14:06:50 +0100 Subject: [PATCH 1/2] fix(BUX-000): fix postgres migration --- engine/model_xpubs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/model_xpubs.go b/engine/model_xpubs.go index 296af25fb..e50ab9506 100644 --- a/engine/model_xpubs.go +++ b/engine/model_xpubs.go @@ -19,8 +19,8 @@ type Xpub struct { // Model specific fields ID string `json:"id" toml:"id" yaml:"id" gorm:"<-:create;type:char(64);primaryKey;comment:This is the sha256(xpub) hash" bson:"_id"` CurrentBalance uint64 `json:"current_balance" toml:"current_balance" yaml:"current_balance" gorm:"<-;comment:The current balance of unspent satoshis" bson:"current_balance"` - NextInternalNum uint32 `json:"next_internal_num" toml:"next_internal_num" yaml:"next_internal_num" gorm:"<-;type:int not null;default:0;comment:The index derivation number use to generate NEXT internal xPub (internal xPub are used for change destinations)" bson:"next_internal_num"` - NextExternalNum uint32 `json:"next_external_num" toml:"next_external_num" yaml:"next_external_num" gorm:"<-;type:int not null;default:0;comment:The index derivation number use to generate NEXT external xPub (external xPub are used for address destinations)" bson:"next_external_num"` + NextInternalNum uint32 `json:"next_internal_num" toml:"next_internal_num" yaml:"next_internal_num" gorm:"<-;type:int;default:0;comment:The index derivation number use to generate NEXT internal xPub (internal xPub are used for change destinations)" bson:"next_internal_num"` + NextExternalNum uint32 `json:"next_external_num" toml:"next_external_num" yaml:"next_external_num" gorm:"<-;type:int;default:0;comment:The index derivation number use to generate NEXT external xPub (external xPub are used for address destinations)" bson:"next_external_num"` destinations []Destination `gorm:"-" bson:"-"` // json:"destinations,omitempty" } From 61ff4038262dbc0e9712c0c82a190bc24ebb0015 Mon Sep 17 00:00:00 2001 From: Damian Orzepowski Date: Wed, 27 Mar 2024 14:11:00 +0100 Subject: [PATCH 2/2] fix(BUX-000): fix for postgres migration of paymail model --- engine/model_paymail_addresses.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/model_paymail_addresses.go b/engine/model_paymail_addresses.go index 3a44b7975..d7007d7ed 100644 --- a/engine/model_paymail_addresses.go +++ b/engine/model_paymail_addresses.go @@ -30,9 +30,9 @@ type PaymailAddress struct { Avatar string `json:"avatar" toml:"avatar" yaml:"avatar" gorm:"<-;type:text;comment:This is avatar url" bson:"avatar"` // This is the url of the user (public profile) ExternalXpubKey string `json:"external_xpub_key" toml:"external_xpub_key" yaml:"external_xpub_key" gorm:"<-:create;type:varchar(512);index;comment:This is full xPub for external use, encryption optional" bson:"external_xpub_key"` // PublicKey hex encoded - ExternalXpubKeyNum uint32 `json:"external_xpub_num" toml:"external_xpub_num" yaml:"external_xpub_num" gorm:"<-;type:int not null;default:0;comment:Derivation number used to generate ExternalXpubKey:external_xpub_num"` - PubKeyNum uint32 `json:"pubkey_num" toml:"pubkey_num" yaml:"pubkey_num" gorm:"<-;type:int not null;default:0;comment:Derivation number use to create PKI public key:pubkey_num"` - XpubDerivationSeq uint32 `json:"xpub_derivation_seq" toml:"xpub_derivation_seq" yaml:"xpub_derivation_seq" gorm:"<-;type:int not null;default:0;comment:The index derivation number use to generate new external xpub child keys and rotate PubKey:xpub_derivation_seq"` + ExternalXpubKeyNum uint32 `json:"external_xpub_num" toml:"external_xpub_num" yaml:"external_xpub_num" gorm:"<-;type:int;default:0;comment:Derivation number used to generate ExternalXpubKey:external_xpub_num"` + PubKeyNum uint32 `json:"pubkey_num" toml:"pubkey_num" yaml:"pubkey_num" gorm:"<-;type:int;default:0;comment:Derivation number use to create PKI public key:pubkey_num"` + XpubDerivationSeq uint32 `json:"xpub_derivation_seq" toml:"xpub_derivation_seq" yaml:"xpub_derivation_seq" gorm:"<-;type:int;default:0;comment:The index derivation number use to generate new external xpub child keys and rotate PubKey:xpub_derivation_seq"` // Private fields externalXpubKeyDecrypted string