Rollback solana address (#117)

ice-blockchain · Feb 5, 2024 · 4580880 · 4580880
1 parent 17aedf4
commit 4580880
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 118 deletions.
diff --git a/cmd/eskimo-hut/api/docs.go b/cmd/eskimo-hut/api/docs.go
@@ -1203,11 +1203,6 @@ const docTemplate = `{
                         "name": "clearMiningBlockchainAccountAddress",
                         "in": "formData"
                     },
-                    {
-                        "type": "boolean",
-                        "name": "clearSolanaMiningBlockchainAccountAddress",
-                        "in": "formData"
-                    },
                     {
                         "type": "string",
                         "description": "Optional. Example: ` + "`" + `{\"key1\":{\"something\":\"somethingElse\"},\"key2\":\"value\"}` + "`" + `.",
@@ -1290,11 +1285,6 @@ const docTemplate = `{
                         "name": "resetProfilePicture",
                         "in": "formData"
                     },
-                    {
-                        "type": "string",
-                        "name": "solanaMiningBlockchainAccountAddress",
-                        "in": "formData"
-                    },
                     {
                         "type": "string",
                         "description": "Optional. Example:` + "`" + `jdoe` + "`" + `.",
@@ -1803,10 +1793,6 @@ const docTemplate = `{
                         "type": "string"
                     }
                 },
-                "solanaMiningBlockchainAccountAddress": {
-                    "type": "string",
-                    "example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
-                },
                 "updatedAt": {
                     "type": "string",
                     "example": "2022-01-03T16:20:52.156534Z"
@@ -2136,10 +2122,6 @@ const docTemplate = `{
                         "type": "string"
                     }
                 },
-                "solanaMiningBlockchainAccountAddress": {
-                    "type": "string",
-                    "example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
-                },
                 "updatedAt": {
                     "type": "string",
                     "example": "2022-01-03T16:20:52.156534Z"

diff --git a/cmd/eskimo-hut/api/swagger.json b/cmd/eskimo-hut/api/swagger.json
@@ -1197,11 +1197,6 @@
                         "name": "clearMiningBlockchainAccountAddress",
                         "in": "formData"
                     },
-                    {
-                        "type": "boolean",
-                        "name": "clearSolanaMiningBlockchainAccountAddress",
-                        "in": "formData"
-                    },
                     {
                         "type": "string",
                         "description": "Optional. Example: `{\"key1\":{\"something\":\"somethingElse\"},\"key2\":\"value\"}`.",
@@ -1284,11 +1279,6 @@
                         "name": "resetProfilePicture",
                         "in": "formData"
                     },
-                    {
-                        "type": "string",
-                        "name": "solanaMiningBlockchainAccountAddress",
-                        "in": "formData"
-                    },
                     {
                         "type": "string",
                         "description": "Optional. Example:`jdoe`.",
@@ -1797,10 +1787,6 @@
                         "type": "string"
                     }
                 },
-                "solanaMiningBlockchainAccountAddress": {
-                    "type": "string",
-                    "example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
-                },
                 "updatedAt": {
                     "type": "string",
                     "example": "2022-01-03T16:20:52.156534Z"
@@ -2130,10 +2116,6 @@
                         "type": "string"
                     }
                 },
