Skip to content

Commit

Permalink
add wallet favourites
Browse files Browse the repository at this point in the history
  • Loading branch information
flexsurfer committed Sep 21, 2020
1 parent 36e742c commit 682722b
Show file tree
Hide file tree
Showing 10 changed files with 283 additions and 116 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.62.1
0.62.2
327 changes: 216 additions & 111 deletions appdatabase/migrations/bindata.go

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions appdatabase/migrations/sql/0013_favourites.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DROP TABLE favourites;
6 changes: 6 additions & 0 deletions appdatabase/migrations/sql/0013_favourites.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CREATE TABLE IF NOT EXISTS favourites (
address VARCHAR NOT NULL,
name TEXT NOT NULL,
PRIMARY KEY (address)
) WITHOUT ROWID;

3 changes: 2 additions & 1 deletion services/peer/discoverer_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions services/shhext/api_nimbus.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package shhext

import (
"context"

"github.com/status-im/status-go/protocol/common"

"github.com/ethereum/go-ethereum/log"
Expand Down
4 changes: 3 additions & 1 deletion services/status/account_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions services/wallet/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,17 @@ func (api *API) DeletePendingTransaction(ctx context.Context, transactionHash co
log.Debug("result from database for remove pending transaction", "err", err)
return err
}

func (api *API) GetFavourites(ctx context.Context) ([]*Favourite, error) {
log.Debug("call to get favourites")
rst, err := api.s.db.GetFavourites()
log.Debug("result from database for favourites", "len", len(rst))
return rst, err
}

func (api *API) AddFavourite(ctx context.Context, favourite Favourite) error {
log.Debug("call to create or update favourites")
err := api.s.db.AddFavourite(favourite)
log.Debug("result from database for create or update favouritesn", "err", err)
return err
}
35 changes: 35 additions & 0 deletions services/wallet/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,41 @@ func (db *Database) DeletePendingTransaction(transactionHash common.Hash) error
return err
}

type Favourite struct {
Address common.Address `json:"address"`
Name string `json:"name"`
}

func (db *Database) GetFavourites() ([]*Favourite, error) {
rows, err := db.db.Query(`SELECT address, name FROM favourites`)
if err != nil {
return nil, err
}
defer rows.Close()

var rst []*Favourite
for rows.Next() {
favourite := &Favourite{}
err := rows.Scan(&favourite.Address, &favourite.Name)
if err != nil {
return nil, err
}

rst = append(rst, favourite)
}

return rst, nil
}

func (db *Database) AddFavourite(favourite Favourite) error {
insert, err := db.db.Prepare("INSERT OR REPLACE INTO favourites (address, name) VALUES (?, ?)")
if err != nil {
return err
}
_, err = insert.Exec(favourite.Address, favourite.Name)
return err
}

// statementCreator allows to pass transaction or database to use in consumer.
type statementCreator interface {
Prepare(query string) (*sql.Stmt, error)
Expand Down
6 changes: 4 additions & 2 deletions transactions/fake/mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 682722b

Please sign in to comment.