Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
filippo.io/edwards25519 v1.1.0
github.com/aws/aws-sdk-go-v2 v0.17.0
github.com/code-payments/code-vm-indexer v1.2.0
github.com/code-payments/ocp-protobuf-api v0.13.0
github.com/code-payments/ocp-protobuf-api v0.14.0
github.com/emirpasic/gods v1.12.0
github.com/envoyproxy/protoc-gen-validate v1.2.1
github.com/golang/protobuf v1.5.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/code-payments/code-vm-indexer v1.2.0 h1:rSHpBMiT9BKgmKcXg/VIoi/h0t7jNxGx07Qz59m+6Q0=
github.com/code-payments/code-vm-indexer v1.2.0/go.mod h1:vn91YN2qNqb+gGJeZe2+l+TNxVmEEiRHXXnIn2Y40h8=
github.com/code-payments/ocp-protobuf-api v0.13.0 h1:TotuJZLLlpLKqgDGa9VQzkxiforFw4K+UsV//i6W28M=
github.com/code-payments/ocp-protobuf-api v0.13.0/go.mod h1:tw6BooY5a8l6CtSZnKOruyKII0W04n89pcM4BizrgG8=
github.com/code-payments/ocp-protobuf-api v0.14.0 h1:M3lYKl2Af5B+HZkhPzKt00+PENy8KpC4YcKB8THb7V0=
github.com/code-payments/ocp-protobuf-api v0.14.0/go.mod h1:tw6BooY5a8l6CtSZnKOruyKII0W04n89pcM4BizrgG8=
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 h1:NmTXa/uVnDyp0TY5MKi197+3HWcnYWfnHGyaFthlnGw=
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
Expand Down
3 changes: 3 additions & 0 deletions ocp/data/currency/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type MetadataRecord struct {
Symbol string
Description string
ImageUrl string
BillColors []string

Seed string

Expand Down Expand Up @@ -155,6 +156,7 @@ func (m *MetadataRecord) Clone() *MetadataRecord {
Symbol: m.Symbol,
Description: m.Description,
ImageUrl: m.ImageUrl,
BillColors: append([]string(nil), m.BillColors...),

Seed: m.Seed,

Expand Down Expand Up @@ -192,6 +194,7 @@ func (m *MetadataRecord) CopyTo(dst *MetadataRecord) {
dst.Symbol = m.Symbol
dst.Description = m.Description
dst.ImageUrl = m.ImageUrl
dst.BillColors = append([]string(nil), m.BillColors...)

dst.Seed = m.Seed

Expand Down
18 changes: 14 additions & 4 deletions ocp/data/currency/postgres/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package postgres
import (
"context"
"database/sql"
"strings"
"time"

"github.com/jmoiron/sqlx"
Expand Down Expand Up @@ -55,6 +56,7 @@ type metadataModel struct {
Symbol string `db:"symbol"`
Description string `db:"description"`
ImageUrl string `db:"image_url"`
BillColors string `db:"bill_colors"`

Seed string `db:"seed"`

Expand Down Expand Up @@ -96,6 +98,7 @@ func toMetadataModel(obj *currency.MetadataRecord) (*metadataModel, error) {
Symbol: obj.Symbol,
Description: obj.Description,
ImageUrl: obj.ImageUrl,
BillColors: strings.Join(obj.BillColors, ","),

Seed: obj.Seed,

Expand Down Expand Up @@ -127,13 +130,19 @@ func toMetadataModel(obj *currency.MetadataRecord) (*metadataModel, error) {
}

func fromMetadataModel(obj *metadataModel) *currency.MetadataRecord {
var billColors []string
if obj.BillColors != "" {
billColors = strings.Split(obj.BillColors, ",")
}

return &currency.MetadataRecord{
Id: uint64(obj.Id.Int64),

Name: obj.Name,
Symbol: obj.Symbol,
Description: obj.Description,
ImageUrl: obj.ImageUrl,
BillColors: billColors,

Seed: obj.Seed,

Expand Down Expand Up @@ -243,13 +252,14 @@ func (m *metadataModel) dbSave(ctx context.Context, db *sqlx.DB) error {
return pgutil.ExecuteInTx(ctx, db, sql.LevelDefault, func(tx *sqlx.Tx) error {
err := tx.QueryRowxContext(ctx,
`INSERT INTO `+metadataTableName+`
(name, symbol, description, image_url, seed, authority, mint, mint_bump, decimals, currency_config, currency_config_bump, liquidity_pool, liquidity_pool_bump, vault_mint, vault_mint_bump, vault_core, vault_core_bump, sell_fee_bps, alt, created_by, created_at)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21)
RETURNING id, name, symbol, description, image_url, seed, authority, mint, mint_bump, decimals, currency_config, currency_config_bump, liquidity_pool, liquidity_pool_bump, vault_mint, vault_mint_bump, vault_core, vault_core_bump, sell_fee_bps, alt, created_by, created_at`,
(name, symbol, description, image_url, bill_colors, seed, authority, mint, mint_bump, decimals, currency_config, currency_config_bump, liquidity_pool, liquidity_pool_bump, vault_mint, vault_mint_bump, vault_core, vault_core_bump, sell_fee_bps, alt, created_by, created_at)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22)
RETURNING id, name, symbol, description, image_url, bill_colors, seed, authority, mint, mint_bump, decimals, currency_config, currency_config_bump, liquidity_pool, liquidity_pool_bump, vault_mint, vault_mint_bump, vault_core, vault_core_bump, sell_fee_bps, alt, created_by, created_at`,
m.Name,
m.Symbol,
m.Description,
m.ImageUrl,
m.BillColors,
m.Seed,
m.Authority,
m.Mint,
Expand Down Expand Up @@ -343,7 +353,7 @@ func dbGetAllExchangeRatesForRange(ctx context.Context, db *sqlx.DB, symbol stri
func dbGetMetadataByMint(ctx context.Context, db *sqlx.DB, mint string) (*metadataModel, error) {
res := &metadataModel{}
err := db.GetContext(ctx, res,
`SELECT id, name, symbol, description, image_url, seed, authority, mint, mint_bump, decimals, currency_config, currency_config_bump, liquidity_pool, liquidity_pool_bump, vault_mint, vault_mint_bump, vault_core, vault_core_bump, sell_fee_bps, alt, created_by, created_at
`SELECT id, name, symbol, description, image_url, bill_colors, seed, authority, mint, mint_bump, decimals, currency_config, currency_config_bump, liquidity_pool, liquidity_pool_bump, vault_mint, vault_mint_bump, vault_core, vault_core_bump, sell_fee_bps, alt, created_by, created_at
FROM `+metadataTableName+`
WHERE mint = $1`,
mint,
Expand Down
1 change: 1 addition & 0 deletions ocp/data/currency/postgres/store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const (
symbol TEXT NOT NULL,
description TEXT NOT NULL,
image_url TEXT NOT NULL,
bill_colors TEXT NOT NULL DEFAULT '',

seed TEXT UNIQUE NOT NULL,

Expand Down
2 changes: 2 additions & 0 deletions ocp/data/currency/tests/tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ func testMetadataRoundTrip(t *testing.T, s currency.Store) {
Symbol: "JFY",
Description: "A test currency for Flipcash created by Jeff Yanta so we can eat our own dog food as we build out the platform. Pun intended",
ImageUrl: "https://flipcash-currency-assets.s3.us-east-1.amazonaws.com/52MNGpgvydSwCtC2H4qeiZXZ1TxEuRVCRGa8LAfk2kSj/icon.png",
BillColors: []string{"#19191A", "#FFFFFF"},

Seed: "H7WNaHtCa5h2k7AwZ8DbdLfM6bU2bi2jmWiUkFqgeBYk",

Expand Down Expand Up @@ -282,6 +283,7 @@ func assertEquivalentMetadataRecords(t *testing.T, obj1, obj2 *currency.Metadata
assert.Equal(t, obj1.Symbol, obj2.Symbol)
assert.Equal(t, obj1.Description, obj2.Description)
assert.Equal(t, obj1.ImageUrl, obj2.ImageUrl)
assert.Equal(t, obj1.BillColors, obj2.BillColors)
assert.Equal(t, obj1.Seed, obj2.Seed)
assert.Equal(t, obj1.Authority, obj2.Authority)
assert.Equal(t, obj1.Mint, obj2.Mint)
Expand Down
12 changes: 12 additions & 0 deletions ocp/rpc/currency/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,18 @@ func (s *currencyServer) GetMints(ctx context.Context, req *currencypb.GetMintsR
},
CreatedAt: timestamppb.New(metadataRecord.CreatedAt),
}

billColors := metadataRecord.BillColors
if len(billColors) == 0 {
billColors = []string{"#AAAAAA", "#2C2C2C"}
}
var protoColors []*currencypb.Color
for _, hex := range billColors {
protoColors = append(protoColors, &currencypb.Color{Hex: hex})
}
protoMetadata.BillCustomization = &currencypb.BillCustomization{
Colors: protoColors,
}
}

resp.MetadataByAddress[mintAccount.PublicKey().ToBase58()] = protoMetadata
Expand Down
Loading