-                "solanaMiningBlockchainAccountAddress": {
-                    "type": "string",
-                    "example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
-                },
                 "updatedAt": {
                     "type": "string",
                     "example": "2022-01-03T16:20:52.156534Z"

diff --git a/cmd/eskimo-hut/api/swagger.yaml b/cmd/eskimo-hut/api/swagger.yaml
@@ -164,9 +164,6 @@ definitions:
         additionalProperties:
           type: string
         type: object
-      solanaMiningBlockchainAccountAddress:
-        example: 0x4B73C58370AEfcEf86A6021afCDe5673511376B2
-        type: string
       updatedAt:
         example: "2022-01-03T16:20:52.156534Z"
         type: string
@@ -392,9 +389,6 @@ definitions:
         additionalProperties:
           type: string
         type: object
-      solanaMiningBlockchainAccountAddress:
-        example: 0x4B73C58370AEfcEf86A6021afCDe5673511376B2
-        type: string
       updatedAt:
         example: "2022-01-03T16:20:52.156534Z"
         type: string
@@ -1368,9 +1362,6 @@ paths:
       - in: formData
         name: clearMiningBlockchainAccountAddress
         type: boolean
-      - in: formData
-        name: clearSolanaMiningBlockchainAccountAddress
-        type: boolean
       - description: 'Optional. Example: `{"key1":{"something":"somethingElse"},"key2":"value"}`.'
         in: formData
         name: clientData
@@ -1427,9 +1418,6 @@ paths:
         in: formData
         name: resetProfilePicture
         type: boolean
-      - in: formData
-        name: solanaMiningBlockchainAccountAddress
-        type: string
       - description: Optional. Example:`jdoe`.
         in: formData
         name: username

diff --git a/cmd/eskimo-hut/contract.go b/cmd/eskimo-hut/contract.go
@@ -56,10 +56,9 @@ type (
 		// Optional. Example:`did:ethr:0x4B73C58370AEfcEf86A6021afCDe5673511376B2`.
 		ReferredBy string `form:"referredBy" formMultipart:"referredBy"`
 		// Optional. Example: Array of [`globalRank`,`referralCount`,`level`,`role`,`badges`].
-		HiddenProfileElements                     *users.Enum[users.HiddenProfileElement] `form:"hiddenProfileElements" formMultipart:"hiddenProfileElements" swaggertype:"array,string" enums:"globalRank,referralCount,level,role,badges"` //nolint:lll // .
-		ClearHiddenProfileElements                *bool                                   `form:"clearHiddenProfileElements" formMultipart:"clearHiddenProfileElements"`                                                                     //nolint:lll //.
-		ClearMiningBlockchainAccountAddress       *bool                                   `form:"clearMiningBlockchainAccountAddress" formMultipart:"clearMiningBlockchainAccountAddress"`                                                   //nolint:lll //.
-		ClearSolanaMiningBlockchainAccountAddress *bool                                   `form:"clearSolanaMiningBlockchainAccountAddress" formMultipart:"clearSolanaMiningBlockchainAccountAddress"`                                       //nolint:lll //.
+		HiddenProfileElements               *users.Enum[users.HiddenProfileElement] `form:"hiddenProfileElements" formMultipart:"hiddenProfileElements" swaggertype:"array,string" enums:"globalRank,referralCount,level,role,badges"` //nolint:lll // .
+		ClearHiddenProfileElements          *bool                                   `form:"clearHiddenProfileElements" formMultipart:"clearHiddenProfileElements"`
+		ClearMiningBlockchainAccountAddress *bool                                   `form:"clearMiningBlockchainAccountAddress" formMultipart:"clearMiningBlockchainAccountAddress"` //nolint:lll //.
 		// Optional. Example: `{"key1":{"something":"somethingElse"},"key2":"value"}`.
 		ClientData *string     `form:"clientData" formMultipart:"clientData"`
 		clientData *users.JSON //nolint:revive // It's meant for internal use only.
@@ -86,9 +85,8 @@ type (
 		// Optional. Example:`Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2`.
 		AgendaPhoneNumberHashes string `form:"agendaPhoneNumberHashes" formMultipart:"agendaPhoneNumberHashes"`
 		// Optional. Example:`some hash`.
-		BlockchainAccountAddress             string `form:"blockchainAccountAddress" formMultipart:"blockchainAccountAddress"`
-		MiningBlockchainAccountAddress       string `form:"miningBlockchainAccountAddress" formMultipart:"miningBlockchainAccountAddress"`
-		SolanaMiningBlockchainAccountAddress string `form:"solanaMiningBlockchainAccountAddress" formMultipart:"solanaMiningBlockchainAccountAddress"`
+		BlockchainAccountAddress       string `form:"blockchainAccountAddress" formMultipart:"blockchainAccountAddress"`
+		MiningBlockchainAccountAddress string `form:"miningBlockchainAccountAddress" formMultipart:"miningBlockchainAccountAddress"`
 		// Optional. Example:`en`.
 		Language string `form:"language" formMultipart:"language"`
 		// Optional. Example:`1232412415326543647657`.

diff --git a/cmd/eskimo-hut/users.go b/cmd/eskimo-hut/users.go
@@ -286,13 +286,9 @@ func buildUserForModification(req *server.Request[ModifyUserRequestBody, ModifyU
 	usr.AgendaPhoneNumberHashes = &req.Data.AgendaPhoneNumberHashes
 	usr.BlockchainAccountAddress = req.Data.BlockchainAccountAddress
 	usr.MiningBlockchainAccountAddress = strings.ToLower(req.Data.MiningBlockchainAccountAddress)
-	usr.SolanaMiningBlockchainAccountAddress = req.Data.SolanaMiningBlockchainAccountAddress
 	if req.Data.ClearMiningBlockchainAccountAddress != nil && *req.Data.ClearMiningBlockchainAccountAddress {
 		usr.MiningBlockchainAccountAddress = usr.ID
 	}
-	if req.Data.ClearSolanaMiningBlockchainAccountAddress != nil && *req.Data.ClearSolanaMiningBlockchainAccountAddress {
-		usr.SolanaMiningBlockchainAccountAddress = usr.ID
-	}
 	usr.Language = req.Data.Language
 	if req.Data.ClearHiddenProfileElements != nil && *req.Data.ClearHiddenProfileElements {
 		empty := make(users.Enum[users.HiddenProfileElement], 0, 0) //nolint:gosimple // .
@@ -334,9 +330,7 @@ func (a *ModifyUserRequestBody) verifyIfAtLeastOnePropertyProvided() *server.Res
 		a.AgendaPhoneNumberHashes == "" &&
 		a.BlockchainAccountAddress == "" &&
 		a.MiningBlockchainAccountAddress == "" &&
-		a.SolanaMiningBlockchainAccountAddress == "" &&
 		a.ClearMiningBlockchainAccountAddress == nil &&
-		a.ClearSolanaMiningBlockchainAccountAddress == nil &&
 		a.HiddenProfileElements == nil &&
 		a.ClearHiddenProfileElements == nil &&
 		a.ClientData == nil &&

diff --git a/cmd/eskimo/api/docs.go b/cmd/eskimo/api/docs.go
@@ -762,10 +762,6 @@ const docTemplate = `{
                         "type": "string"
                     }
                 },
-                "solanaMiningBlockchainAccountAddress": {
-                    "type": "string",
-                    "example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
-                },
                 "t1ReferralCount": {
                     "type": "integer",
                     "example": 100
@@ -1116,10 +1112,6 @@ const docTemplate = `{
                         "type": "string"
                     }
                 },
-                "solanaMiningBlockchainAccountAddress": {
-                    "type": "string",
-                    "example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
-                },
                 "t1ReferralCount": {
                     "type": "integer",
                     "example": 100

diff --git a/cmd/eskimo/api/swagger.json b/cmd/eskimo/api/swagger.json
@@ -756,10 +756,6 @@
                         "type": "string"
                     }
                 },
-                "solanaMiningBlockchainAccountAddress": {
-                    "type": "string",
-                    "example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
-                },
                 "t1ReferralCount": {
                     "type": "integer",
                     "example": 100
@@ -1110,10 +1106,6 @@
                         "type": "string"
                     }
                 },
-                "solanaMiningBlockchainAccountAddress": {
-                    "type": "string",
-                    "example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
-                },
                 "t1ReferralCount": {
                     "type": "integer",
                     "example": 100

diff --git a/cmd/eskimo/api/swagger.yaml b/cmd/eskimo/api/swagger.yaml
@@ -87,9 +87,6 @@ definitions:
         additionalProperties:
           type: string
         type: object
-      solanaMiningBlockchainAccountAddress:
-        example: 0x4B73C58370AEfcEf86A6021afCDe5673511376B2
-        type: string
       t1ReferralCount:
         example: 100
         type: integer
@@ -343,9 +340,6 @@ definitions:
         additionalProperties:
           type: string
         type: object
-      solanaMiningBlockchainAccountAddress:
-        example: 0x4B73C58370AEfcEf86A6021afCDe5673511376B2
-        type: string
       t1ReferralCount:
         example: 100
         type: integer

diff --git a/users/DDL.sql b/users/DDL.sql
@@ -26,7 +26,6 @@ CREATE TABLE IF NOT EXISTS users  (
                     kyc_steps_last_updated_at timestamp[],
                     kyc_steps_created_at timestamp[],
                     mining_blockchain_account_address text NOT NULL UNIQUE,
-                    solana_mining_blockchain_account_address text NOT NULL UNIQUE,
                     blockchain_account_address text NOT NULL UNIQUE,
                     language text NOT NULL DEFAULT 'en',
                     lookup tsvector NOT NULL)
@@ -48,9 +47,9 @@ END $$;
 ALTER TABLE users ADD COLUMN IF NOT EXISTS kyc_step_blocked smallint NOT NULL DEFAULT 0;
 ALTER TABLE users ADD COLUMN IF NOT EXISTS kyc_steps_last_updated_at timestamp[];
 ALTER TABLE users ADD COLUMN IF NOT EXISTS kyc_steps_created_at timestamp[];
-INSERT INTO users (created_at,updated_at,phone_number,phone_number_hash,email,id,username,profile_picture_name,referred_by,city,country,mining_blockchain_account_address,blockchain_account_address,solana_mining_blockchain_account_address,lookup)
-                         VALUES (current_timestamp,current_timestamp,'bogus','bogus','bogus','bogus','bogus','bogus.jpg','bogus','bogus','RO','bogus','bogus','bogus',to_tsvector('bogus')),
-                                (current_timestamp,current_timestamp,'icenetwork','icenetwork','icenetwork','icenetwork','icenetwork','icenetwork.jpg','icenetwork','icenetwork','RO','icenetwork','icenetwork','icenetwork',to_tsvector('icenetwork'))
+INSERT INTO users (created_at,updated_at,phone_number,phone_number_hash,email,id,username,profile_picture_name,referred_by,city,country,mining_blockchain_account_address,blockchain_account_address, lookup)
+                         VALUES (current_timestamp,current_timestamp,'bogus','bogus','bogus','bogus','bogus','bogus.jpg','bogus','bogus','RO','bogus','bogus',to_tsvector('bogus')),
+                                (current_timestamp,current_timestamp,'icenetwork','icenetwork','icenetwork','icenetwork','icenetwork','icenetwork.jpg','icenetwork','icenetwork','RO','icenetwork','icenetwork',to_tsvector('icenetwork'))
 ON CONFLICT DO NOTHING;
 CREATE INDEX IF NOT EXISTS users_referred_by_ix ON users (referred_by);
 CREATE EXTENSION IF NOT EXISTS btree_gin;

diff --git a/users/contract.go b/users/contract.go
@@ -122,16 +122,15 @@ type (
 		RepeatableKYCSteps      *map[KYCStep]*time.Time     `json:"repeatableKYCSteps,omitempty" db:"-"` //nolint:tagliatelle // Nope.
 		PrivateUserInformation
 		PublicUserInformation
-		ReferredBy                           UserID   `json:"referredBy,omitempty" example:"did:ethr:0x4B73C58370AEfcEf86A6021afCDe5673511376B2" db:"referred_by"`
-		PhoneNumberHash                      string   `json:"phoneNumberHash,omitempty" example:"Ef86A6021afCDe5673511376B2" swaggerignore:"true" db:"phone_number_hash"`                                                     //nolint:lll //.
-		AgendaPhoneNumberHashes              *string  `json:"agendaPhoneNumberHashes,omitempty" example:"Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2" db:"-"` //nolint:lll // .
-		MiningBlockchainAccountAddress       string   `json:"miningBlockchainAccountAddress,omitempty" example:"0x4B73C58370AEfcEf86A6021afCDe5673511376B2" db:"mining_blockchain_account_address"`                           //nolint:lll // .
-		BlockchainAccountAddress             string   `json:"blockchainAccountAddress,omitempty" example:"0x4B73C58370AEfcEf86A6021afCDe5673511376B2" db:"blockchain_account_address"`                                        //nolint:lll // .
-		SolanaMiningBlockchainAccountAddress string   `json:"solanaMiningBlockchainAccountAddress,omitempty" example:"0x4B73C58370AEfcEf86A6021afCDe5673511376B2" db:"solana_mining_blockchain_account_address"`              //nolint:lll // .
-		Language                             string   `json:"language,omitempty" example:"en" db:"language"`
-		Lookup                               string   `json:"-" example:"username" db:"lookup"`
-		AgendaContactUserIDs                 []string `json:"agendaContactUserIDs,omitempty" swaggerignore:"true" db:"agenda_contact_user_ids"`
-		HashCode                             int64    `json:"hashCode,omitempty" example:"43453546464576547" swaggerignore:"true" db:"hash_code"`
+		ReferredBy                     UserID   `json:"referredBy,omitempty" example:"did:ethr:0x4B73C58370AEfcEf86A6021afCDe5673511376B2" db:"referred_by"`
+		PhoneNumberHash                string   `json:"phoneNumberHash,omitempty" example:"Ef86A6021afCDe5673511376B2" swaggerignore:"true" db:"phone_number_hash"`
+		AgendaPhoneNumberHashes        *string  `json:"agendaPhoneNumberHashes,omitempty" example:"Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2,Ef86A6021afCDe5673511376B2" db:"-"` //nolint:lll // .
+		MiningBlockchainAccountAddress string   `json:"miningBlockchainAccountAddress,omitempty" example:"0x4B73C58370AEfcEf86A6021afCDe5673511376B2" db:"mining_blockchain_account_address"`                           //nolint:lll // .
+		BlockchainAccountAddress       string   `json:"blockchainAccountAddress,omitempty" example:"0x4B73C58370AEfcEf86A6021afCDe5673511376B2" db:"blockchain_account_address"`                                        //nolint:lll // .
+		Language                       string   `json:"language,omitempty" example:"en" db:"language"`
+		Lookup                         string   `json:"-" example:"username" db:"lookup"`
+		AgendaContactUserIDs           []string `json:"agendaContactUserIDs,omitempty" swaggerignore:"true" db:"agenda_contact_user_ids"`
+		HashCode                       int64    `json:"hashCode,omitempty" example:"43453546464576547" swaggerignore:"true" db:"hash_code"`
 	}
 	MinimalUserProfile struct {
 		Verified *bool       `json:"verified,omitempty" example:"true"`

diff --git a/users/users.go b/users/users.go
@@ -322,9 +322,6 @@ func (r *repository) sanitizeUser(usr *User) *User {
 	if usr.MiningBlockchainAccountAddress == usr.ID {
 		usr.MiningBlockchainAccountAddress = ""
 	}
-	if usr.SolanaMiningBlockchainAccountAddress == usr.ID {
-		usr.SolanaMiningBlockchainAccountAddress = ""
-	}
 	if usr.PhoneNumber == usr.ID {
 		usr.PhoneNumber = ""
 	}