Skip to content

Rollback of solana address rollback. #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rollback of solana address rollback. #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions cmd/eskimo-hut/api/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,11 @@ const docTemplate = `{
"name": "clearMiningBlockchainAccountAddress",
"in": "formData"
},
{
"type": "boolean",
"name": "clearSolanaMiningBlockchainAccountAddress",
"in": "formData"
},
{
"type": "string",
"description": "Optional. Example: ` + "`" + `{\"key1\":{\"something\":\"somethingElse\"},\"key2\":\"value\"}` + "`" + `.",
Expand Down Expand Up @@ -1285,6 +1290,11 @@ const docTemplate = `{
"name": "resetProfilePicture",
"in": "formData"
},
{
"type": "string",
"name": "solanaMiningBlockchainAccountAddress",
"in": "formData"
},
{
"type": "string",
"description": "Optional. Example:` + "`" + `jdoe` + "`" + `.",
Expand Down Expand Up @@ -1793,6 +1803,10 @@ const docTemplate = `{
"type": "string"
}
},
"solanaMiningBlockchainAccountAddress": {
"type": "string",
"example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
},
"updatedAt": {
"type": "string",
"example": "2022-01-03T16:20:52.156534Z"
Expand Down Expand Up @@ -2122,6 +2136,10 @@ const docTemplate = `{
"type": "string"
}
},
"solanaMiningBlockchainAccountAddress": {
"type": "string",
"example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
},
"updatedAt": {
"type": "string",
"example": "2022-01-03T16:20:52.156534Z"
Expand Down
18 changes: 18 additions & 0 deletions cmd/eskimo-hut/api/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,11 @@
"name": "clearMiningBlockchainAccountAddress",
"in": "formData"
},
{
"type": "boolean",
"name": "clearSolanaMiningBlockchainAccountAddress",
"in": "formData"
},
{
"type": "string",
"description": "Optional. Example: `{\"key1\":{\"something\":\"somethingElse\"},\"key2\":\"value\"}`.",
Expand Down Expand Up @@ -1279,6 +1284,11 @@
"name": "resetProfilePicture",
"in": "formData"
},
{
"type": "string",
"name": "solanaMiningBlockchainAccountAddress",
"in": "formData"
},
{
"type": "string",
"description": "Optional. Example:`jdoe`.",
Expand Down Expand Up @@ -1787,6 +1797,10 @@
"type": "string"
}
},
"solanaMiningBlockchainAccountAddress": {
"type": "string",
"example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
},
"updatedAt": {
"type": "string",
"example": "2022-01-03T16:20:52.156534Z"
Expand Down Expand Up @@ -2116,6 +2130,10 @@
"type": "string"
}
},
"solanaMiningBlockchainAccountAddress": {
"type": "string",
"example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
},
"updatedAt": {
"type": "string",
"example": "2022-01-03T16:20:52.156534Z"
Expand Down
12 changes: 12 additions & 0 deletions cmd/eskimo-hut/api/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ definitions:
additionalProperties:
type: string
type: object
solanaMiningBlockchainAccountAddress:
example: 0x4B73C58370AEfcEf86A6021afCDe5673511376B2
type: string
updatedAt:
example: "2022-01-03T16:20:52.156534Z"
type: string
Expand Down Expand Up @@ -389,6 +392,9 @@ definitions:
additionalProperties:
type: string
type: object
solanaMiningBlockchainAccountAddress:
example: 0x4B73C58370AEfcEf86A6021afCDe5673511376B2
type: string
updatedAt:
example: "2022-01-03T16:20:52.156534Z"
type: string
Expand Down Expand Up @@ -1362,6 +1368,9 @@ 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
Expand Down Expand Up @@ -1418,6 +1427,9 @@ paths:
in: formData
name: resetProfilePicture
type: boolean
- in: formData
name: solanaMiningBlockchainAccountAddress
type: string
- description: Optional. Example:`jdoe`.
in: formData
name: username
Expand Down
12 changes: 7 additions & 5 deletions cmd/eskimo-hut/contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ 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"`
ClearMiningBlockchainAccountAddress *bool `form:"clearMiningBlockchainAccountAddress" formMultipart:"clearMiningBlockchainAccountAddress"` //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"` //nolint:lll //.
ClearMiningBlockchainAccountAddress *bool `form:"clearMiningBlockchainAccountAddress" formMultipart:"clearMiningBlockchainAccountAddress"` //nolint:lll //.
ClearSolanaMiningBlockchainAccountAddress *bool `form:"clearSolanaMiningBlockchainAccountAddress" formMultipart:"clearSolanaMiningBlockchainAccountAddress"` //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.
Expand All @@ -85,8 +86,9 @@ 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"`
BlockchainAccountAddress string `form:"blockchainAccountAddress" formMultipart:"blockchainAccountAddress"`
MiningBlockchainAccountAddress string `form:"miningBlockchainAccountAddress" formMultipart:"miningBlockchainAccountAddress"`
SolanaMiningBlockchainAccountAddress string `form:"solanaMiningBlockchainAccountAddress" formMultipart:"solanaMiningBlockchainAccountAddress"`
// Optional. Example:`en`.
Language string `form:"language" formMultipart:"language"`
// Optional. Example:`1232412415326543647657`.
Expand Down
6 changes: 6 additions & 0 deletions cmd/eskimo-hut/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,13 @@ 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 // .
Expand Down Expand Up @@ -330,7 +334,9 @@ 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 &&
Expand Down
8 changes: 8 additions & 0 deletions cmd/eskimo/api/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,10 @@ const docTemplate = `{
"type": "string"
}
},
"solanaMiningBlockchainAccountAddress": {
"type": "string",
"example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
},
"t1ReferralCount": {
"type": "integer",
"example": 100
Expand Down Expand Up @@ -1112,6 +1116,10 @@ const docTemplate = `{
"type": "string"
}
},
"solanaMiningBlockchainAccountAddress": {
"type": "string",
"example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
},
"t1ReferralCount": {
"type": "integer",
"example": 100
Expand Down
8 changes: 8 additions & 0 deletions cmd/eskimo/api/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,10 @@
"type": "string"
}
},
"solanaMiningBlockchainAccountAddress": {
"type": "string",
"example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
},
"t1ReferralCount": {
"type": "integer",
"example": 100
Expand Down Expand Up @@ -1106,6 +1110,10 @@
"type": "string"
}
},
"solanaMiningBlockchainAccountAddress": {
"type": "string",
"example": "0x4B73C58370AEfcEf86A6021afCDe5673511376B2"
},
"t1ReferralCount": {
"type": "integer",
"example": 100
Expand Down
6 changes: 6 additions & 0 deletions cmd/eskimo/api/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ definitions:
additionalProperties:
type: string
type: object
solanaMiningBlockchainAccountAddress:
example: 0x4B73C58370AEfcEf86A6021afCDe5673511376B2
type: string
t1ReferralCount:
example: 100
type: integer
Expand Down Expand Up @@ -340,6 +343,9 @@ definitions:
additionalProperties:
type: string
type: object
solanaMiningBlockchainAccountAddress:
example: 0x4B73C58370AEfcEf86A6021afCDe5673511376B2
type: string
t1ReferralCount:
example: 100
type: integer
Expand Down
7 changes: 4 additions & 3 deletions users/DDL.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ 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)
Expand All @@ -47,9 +48,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, 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'))
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'))
ON CONFLICT DO NOTHING;
CREATE INDEX IF NOT EXISTS users_referred_by_ix ON users (referred_by);
CREATE EXTENSION IF NOT EXISTS btree_gin;
Expand Down
19 changes: 10 additions & 9 deletions users/contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,16 @@ 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"`
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"`
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"`
}
MinimalUserProfile struct {
Verified *bool `json:"verified,omitempty" example:"true"`
Expand Down
3 changes: 3 additions & 0 deletions users/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ 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 = ""
}
Expand Down
Loading