Compare commits
No commits in common. "master" and "lash/alias" have entirely different histories.
master
...
lash/alias
@ -7,54 +7,33 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
createAccountPath = "/api/v2/account/create"
|
||||
trackStatusPath = "/api/track"
|
||||
balancePathPrefix = "/api/account"
|
||||
trackPath = "/api/v2/account/status"
|
||||
tokenTransferPrefix = "/api/v2/token/transfer"
|
||||
voucherHoldingsPathPrefix = "/api/v1/holdings"
|
||||
voucherTransfersPathPrefix = "/api/v1/transfers/last10"
|
||||
voucherDataPathPrefix = "/api/v1/token"
|
||||
SendSMSPrefix = "api/v1/external/upsell"
|
||||
poolDepositPrefix = "/api/v2/pool/deposit"
|
||||
poolSwapQoutePrefix = "/api/v2/pool/quote"
|
||||
poolSwapPrefix = "/api/v2/pool/swap"
|
||||
topPoolsPrefix = "/api/v1/pool/top"
|
||||
retrievePoolDetailsPrefix = "/api/v1/pool/reverse"
|
||||
poolSwappableVouchersPrefix = "/api/v1/pool"
|
||||
AliasRegistrationPrefix = "/api/v1/internal/register"
|
||||
AliasResolverPrefix = "/api/v1/resolve"
|
||||
ExternalSMSPrefix = "/api/v1/external"
|
||||
createAccountPath = "/api/v2/account/create"
|
||||
trackStatusPath = "/api/track"
|
||||
balancePathPrefix = "/api/account"
|
||||
trackPath = "/api/v2/account/status"
|
||||
tokenTransferPrefix = "/api/v2/token/transfer"
|
||||
voucherHoldingsPathPrefix = "/api/v1/holdings"
|
||||
voucherTransfersPathPrefix = "/api/v1/transfers/last10"
|
||||
voucherDataPathPrefix = "/api/v1/token"
|
||||
AliasPrefix = "api/v1/alias"
|
||||
)
|
||||
|
||||
var (
|
||||
custodialURLBase string
|
||||
dataURLBase string
|
||||
BearerToken string
|
||||
aliasEnsURLBase string
|
||||
externalSMSBase string
|
||||
IncludeStablesParam string
|
||||
custodialURLBase string
|
||||
dataURLBase string
|
||||
BearerToken string
|
||||
)
|
||||
|
||||
var (
|
||||
CreateAccountURL string
|
||||
TrackStatusURL string
|
||||
BalanceURL string
|
||||
TrackURL string
|
||||
TokenTransferURL string
|
||||
VoucherHoldingsURL string
|
||||
VoucherTransfersURL string
|
||||
VoucherDataURL string
|
||||
PoolDepositURL string
|
||||
PoolSwapQuoteURL string
|
||||
PoolSwapURL string
|
||||
TopPoolsURL string
|
||||
RetrievePoolDetailsURL string
|
||||
PoolSwappableVouchersURL string
|
||||
SendSMSURL string
|
||||
AliasRegistrationURL string
|
||||
AliasResolverURL string
|
||||
ExternalSMSURL string
|
||||
CreateAccountURL string
|
||||
TrackStatusURL string
|
||||
BalanceURL string
|
||||
TrackURL string
|
||||
TokenTransferURL string
|
||||
VoucherHoldingsURL string
|
||||
VoucherTransfersURL string
|
||||
VoucherDataURL string
|
||||
CheckAliasURL string
|
||||
)
|
||||
|
||||
func setBase() error {
|
||||
@ -62,10 +41,7 @@ func setBase() error {
|
||||
|
||||
custodialURLBase = env.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
|
||||
dataURLBase = env.GetEnv("DATA_URL_BASE", "http://localhost:5006")
|
||||
aliasEnsURLBase = env.GetEnv("ALIAS_ENS_BASE", "http://localhost:5015")
|
||||
externalSMSBase = env.GetEnv("EXTERNAL_SMS_BASE", "http://localhost:5035")
|
||||
BearerToken = env.GetEnv("BEARER_TOKEN", "")
|
||||
IncludeStablesParam = env.GetEnv("INCLUDE_STABLES_PARAM", "false")
|
||||
|
||||
_, err = url.Parse(custodialURLBase)
|
||||
if err != nil {
|
||||
@ -92,16 +68,7 @@ func LoadConfig() error {
|
||||
VoucherHoldingsURL, _ = url.JoinPath(dataURLBase, voucherHoldingsPathPrefix)
|
||||
VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
|
||||
VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)
|
||||
SendSMSURL, _ = url.JoinPath(dataURLBase, SendSMSPrefix)
|
||||
PoolDepositURL, _ = url.JoinPath(custodialURLBase, poolDepositPrefix)
|
||||
PoolSwapQuoteURL, _ = url.JoinPath(custodialURLBase, poolSwapQoutePrefix)
|
||||
PoolSwapURL, _ = url.JoinPath(custodialURLBase, poolSwapPrefix)
|
||||
TopPoolsURL, _ = url.JoinPath(dataURLBase, topPoolsPrefix)
|
||||
RetrievePoolDetailsURL, _ = url.JoinPath(dataURLBase, retrievePoolDetailsPrefix)
|
||||
PoolSwappableVouchersURL, _ = url.JoinPath(dataURLBase, poolSwappableVouchersPrefix)
|
||||
AliasRegistrationURL, _ = url.JoinPath(aliasEnsURLBase, AliasRegistrationPrefix)
|
||||
AliasResolverURL, _ = url.JoinPath(aliasEnsURLBase, AliasResolverPrefix)
|
||||
ExternalSMSURL, _ = url.JoinPath(externalSMSBase, ExternalSMSPrefix)
|
||||
|
||||
CheckAliasURL, _ = url.JoinPath(dataURLBase, AliasPrefix)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
517
dev/api.go
517
dev/api.go
@ -12,70 +12,65 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"git.defalsify.org/vise.git/db"
|
||||
"git.defalsify.org/vise.git/logging"
|
||||
"git.grassecon.net/grassrootseconomics/common/phone"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/event"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/models"
|
||||
"git.grassecon.net/grassrootseconomics/visedriver/storage"
|
||||
"github.com/gofrs/uuid"
|
||||
"git.defalsify.org/vise.git/logging"
|
||||
"git.defalsify.org/vise.git/db"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/models"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/event"
|
||||
"git.grassecon.net/grassrootseconomics/common/phone"
|
||||
"git.grassecon.net/grassrootseconomics/visedriver/storage"
|
||||
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
||||
)
|
||||
|
||||
var (
|
||||
logg = logging.NewVanilla().WithDomain("sarafu-api.devapi")
|
||||
aliasRegex = regexp.MustCompile("^\\+?[a-zA-Z0-9\\-_]+$")
|
||||
searchDomain = ".sarafu.local"
|
||||
logg = logging.NewVanilla().WithDomain("sarafu-api.devapi")
|
||||
aliasRegex = regexp.MustCompile("^\\+?[a-zA-Z0-9\\-_]+$")
|
||||
)
|
||||
|
||||
const (
|
||||
pubKeyLen int = 20
|
||||
hashLen int = 32
|
||||
defaultDecimals = 6
|
||||
zeroAddress string = "0x0000000000000000000000000000000000000000"
|
||||
defaultVoucherBalance float64 = 500.00
|
||||
cityPoolAddress string = "0x3b517308D858a47458aD5C8E699697C5dc91Da0F"
|
||||
poolName string = "citypool"
|
||||
PoolSymbol string = "CTY"
|
||||
pubKeyLen int = 20
|
||||
hashLen int = 32
|
||||
defaultDecimals = 6
|
||||
zeroAddress string = "0x0000000000000000000000000000000000000000"
|
||||
)
|
||||
|
||||
type Tx struct {
|
||||
Track string `json: "track"`
|
||||
Hsh string `json:"hash"`
|
||||
To string `json:"to"`
|
||||
From string `json: "from"`
|
||||
Voucher string `json: "voucher"`
|
||||
Value int `json: "value"`
|
||||
When time.Time `json: "when"`
|
||||
Track string `json: "track"`
|
||||
Hsh string `json:"hash"`
|
||||
To string `json:"to"`
|
||||
From string `json: "from"`
|
||||
Voucher string `json: "voucher"`
|
||||
Value int `json: "value"`
|
||||
When time.Time `json: "when"`
|
||||
}
|
||||
|
||||
func (t *Tx) ToTransferEvent() event.EventTokenTransfer {
|
||||
return event.EventTokenTransfer{
|
||||
To: t.To,
|
||||
Value: t.Value,
|
||||
To: t.To,
|
||||
Value: t.Value,
|
||||
VoucherAddress: t.Voucher,
|
||||
TxHash: t.Hsh,
|
||||
From: t.From,
|
||||
TxHash: t.Hsh,
|
||||
From: t.From,
|
||||
}
|
||||
}
|
||||
|
||||
func (t *Tx) ToMintEvent() event.EventTokenMint {
|
||||
return event.EventTokenMint{
|
||||
To: t.To,
|
||||
Value: t.Value,
|
||||
To: t.To,
|
||||
Value: t.Value,
|
||||
VoucherAddress: t.Voucher,
|
||||
TxHash: t.Hsh,
|
||||
TxHash: t.Hsh,
|
||||
}
|
||||
}
|
||||
|
||||
type Account struct {
|
||||
Track string `json: "track"`
|
||||
Address string `json: "address"`
|
||||
Nonce int `json: "nonce"`
|
||||
DefaultVoucher string `json: "defaultVoucher"`
|
||||
Balances map[string]int `json: "balances"`
|
||||
Alias string
|
||||
Txs []string `json: "txs"`
|
||||
Track string `json: "track"`
|
||||
Address string `json: "address"`
|
||||
Nonce int `json: "nonce"`
|
||||
DefaultVoucher string `json: "defaultVoucher"`
|
||||
Balances map[string]int `json: "balances"`
|
||||
Alias string
|
||||
Txs []string `json: "txs"`
|
||||
}
|
||||
|
||||
func (a *Account) ToRegistrationEvent() event.EventCustodialRegistration {
|
||||
@ -85,54 +80,45 @@ func (a *Account) ToRegistrationEvent() event.EventCustodialRegistration {
|
||||
}
|
||||
|
||||
type Voucher struct {
|
||||
Name string `json: "name"`
|
||||
Address string `json: "address"`
|
||||
Symbol string `json: "symbol"`
|
||||
Decimals int `json: "decimals"`
|
||||
Sink string `json: "sink"`
|
||||
Name string `json: "name"`
|
||||
Address string `json: "address"`
|
||||
Symbol string `json: "symbol"`
|
||||
Decimals int `json: "decimals"`
|
||||
Sink string `json: "sink"`
|
||||
Commodity string `json: "commodity"`
|
||||
Location string `json: "location"`
|
||||
}
|
||||
|
||||
type Pool struct {
|
||||
Name string `json: "name"`
|
||||
Symbol string `json: "symbol"`
|
||||
Address string `json: "address"`
|
||||
Vouchers []Voucher `json: "voucher"`
|
||||
PoolLimit map[string]string `json: "poollimit"`
|
||||
Location string `json: "location"`
|
||||
}
|
||||
|
||||
type DevAccountService struct {
|
||||
db db.Db
|
||||
accounts map[string]Account
|
||||
accountsTrack map[string]string
|
||||
accountsAlias map[string]string
|
||||
vouchers map[string]Voucher
|
||||
vouchersAddress map[string]string
|
||||
txs map[string]Tx
|
||||
txsTrack map[string]string
|
||||
toAutoCreate bool
|
||||
autoVouchers []string
|
||||
db db.Db
|
||||
accounts map[string]Account
|
||||
accountsTrack map[string]string
|
||||
accountsAlias map[string]string
|
||||
vouchers map[string]Voucher
|
||||
vouchersAddress map[string]string
|
||||
txs map[string]Tx
|
||||
txsTrack map[string]string
|
||||
toAutoCreate bool
|
||||
autoVouchers []string
|
||||
autoVoucherValue map[string]int
|
||||
defaultAccount string
|
||||
emitterFunc event.EmitterFunc
|
||||
pfx []byte
|
||||
pools map[string]Pool
|
||||
defaultAccount string
|
||||
emitterFunc event.EmitterFunc
|
||||
pfx []byte
|
||||
// accountsSession map[string]string
|
||||
}
|
||||
|
||||
func NewDevAccountService(ctx context.Context, ss storage.StorageService) *DevAccountService {
|
||||
svc := &DevAccountService{
|
||||
accounts: make(map[string]Account),
|
||||
accountsTrack: make(map[string]string),
|
||||
accountsAlias: make(map[string]string),
|
||||
vouchers: make(map[string]Voucher),
|
||||
vouchersAddress: make(map[string]string),
|
||||
txs: make(map[string]Tx),
|
||||
txsTrack: make(map[string]string),
|
||||
accounts: make(map[string]Account),
|
||||
accountsTrack: make(map[string]string),
|
||||
accountsAlias: make(map[string]string),
|
||||
vouchers: make(map[string]Voucher),
|
||||
vouchersAddress: make(map[string]string),
|
||||
txs: make(map[string]Tx),
|
||||
txsTrack: make(map[string]string),
|
||||
autoVoucherValue: make(map[string]int),
|
||||
pools: make(map[string]Pool),
|
||||
defaultAccount: zeroAddress,
|
||||
pfx: []byte("__"),
|
||||
defaultAccount: zeroAddress,
|
||||
pfx: []byte("__"),
|
||||
}
|
||||
if ss != nil {
|
||||
var err error
|
||||
@ -165,7 +151,7 @@ func (das *DevAccountService) WithPrefix(pfx []byte) *DevAccountService {
|
||||
}
|
||||
|
||||
func (das *DevAccountService) prefixKeyFor(k string, v string) []byte {
|
||||
return append(das.pfx, []byte(k+"_"+v)...)
|
||||
return append(das.pfx, []byte(k + "_" + v)...)
|
||||
}
|
||||
|
||||
func (das *DevAccountService) loadAccount(ctx context.Context, pubKey string, v []byte) error {
|
||||
@ -184,15 +170,6 @@ func (das *DevAccountService) loadAccount(ctx context.Context, pubKey string, v
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *Pool) hasVoucher(voucherAddress string) bool {
|
||||
for _, value := range p.Vouchers {
|
||||
if value.Address == voucherAddress {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (das *DevAccountService) loadTx(ctx context.Context, hsh string, v []byte) error {
|
||||
var mytx Tx
|
||||
|
||||
@ -206,26 +183,6 @@ func (das *DevAccountService) loadTx(ctx context.Context, hsh string, v []byte)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) loadAlias(ctx context.Context, alias string, key []byte) error {
|
||||
result, err := das.db.Get(ctx, key)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
das.accountsAlias[alias] = strings.ReplaceAll(string(result), `"`, "")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) loadPoolInfo(ctx context.Context, name string, v []byte) error {
|
||||
var pool Pool
|
||||
|
||||
err := json.Unmarshal(v, &pool)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to unmarshall pool info: %v", err)
|
||||
}
|
||||
das.pools[name] = pool
|
||||
return nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) loadItem(ctx context.Context, k []byte, v []byte) error {
|
||||
var err error
|
||||
s := string(k)
|
||||
@ -235,15 +192,8 @@ func (das *DevAccountService) loadItem(ctx context.Context, k []byte, v []byte)
|
||||
}
|
||||
if ss[0] == "account" {
|
||||
err = das.loadAccount(ctx, ss[1], v)
|
||||
logg.ErrorCtxf(ctx, "loading saved account failed", "error_load_account", err)
|
||||
} else if ss[0] == "tx" {
|
||||
err = das.loadTx(ctx, ss[1], v)
|
||||
logg.ErrorCtxf(ctx, "loading transactions failed", "error_load_txs", err)
|
||||
} else if ss[0] == "alias" {
|
||||
err = das.loadAlias(ctx, ss[1], k)
|
||||
logg.ErrorCtxf(ctx, "loading aliases failed", "error_load_aliases", err)
|
||||
} else if ss[0] == "pool" {
|
||||
err = das.loadPoolInfo(ctx, ss[1], v)
|
||||
} else {
|
||||
logg.ErrorCtxf(ctx, "unknown double underscore key", "key", ss[0])
|
||||
}
|
||||
@ -259,13 +209,13 @@ func (das *DevAccountService) loadAll(ctx context.Context) error {
|
||||
}
|
||||
for true {
|
||||
k, v := dumper.Next(ctx)
|
||||
logg.InfoCtxf(ctx, "loading all", "key", string(k), "value", string(v))
|
||||
if k == nil {
|
||||
break
|
||||
}
|
||||
if !bytes.HasPrefix(k, das.pfx) {
|
||||
continue
|
||||
}
|
||||
|
||||
err = das.loadItem(ctx, k, v)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -275,7 +225,7 @@ func (das *DevAccountService) loadAll(ctx context.Context) error {
|
||||
}
|
||||
|
||||
func (das *DevAccountService) indexAll(ctx context.Context) error {
|
||||
for k, v := range das.txs {
|
||||
for k, v := range(das.txs) {
|
||||
acc := das.accounts[v.From]
|
||||
acc.Txs = append(acc.Txs, k)
|
||||
logg.TraceCtxf(ctx, "add tx to sender index", "from", v.From, "tx", k)
|
||||
@ -300,35 +250,6 @@ func (das *DevAccountService) WithAutoVoucher(ctx context.Context, symbol string
|
||||
return das
|
||||
}
|
||||
|
||||
func (das *DevAccountService) RegisterPool(ctx context.Context, name string, sm string) error {
|
||||
var seedVouchers []Voucher
|
||||
|
||||
h := sha1.New()
|
||||
h.Write([]byte(sm))
|
||||
z := h.Sum(nil)
|
||||
pooladdr := fmt.Sprintf("0x%x", z)
|
||||
|
||||
p := Pool{
|
||||
Name: name,
|
||||
Symbol: sm,
|
||||
Address: pooladdr,
|
||||
PoolLimit: make(map[string]string),
|
||||
}
|
||||
|
||||
for _, v := range das.vouchers {
|
||||
//pre-load vouchers with vouchers when a pool is registered
|
||||
seedVouchers = append(seedVouchers, v)
|
||||
p.PoolLimit[v.Address] = fmt.Sprintf("%f", defaultVoucherBalance)
|
||||
}
|
||||
p.Vouchers = append(p.Vouchers, seedVouchers...)
|
||||
|
||||
err := das.savePoolInfo(ctx, p)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// TODO: add persistence for vouchers
|
||||
// TODO: set max balance for 0x00 address
|
||||
func (das *DevAccountService) AddVoucher(ctx context.Context, symbol string) error {
|
||||
@ -344,8 +265,8 @@ func (das *DevAccountService) AddVoucher(ctx context.Context, symbol string) err
|
||||
z := h.Sum(nil)
|
||||
address := fmt.Sprintf("0x%x", z)
|
||||
das.vouchers[symbol] = Voucher{
|
||||
Name: symbol,
|
||||
Symbol: symbol,
|
||||
Name: symbol,
|
||||
Symbol: symbol,
|
||||
Address: address,
|
||||
}
|
||||
das.vouchersAddress[address] = symbol
|
||||
@ -367,14 +288,14 @@ func (das *DevAccountService) CheckBalance(ctx context.Context, publicKey string
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("balance not found for default token %s pubkey %v", acc.DefaultVoucher, publicKey)
|
||||
}
|
||||
return &models.BalanceResult{
|
||||
return &models.BalanceResult {
|
||||
Balance: strconv.Itoa(bal),
|
||||
Nonce: json.Number(strconv.Itoa(acc.Nonce)),
|
||||
Nonce: json.Number(strconv.Itoa(acc.Nonce)),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) balanceAuto(ctx context.Context, pubKey string) error {
|
||||
for _, v := range das.autoVouchers {
|
||||
for _, v := range(das.autoVouchers) {
|
||||
voucher, ok := das.vouchers[v]
|
||||
if !ok {
|
||||
return fmt.Errorf("balance auto voucher set but not resolved: %s", v)
|
||||
@ -391,10 +312,6 @@ func (das *DevAccountService) balanceAuto(ctx context.Context, pubKey string) er
|
||||
return nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) GetAliases(ctx context.Context) map[string]string {
|
||||
return das.accountsAlias
|
||||
}
|
||||
|
||||
func (das *DevAccountService) saveAccount(ctx context.Context, acc Account) error {
|
||||
if das.db == nil {
|
||||
return nil
|
||||
@ -409,37 +326,6 @@ func (das *DevAccountService) saveAccount(ctx context.Context, acc Account) erro
|
||||
return das.db.Put(ctx, []byte(k), v)
|
||||
}
|
||||
|
||||
func (das *DevAccountService) savePoolInfo(ctx context.Context, pool Pool) error {
|
||||
if das.db == nil {
|
||||
return nil
|
||||
}
|
||||
k := das.prefixKeyFor("pool", pool.Address)
|
||||
v, err := json.Marshal(pool)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
das.db.SetSession("")
|
||||
das.db.SetPrefix(db.DATATYPE_USERDATA)
|
||||
return das.db.Put(ctx, []byte(k), v)
|
||||
}
|
||||
|
||||
func (das *DevAccountService) saveAlias(ctx context.Context, alias map[string]string) error {
|
||||
if das.db == nil {
|
||||
return fmt.Errorf("Db cannot be nil")
|
||||
}
|
||||
for k, v := range alias {
|
||||
k_ := das.prefixKeyFor("alias", k)
|
||||
v_, err := json.Marshal(v)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
das.db.SetSession("")
|
||||
das.db.SetPrefix(db.DATATYPE_USERDATA)
|
||||
return das.db.Put(ctx, []byte(k_), v_)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
|
||||
var b [pubKeyLen]byte
|
||||
uid, err := uuid.NewV4()
|
||||
@ -455,7 +341,7 @@ func (das *DevAccountService) CreateAccount(ctx context.Context) (*models.Accoun
|
||||
}
|
||||
pubKey := fmt.Sprintf("0x%x", b)
|
||||
acc := Account{
|
||||
Track: uid.String(),
|
||||
Track: uid.String(),
|
||||
Address: pubKey,
|
||||
}
|
||||
|
||||
@ -477,7 +363,7 @@ func (das *DevAccountService) CreateAccount(ctx context.Context) (*models.Accoun
|
||||
|
||||
if das.emitterFunc != nil {
|
||||
msg := event.Msg{
|
||||
Typ: event.EventRegistrationTag,
|
||||
Typ: event.EventRegistrationTag,
|
||||
Item: acc,
|
||||
}
|
||||
err = das.emitterFunc(ctx, msg)
|
||||
@ -488,85 +374,11 @@ func (das *DevAccountService) CreateAccount(ctx context.Context) (*models.Accoun
|
||||
logg.TraceCtxf(ctx, "account created", "account", acc)
|
||||
|
||||
return &models.AccountResult{
|
||||
PublicKey: pubKey,
|
||||
PublicKey: pubKey,
|
||||
TrackingId: uid.String(),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error) {
|
||||
_, ok := das.accounts[from]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("account not found (publickey): %v", from)
|
||||
}
|
||||
sym, ok := das.vouchersAddress[tokenAddress]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("voucher address %v not found", tokenAddress)
|
||||
}
|
||||
uid, err := uuid.NewV4()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
_, ok = das.vouchers[sym]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("voucher address %v found but does not resolve", tokenAddress)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &models.PoolDepositResult{
|
||||
TrackingId: uid.String(),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
|
||||
_, ok := das.accounts[from]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("account not found (publickey): %v", from)
|
||||
}
|
||||
p, ok := das.pools[poolAddress]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("pool address %v not found", poolAddress)
|
||||
}
|
||||
|
||||
//resolve the token address you are trying to swap from(fromTokenAddress)
|
||||
ok = p.hasVoucher(fromTokenAddress)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("voucher with address %v not found in the pool", fromTokenAddress)
|
||||
}
|
||||
|
||||
//Return a a quote that is equal to the amount entered
|
||||
return &models.PoolSwapQuoteResult{IncludesFeesDeduction: false, OutValue: amount}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
|
||||
uid, err := uuid.NewV4()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
p, ok := das.pools[poolAddress]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("pool address %v not found", toTokenAddress)
|
||||
}
|
||||
_, ok = das.accounts[from]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("account not found (publickey): %v", from)
|
||||
}
|
||||
ok = p.hasVoucher(fromTokenAddress)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("token %v not found in the pool", fromTokenAddress)
|
||||
}
|
||||
|
||||
ok = p.hasVoucher(toTokenAddress)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("token %v not found in the pool", toTokenAddress)
|
||||
}
|
||||
|
||||
return &models.PoolSwapResult{TrackingId: uid.String()}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
|
||||
var ok bool
|
||||
_, ok = das.accounts[publicKey]
|
||||
@ -580,20 +392,22 @@ func (das *DevAccountService) TrackAccountStatus(ctx context.Context, publicKey
|
||||
|
||||
func (das *DevAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
var holdings []dataserviceapi.TokenHoldings
|
||||
_, ok := das.accounts[publicKey]
|
||||
acc, ok := das.accounts[publicKey]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("account not found (publickey): %v", publicKey)
|
||||
}
|
||||
//TODO: Iterate over the account acc.Balances object
|
||||
for _, voucher := range das.vouchers {
|
||||
for k, v := range(acc.Balances) {
|
||||
voucher, ok := das.vouchers[k]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("voucher has balance but object not found: %v", k)
|
||||
}
|
||||
holdings = append(holdings, dataserviceapi.TokenHoldings{
|
||||
TokenAddress: voucher.Address,
|
||||
TokenSymbol: voucher.Symbol,
|
||||
TokenDecimals: strconv.Itoa(voucher.Decimals),
|
||||
Balance: strconv.Itoa(int(defaultVoucherBalance)),
|
||||
ContractAddress: voucher.Address,
|
||||
TokenSymbol: voucher.Symbol,
|
||||
TokenDecimals: strconv.Itoa(voucher.Decimals),
|
||||
Balance: strconv.Itoa(v),
|
||||
})
|
||||
}
|
||||
|
||||
return holdings, nil
|
||||
}
|
||||
|
||||
@ -603,24 +417,24 @@ func (das *DevAccountService) FetchTransactions(ctx context.Context, publicKey s
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("account not found (publickey): %v", publicKey)
|
||||
}
|
||||
for i, v := range acc.Txs {
|
||||
for i, v := range(acc.Txs) {
|
||||
mytx := das.txs[v]
|
||||
if i == 10 {
|
||||
break
|
||||
break
|
||||
}
|
||||
voucher, ok := das.vouchers[mytx.Voucher]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("voucher %s in tx list but not found in voucher list", mytx.Voucher)
|
||||
}
|
||||
lasttx = append(lasttx, dataserviceapi.Last10TxResponse{
|
||||
Sender: mytx.From,
|
||||
Recipient: mytx.To,
|
||||
TransferValue: strconv.Itoa(mytx.Value),
|
||||
Sender: mytx.From,
|
||||
Recipient: mytx.To,
|
||||
TransferValue: strconv.Itoa(mytx.Value),
|
||||
ContractAddress: voucher.Address,
|
||||
TxHash: mytx.Hsh,
|
||||
DateBlock: mytx.When,
|
||||
TokenSymbol: voucher.Symbol,
|
||||
TokenDecimals: strconv.Itoa(voucher.Decimals),
|
||||
TxHash: mytx.Hsh,
|
||||
DateBlock: mytx.When,
|
||||
TokenSymbol: voucher.Symbol,
|
||||
TokenDecimals: strconv.Itoa(voucher.Decimals),
|
||||
})
|
||||
}
|
||||
return lasttx, nil
|
||||
@ -636,12 +450,13 @@ func (das *DevAccountService) VoucherData(ctx context.Context, address string) (
|
||||
return nil, fmt.Errorf("voucher address %v found but does not resolve", address)
|
||||
}
|
||||
return &models.VoucherDataResult{
|
||||
TokenName: voucher.Name,
|
||||
TokenSymbol: voucher.Symbol,
|
||||
TokenDecimals: voucher.Decimals,
|
||||
SinkAddress: voucher.Sink,
|
||||
TokenName: voucher.Name,
|
||||
TokenSymbol: voucher.Symbol,
|
||||
TokenDecimals: voucher.Decimals,
|
||||
SinkAddress: voucher.Sink,
|
||||
TokenCommodity: voucher.Commodity,
|
||||
TokenLocation: voucher.Location,
|
||||
TokenLocation: voucher.Location,
|
||||
|
||||
}, nil
|
||||
}
|
||||
|
||||
@ -666,12 +481,12 @@ func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, t
|
||||
}
|
||||
accFrom, ok := das.accounts[from]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("sender account %v not found", from)
|
||||
return nil, fmt.Errorf("sender account %v not found", from)
|
||||
}
|
||||
accTo, ok := das.accounts[to]
|
||||
if !ok {
|
||||
if !das.toAutoCreate {
|
||||
return nil, fmt.Errorf("recipient account %v not found, and not creating", from)
|
||||
return nil, fmt.Errorf("recipient account %v not found, and not creating", from)
|
||||
}
|
||||
}
|
||||
|
||||
@ -697,13 +512,13 @@ func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, t
|
||||
}
|
||||
hsh := fmt.Sprintf("0x%x", b)
|
||||
mytx := Tx{
|
||||
Hsh: hsh,
|
||||
To: accTo.Address,
|
||||
From: accFrom.Address,
|
||||
Hsh: hsh,
|
||||
To: accTo.Address,
|
||||
From: accFrom.Address,
|
||||
Voucher: voucher.Symbol,
|
||||
Value: value,
|
||||
Track: uid.String(),
|
||||
When: time.Now(),
|
||||
Value: value,
|
||||
Track: uid.String(),
|
||||
When: time.Now(),
|
||||
}
|
||||
err = das.saveTokenTransfer(ctx, mytx)
|
||||
if err != nil {
|
||||
@ -712,7 +527,7 @@ func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, t
|
||||
das.txs[hsh] = mytx
|
||||
if das.emitterFunc != nil {
|
||||
msg := event.Msg{
|
||||
Typ: event.EventTokenTransferTag,
|
||||
Typ: event.EventTokenTransferTag,
|
||||
Item: mytx,
|
||||
}
|
||||
err = das.emitterFunc(ctx, msg)
|
||||
@ -729,12 +544,10 @@ func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, t
|
||||
func (das *DevAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
addr, ok := das.accountsAlias[alias]
|
||||
if !ok {
|
||||
logg.ErrorCtxf(ctx, "alias check failed", "alias", alias)
|
||||
return nil, fmt.Errorf("alias %s not found", alias)
|
||||
}
|
||||
acc, ok := das.accounts[addr]
|
||||
if !ok {
|
||||
logg.ErrorCtxf(ctx, "failed to resolve alias", "alias", alias)
|
||||
return nil, fmt.Errorf("alias %s found but does not resolve", alias)
|
||||
}
|
||||
return &models.AliasAddress{
|
||||
@ -755,29 +568,16 @@ func (das *DevAccountService) applyPhoneAlias(ctx context.Context, publicKey str
|
||||
|
||||
func (das *DevAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
var alias string
|
||||
uid, err := uuid.NewV4()
|
||||
if !aliasRegex.MatchString(hint) {
|
||||
logg.ErrorCtxf(ctx, "alias hint does not match", "key", publicKey, "hint", hint)
|
||||
return nil, fmt.Errorf("alias hint does not match: %s", publicKey)
|
||||
}
|
||||
acc, ok := das.accounts[publicKey]
|
||||
if !ok {
|
||||
//Handle accounts created via the api
|
||||
acc = Account{
|
||||
Track: uid.String(),
|
||||
Address: publicKey,
|
||||
}
|
||||
err = das.saveAccount(ctx, acc)
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "account save failed with", "account", acc, "account_save_error", err)
|
||||
return nil, err
|
||||
}
|
||||
das.accounts[publicKey] = acc
|
||||
return nil, fmt.Errorf("address %s not found", publicKey)
|
||||
}
|
||||
alias = hint
|
||||
isPhone, err := das.applyPhoneAlias(ctx, publicKey, alias)
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "failed to apply phone alias", "public key", publicKey, "alias", alias, "error", err)
|
||||
return nil, fmt.Errorf("phone parser error: %v", err)
|
||||
}
|
||||
if !isPhone {
|
||||
@ -792,111 +592,10 @@ func (das *DevAccountService) RequestAlias(ctx context.Context, publicKey string
|
||||
alias += "x"
|
||||
}
|
||||
acc.Alias = alias
|
||||
alias = alias + searchDomain
|
||||
das.accountsAlias[alias] = publicKey
|
||||
err := das.saveAlias(ctx, map[string]string{alias: publicKey})
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "account save error", "public key", publicKey, "alias", alias, "alias_save_error", err)
|
||||
return nil, fmt.Errorf("Failed to save the account alias with error: %s", err.Error())
|
||||
}
|
||||
}
|
||||
logg.DebugCtxf(ctx, "set alias", "addr", publicKey, "alias", alias)
|
||||
return &models.RequestAliasResult{
|
||||
Alias: alias,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
logg.DebugCtxf(ctx, "sent an SMS", "inviterPhone", inviterPhone, "inviteePhone", inviteePhone)
|
||||
return &models.SendSMSResponse{
|
||||
Invitee: inviteePhone,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
|
||||
return fmt.Errorf("unimplemented")
|
||||
}
|
||||
|
||||
func (das *DevAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
|
||||
return fmt.Errorf("unimplemented")
|
||||
}
|
||||
|
||||
func (das *DevAccountService) FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
|
||||
var topPools []dataserviceapi.PoolDetails
|
||||
for _, p := range das.pools {
|
||||
topPools = append(topPools, dataserviceapi.PoolDetails{
|
||||
PoolName: p.Name,
|
||||
PoolSymbol: p.Symbol,
|
||||
PoolContractAdrress: p.Address,
|
||||
})
|
||||
}
|
||||
return topPools, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
|
||||
testPool := &dataserviceapi.PoolDetails{
|
||||
PoolName: "DevTest",
|
||||
PoolSymbol: "DEVT",
|
||||
PoolContractAdrress: "0x145F87d6198dEDD45C614FFD8b70E9a2fCCc5cc9",
|
||||
LimiterAddress: "",
|
||||
VoucherRegistry: "",
|
||||
}
|
||||
|
||||
return testPool, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
var swapFromList []dataserviceapi.TokenHoldings
|
||||
|
||||
p, ok := das.pools[poolAddress]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("Invalid pool address: %v", poolAddress)
|
||||
}
|
||||
for _, v := range p.Vouchers {
|
||||
swapFromList = append(swapFromList, dataserviceapi.TokenHoldings{
|
||||
TokenAddress: v.Address,
|
||||
TokenSymbol: v.Symbol,
|
||||
TokenDecimals: string(defaultDecimals),
|
||||
Balance: fmt.Sprintf("%f", defaultVoucherBalance),
|
||||
})
|
||||
}
|
||||
|
||||
return swapFromList, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
var swapToList []dataserviceapi.TokenHoldings
|
||||
_, ok := das.pools[poolAddress]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("Invalid pool address: %v", poolAddress)
|
||||
}
|
||||
for _, voucher := range das.vouchers {
|
||||
swapToList = append(swapToList, dataserviceapi.TokenHoldings{
|
||||
TokenAddress: voucher.Address,
|
||||
TokenSymbol: voucher.Symbol,
|
||||
TokenDecimals: strconv.Itoa(voucher.Decimals),
|
||||
})
|
||||
}
|
||||
return swapToList, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
|
||||
p, ok := das.pools[poolAddress]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("Pool address: %v not found ", poolAddress)
|
||||
}
|
||||
limit, ok := p.PoolLimit[fromTokenAddress]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("Token address: %v not found in the pool", fromTokenAddress)
|
||||
}
|
||||
|
||||
return &models.MaxLimitResult{
|
||||
Max: limit,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
|
||||
return &models.TokenInPoolResult{
|
||||
CanSwapFrom: true,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@ -9,7 +9,6 @@ import (
|
||||
|
||||
func TestApiRequestAlias(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ctx = context.WithValue(ctx, "SessionId", "+25471234565")
|
||||
storageService := mocks.NewMemStorageService(ctx)
|
||||
svc := NewDevAccountService(ctx, storageService)
|
||||
ra, err := svc.CreateAccount(ctx)
|
||||
@ -17,10 +16,10 @@ func TestApiRequestAlias(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
addr := ra.PublicKey
|
||||
|
||||
|
||||
_, err = svc.RequestAlias(ctx, addr, "+254f00")
|
||||
if err == nil {
|
||||
t.Fatalf("expected error")
|
||||
t.Fatalf("expected error")
|
||||
}
|
||||
alias := "+254712345678"
|
||||
rb, err := svc.RequestAlias(ctx, addr, alias)
|
||||
@ -40,7 +39,6 @@ func TestApiRequestAlias(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
alias = "foo.sarafu.local"
|
||||
if rb.Alias != alias {
|
||||
t.Fatalf("expected '%s', got '%s'", alias, rb.Alias)
|
||||
}
|
||||
@ -58,12 +56,12 @@ func TestApiRequestAlias(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
addr = ra.PublicKey
|
||||
alias = "foox"
|
||||
|
||||
rb, err = svc.RequestAlias(ctx, addr, alias)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
alias = "foox.sarafu.local"
|
||||
alias = "foox"
|
||||
if rb.Alias != alias {
|
||||
t.Fatalf("expected '%s', got '%s'", alias, rb.Alias)
|
||||
}
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
{
|
||||
"ok": true,
|
||||
"description": "Swap from list",
|
||||
"result": {
|
||||
"filtered": [
|
||||
{
|
||||
"contractAddress": "0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe",
|
||||
"tokenSymbol": "AMANI",
|
||||
"tokenDecimals": "6",
|
||||
"balance": ""
|
||||
},
|
||||
{
|
||||
"contractAddress": "0xF0C3C7581b8b96B59a97daEc8Bd48247cE078674",
|
||||
"tokenSymbol": "AMUA",
|
||||
"tokenDecimals": "6",
|
||||
"balance": ""
|
||||
},
|
||||
{
|
||||
"contractAddress": "0x371455a30fc62736145Bd8429Fcc6481186f235F",
|
||||
"tokenSymbol": "BAHARI",
|
||||
"tokenDecimals": "6",
|
||||
"balance": ""
|
||||
},
|
||||
{
|
||||
"contractAddress": "0x7cA6113b59c24a880F382C7E12d609a6Eb05246b",
|
||||
"tokenSymbol": "BANGLA",
|
||||
"tokenDecimals": "6",
|
||||
"balance": ""
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
{
|
||||
"ok": true,
|
||||
"description": "Swap to list",
|
||||
"result": {
|
||||
"filtered": [
|
||||
{
|
||||
"contractAddress": "0x765DE816845861e75A25fCA122bb6898B8B1282a",
|
||||
"tokenSymbol": "cUSD",
|
||||
"tokenDecimals": "18",
|
||||
"balance": ""
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
{
|
||||
"ok": true,
|
||||
"description": "Top 5 pools sorted by swaps",
|
||||
"result": {
|
||||
"topPools": [
|
||||
{
|
||||
"poolName": "Kenya ROLA Pool",
|
||||
"poolSymbol": "ROLA",
|
||||
"poolContractAddress": "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
|
||||
"limiterAddress": "",
|
||||
"voucherRegistry": ""
|
||||
},
|
||||
{
|
||||
"poolName": "Nairobi ROLA Pool",
|
||||
"poolSymbol": "NAIROBI",
|
||||
"poolContractAddress": "0xB0660Ac1Ee3d32ea35bc728D7CA1705Fa5A37528",
|
||||
"limiterAddress": "",
|
||||
"voucherRegistry": ""
|
||||
},
|
||||
{
|
||||
"poolName": "Friends of Kiriba Ecosystem ",
|
||||
"poolSymbol": "FRIENDS",
|
||||
"poolContractAddress": "0xC4848263821FA02baB2181910A2eFb9CECb2c21C",
|
||||
"limiterAddress": "",
|
||||
"voucherRegistry": ""
|
||||
},
|
||||
{
|
||||
"poolName": "Resilient Community Waqfs",
|
||||
"poolSymbol": "REZILIENS",
|
||||
"poolContractAddress": "0x1e40951d7a28147D8B4A554C60c42766C92e2Fc6",
|
||||
"limiterAddress": "",
|
||||
"voucherRegistry": ""
|
||||
},
|
||||
{
|
||||
"poolName": "GrE Tech",
|
||||
"poolSymbol": "GRET",
|
||||
"poolContractAddress": "0xb7B9d0A264eD1a8E2418571B7AC5933C79C9c2B8",
|
||||
"limiterAddress": "",
|
||||
"voucherRegistry": ""
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
20
event/msg.go
20
event/msg.go
@ -8,12 +8,12 @@ import (
|
||||
const (
|
||||
// TODO: integrate with sarafu-vise-events
|
||||
EventTokenTransferTag = "TOKEN_TRANSFER"
|
||||
EventTokenMintTag = "TOKEN_MINT"
|
||||
EventRegistrationTag = "CUSTODIAL_REGISTRATION"
|
||||
EventTokenMintTag = "TOKEN_MINT"
|
||||
EventRegistrationTag = "CUSTODIAL_REGISTRATION"
|
||||
)
|
||||
|
||||
type Msg struct {
|
||||
Typ string
|
||||
Typ string
|
||||
Item any
|
||||
}
|
||||
|
||||
@ -26,17 +26,17 @@ type EventCustodialRegistration struct {
|
||||
|
||||
// fields used for handling token transfer event.
|
||||
type EventTokenTransfer struct {
|
||||
To string
|
||||
Value int
|
||||
To string
|
||||
Value int
|
||||
VoucherAddress string
|
||||
TxHash string
|
||||
From string
|
||||
TxHash string
|
||||
From string
|
||||
}
|
||||
|
||||
type EventTokenMint struct {
|
||||
To string
|
||||
Value int
|
||||
TxHash string
|
||||
To string
|
||||
Value int
|
||||
TxHash string
|
||||
VoucherAddress string
|
||||
}
|
||||
|
||||
|
||||
8
go.mod
8
go.mod
@ -3,12 +3,12 @@ module git.grassecon.net/grassrootseconomics/sarafu-api
|
||||
go 1.23.4
|
||||
|
||||
require (
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63
|
||||
github.com/gofrs/uuid v4.4.0+incompatible
|
||||
github.com/grassrootseconomics/eth-custodial v1.3.0-beta
|
||||
github.com/grassrootseconomics/ussd-data-service v1.6.0-beta
|
||||
github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
|
||||
github.com/stretchr/testify v1.9.0
|
||||
)
|
||||
|
||||
|
||||
22
go.sum
22
go.sum
@ -1,9 +1,9 @@
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2 h1:ON77G5K0JNuwPb5JT/hRfF6G6+xstlBQgEIEzWydnhg=
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b h1:rwWXMtNSn7aqhb4p1oVZkCA1vC7pVdohwW61QQM8fUs=
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05 h1:BenzGx6aDHKDwE23/mWIFD2InYIXyzHroZWV3MF5WUk=
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63 h1:bX7klKZpX+ZZu1LKbtOXDAhV/KK0YwExehiIi0jusAM=
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63/go.mod h1:Syw9TZyigPAM7t9FvicOm36iUnidt45f0SxzT2JniQ8=
|
||||
github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
|
||||
github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
|
||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||
@ -18,16 +18,6 @@ github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQ
|
||||
github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.4.0-beta h1:4fMd/3h2ZIhRg4GdHQmRw5FfD3MpJvFNNJQo+Q27f5M=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.4.0-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.4.4-beta h1:turlyo0i3OLj29mWpWNoB/3Qao8qEngT/5d1jDWTZE4=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.4.4-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.4.7-beta h1:yAe1YaOBsdxW2m20jnVU4F0kLmFr+mK/gHCWEdHmE90=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.4.7-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.5.0-beta h1:BSSQL/yPEvTVku9ja/ENZyZdwZkEaiTzzOUfg72bTy4=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.5.0-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.6.0-beta h1:pY6zns6ifXyClRxP+JJaWrged3oRE7tTS2xaftF9clA=
|
||||
github.com/grassrootseconomics/ussd-data-service v1.6.0-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
|
||||
github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
|
||||
github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
|
||||
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
||||
|
||||
@ -7,13 +7,3 @@ type RequestAliasResult struct {
|
||||
type AliasAddress struct {
|
||||
Address string
|
||||
}
|
||||
|
||||
type AliasEnsResult struct {
|
||||
Address string `json:"address"`
|
||||
AutoChoose bool `json:"autoChoose"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
type AliasEnsAddressResult struct {
|
||||
Address string `json:"address"`
|
||||
}
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
package models
|
||||
|
||||
type PoolDepositResult struct {
|
||||
TrackingId string `json:"trackingId"`
|
||||
}
|
||||
|
||||
type PoolSwapQuoteResult struct {
|
||||
IncludesFeesDeduction bool `json:"includesFeesDeduction"`
|
||||
OutValue string `json:"outValue"`
|
||||
}
|
||||
|
||||
type PoolSwapResult struct {
|
||||
TrackingId string `json:"trackingId"`
|
||||
}
|
||||
|
||||
type MaxLimitResult struct {
|
||||
Max string `json:"max"`
|
||||
}
|
||||
|
||||
type TokenInPoolResult struct {
|
||||
CanSwapFrom bool `json:"canSwapFrom"`
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
package models
|
||||
|
||||
type SendSMSResponse struct {
|
||||
Invitee string `json:"invitee"`
|
||||
}
|
||||
@ -17,16 +17,4 @@ type AccountService interface {
|
||||
TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error)
|
||||
CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error)
|
||||
RequestAlias(ctx context.Context, hint string, publicKey string) (*models.RequestAliasResult, error)
|
||||
SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error)
|
||||
SendAddressSMS(ctx context.Context, publicKey, originPhone string) error
|
||||
SendPINResetSMS(ctx context.Context, admin, phone string) error
|
||||
PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error)
|
||||
FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error)
|
||||
RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error)
|
||||
GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error)
|
||||
GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error)
|
||||
GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error)
|
||||
PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error)
|
||||
GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error)
|
||||
CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error)
|
||||
}
|
||||
|
||||
@ -3,33 +3,21 @@ package http
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"git.defalsify.org/vise.git/logging"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/config"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/dev"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/models"
|
||||
"git.grassecon.net/grassrootseconomics/visedriver/storage"
|
||||
"github.com/grassrootseconomics/eth-custodial/pkg/api"
|
||||
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
||||
)
|
||||
|
||||
var (
|
||||
aliasRegex = regexp.MustCompile("^\\+?[a-zA-Z0-9\\-_]+$")
|
||||
logg = logging.NewVanilla().WithDomain("sarafu-api.devapi")
|
||||
)
|
||||
|
||||
type HTTPAccountService struct {
|
||||
SS storage.StorageService
|
||||
UseApi bool
|
||||
}
|
||||
|
||||
// Parameters:
|
||||
@ -62,10 +50,6 @@ func (as *HTTPAccountService) TrackAccountStatus(ctx context.Context, publicKey
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) ToFqdn(alias string) string {
|
||||
return alias + ".sarafu.eth"
|
||||
}
|
||||
|
||||
// CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
|
||||
// Parameters:
|
||||
// - publicKey: The public key associated with the account whose balance needs to be checked.
|
||||
@ -220,424 +204,24 @@ func (as *HTTPAccountService) TokenTransfer(ctx context.Context, amount, from, t
|
||||
// Parameters:
|
||||
// - alias: The alias of the user.
|
||||
func (as *HTTPAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
if as.SS == nil {
|
||||
return nil, fmt.Errorf("The storage service cannot be nil")
|
||||
}
|
||||
logg.InfoCtxf(ctx, "resolving alias before formatting", "alias", alias)
|
||||
svc := dev.NewDevAccountService(ctx, as.SS)
|
||||
if as.UseApi {
|
||||
logg.InfoCtxf(ctx, "resolving alias to address", "alias", alias)
|
||||
return resolveAliasAddress(ctx, alias)
|
||||
} else {
|
||||
return svc.CheckAliasAddress(ctx, alias)
|
||||
}
|
||||
}
|
||||
var r models.AliasAddress
|
||||
|
||||
func resolveAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
var aliasEnsResult models.AliasEnsAddressResult
|
||||
|
||||
fullURL, err := url.JoinPath(config.AliasResolverURL, alias)
|
||||
ep, err := url.JoinPath(config.CheckAliasURL, alias)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
req, err := http.NewRequest("GET", fullURL, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
_, err = doRequest(ctx, req, &aliasEnsResult)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &models.AliasAddress{Address: aliasEnsResult.Address}, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
|
||||
svc := dev.NewDevAccountService(ctx, as.SS)
|
||||
if as.UseApi {
|
||||
return fetchCustodialTopPools(ctx)
|
||||
} else {
|
||||
return svc.FetchTopPools(ctx)
|
||||
}
|
||||
}
|
||||
|
||||
func fetchCustodialTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
|
||||
var r struct {
|
||||
TopPools []dataserviceapi.PoolDetails `json:"topPools"`
|
||||
}
|
||||
|
||||
req, err := http.NewRequest("GET", config.TopPoolsURL, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
return r.TopPools, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
|
||||
if as.UseApi {
|
||||
return retrievePoolDetails(ctx, sym)
|
||||
} else {
|
||||
return nil, nil
|
||||
}
|
||||
}
|
||||
|
||||
func retrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
|
||||
var r struct {
|
||||
PoolDetails dataserviceapi.PoolDetails `json:"poolDetails"`
|
||||
}
|
||||
|
||||
ep, err := url.JoinPath(config.RetrievePoolDetailsURL, sym)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req, err := http.NewRequest("GET", ep, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &r.PoolDetails, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error) {
|
||||
var r models.PoolDepositResult
|
||||
|
||||
//pool deposit payload
|
||||
payload := map[string]string{
|
||||
"amount": amount,
|
||||
"from": from,
|
||||
"poolAddress": poolAddress,
|
||||
"tokenAddress": tokenAddress,
|
||||
}
|
||||
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req, err := http.NewRequest("POST", config.TokenTransferURL, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
|
||||
var r models.PoolSwapQuoteResult
|
||||
|
||||
//pool swap quote payload
|
||||
payload := map[string]string{
|
||||
"amount": amount,
|
||||
"from": from,
|
||||
"fromTokenAddress": fromTokenAddress,
|
||||
"poolAddress": poolAddress,
|
||||
"toTokenAddress": toTokenAddress,
|
||||
}
|
||||
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
req, err := http.NewRequest("POST", config.PoolSwapQuoteURL, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
if as.UseApi {
|
||||
return as.getPoolSwappableFromVouchers(ctx, poolAddress, publicKey)
|
||||
} else {
|
||||
svc := dev.NewDevAccountService(ctx, as.SS)
|
||||
return svc.GetPoolSwappableFromVouchers(ctx, poolAddress, publicKey)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) getPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
var r struct {
|
||||
PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
|
||||
}
|
||||
ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "from", publicKey)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req, err := http.NewRequest("GET", ep, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
|
||||
return r.PoolSwappableVouchers, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
svc := dev.NewDevAccountService(ctx, as.SS)
|
||||
if as.UseApi {
|
||||
return as.getPoolSwappableVouchers(ctx, poolAddress)
|
||||
} else {
|
||||
return svc.GetPoolSwappableVouchers(ctx, poolAddress)
|
||||
}
|
||||
}
|
||||
|
||||
func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
var r struct {
|
||||
PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
|
||||
}
|
||||
|
||||
basePath, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
parsedURL, err := url.Parse(basePath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
query := parsedURL.Query()
|
||||
if config.IncludeStablesParam != "" {
|
||||
query.Set("stables", config.IncludeStablesParam)
|
||||
}
|
||||
parsedURL.RawQuery = query.Encode()
|
||||
|
||||
req, err := http.NewRequest("GET", parsedURL.String(), nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
return r.PoolSwappableVouchers, nil
|
||||
return &r, err
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
|
||||
var r models.PoolSwapResult
|
||||
|
||||
//swap payload
|
||||
payload := map[string]string{
|
||||
"amount": amount,
|
||||
"from": from,
|
||||
"fromTokenAddress": fromTokenAddress,
|
||||
"poolAddress": poolAddress,
|
||||
"toTokenAddress": toTokenAddress,
|
||||
}
|
||||
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
req, err := http.NewRequest("POST", config.PoolSwapURL, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
|
||||
if as.UseApi {
|
||||
return as.getSwapFromTokenMaxLimit(ctx, poolAddress, fromTokenAddress, toTokenAddress, publicKey)
|
||||
} else {
|
||||
svc := dev.NewDevAccountService(ctx, as.SS)
|
||||
return svc.GetSwapFromTokenMaxLimit(ctx, poolAddress, fromTokenAddress, toTokenAddress, publicKey)
|
||||
}
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) getSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokeAddress, publicKey string) (*models.MaxLimitResult, error) {
|
||||
var r models.MaxLimitResult
|
||||
|
||||
ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "limit", fromTokenAddress, toTokeAddress, publicKey)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req, err := http.NewRequest("GET", ep, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
|
||||
if as.UseApi {
|
||||
return as.checkTokenInPool(ctx, poolAddress, tokenAddress)
|
||||
} else {
|
||||
svc := dev.NewDevAccountService(ctx, as.SS)
|
||||
return svc.CheckTokenInPool(ctx, poolAddress, tokenAddress)
|
||||
}
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) checkTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
|
||||
var r models.TokenInPoolResult
|
||||
|
||||
ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "check", tokenAddress)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req, err := http.NewRequest("GET", ep, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
// TODO: Use actual custodial api to request available alias
|
||||
func (as *HTTPAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
if as.SS == nil {
|
||||
return nil, fmt.Errorf("The storage service cannot be nil")
|
||||
}
|
||||
if as.UseApi {
|
||||
if !strings.Contains(hint, ".") {
|
||||
hint = as.ToFqdn(hint)
|
||||
}
|
||||
enr, err := requestEnsAlias(ctx, publicKey, hint)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &models.RequestAliasResult{Alias: enr.Name}, nil
|
||||
} else {
|
||||
svc := dev.NewDevAccountService(ctx, as.SS)
|
||||
return svc.RequestAlias(ctx, publicKey, hint)
|
||||
}
|
||||
}
|
||||
|
||||
func requestEnsAlias(ctx context.Context, publicKey string, hint string) (*models.AliasEnsResult, error) {
|
||||
var r models.AliasEnsResult
|
||||
|
||||
endpoint := config.AliasRegistrationURL
|
||||
|
||||
logg.InfoCtxf(ctx, "requesting alias", "endpoint", endpoint, "hint", hint)
|
||||
//Payload with the address and hint to derive an ENS name
|
||||
payload := map[string]string{
|
||||
"address": publicKey,
|
||||
"hint": hint,
|
||||
}
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req, err := http.NewRequest("POST", endpoint, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// Log the request body
|
||||
logg.InfoCtxf(ctx, "request body", "payload", string(payloadBytes))
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
logg.InfoCtxf(ctx, "alias successfully assigned", "alias", r.Name)
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
// SendSMS calls the API to send out an SMS.
|
||||
// Parameters:
|
||||
// - inviterPhone: The user initiating the SMS.
|
||||
// - inviteePhone: The number being invited to Sarafu.
|
||||
func (as *HTTPAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
var r models.SendSMSResponse
|
||||
|
||||
// Create request payload
|
||||
payload := map[string]string{
|
||||
"inviterPhone": inviterPhone,
|
||||
"inviteePhone": inviteePhone,
|
||||
}
|
||||
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Create a new request
|
||||
req, err := http.NewRequest("POST", config.SendSMSURL, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
|
||||
ep, err := url.JoinPath(config.ExternalSMSURL, "address")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
logg.InfoCtxf(ctx, "sending an address sms", "endpoint", ep, "address", publicKey, "origin-phone", originPhone)
|
||||
payload := map[string]string{
|
||||
"address": publicKey,
|
||||
"originPhone": originPhone,
|
||||
}
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req, err := http.NewRequest("POST", ep, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = doRequest(ctx, req, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
|
||||
ep, err := url.JoinPath(config.ExternalSMSURL, "pinreset")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
logg.InfoCtxf(ctx, "sending pin reset sms", "endpoint", ep, "admin", admin, "phone", phone)
|
||||
payload := map[string]string{
|
||||
"admin": admin,
|
||||
"phone": phone,
|
||||
}
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req, err := http.NewRequest("POST", ep, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = doRequest(ctx, req, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
return nil, fmt.Errorf("not yet implemented")
|
||||
}
|
||||
|
||||
// TODO: remove eth-custodial api dependency
|
||||
@ -648,7 +232,6 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
|
||||
req.Header.Set("Authorization", "Bearer "+config.BearerToken)
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
||||
// Log request
|
||||
logRequestDetails(req)
|
||||
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
@ -659,26 +242,22 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
// Read and log response body
|
||||
log.Printf("Received response for %s: Status Code: %d | Content-Type: %s", req.URL, resp.StatusCode, resp.Header.Get("Content-Type"))
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
log.Printf("Received response for %s: Status Code: %d | Content-Type: %s | Body: %s",
|
||||
req.URL, resp.StatusCode, resp.Header.Get("Content-Type"), string(body))
|
||||
|
||||
if resp.StatusCode >= http.StatusBadRequest {
|
||||
if err := json.Unmarshal(body, &errResponse); err != nil {
|
||||
err := json.Unmarshal([]byte(body), &errResponse)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return nil, errors.New(errResponse.Description)
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(body, &okResponse); err != nil {
|
||||
err = json.Unmarshal([]byte(body), &okResponse)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(okResponse.Result) == 0 {
|
||||
return nil, errors.New("Empty api result")
|
||||
}
|
||||
@ -695,14 +274,16 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
|
||||
func logRequestDetails(req *http.Request) {
|
||||
var bodyBytes []byte
|
||||
contentType := req.Header.Get("Content-Type")
|
||||
|
||||
if req.Body != nil {
|
||||
bodyBytes, _ = io.ReadAll(req.Body)
|
||||
req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes)) // Restore body
|
||||
bodyBytes, err := io.ReadAll(req.Body)
|
||||
if err != nil {
|
||||
log.Printf("Error reading request body: %s", err)
|
||||
return
|
||||
}
|
||||
req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
|
||||
} else {
|
||||
bodyBytes = []byte("-")
|
||||
}
|
||||
|
||||
log.Printf("Outgoing Request -> URL: %s | Method: %s | Content-Type: %s | Body: %s",
|
||||
req.URL.String(), req.Method, contentType, string(bodyBytes))
|
||||
log.Printf("URL: %s | Content-Type: %s | Method: %s| Request Body: %s", req.URL, contentType, req.Method, string(bodyBytes))
|
||||
}
|
||||
|
||||
@ -4,8 +4,8 @@ import (
|
||||
"context"
|
||||
|
||||
"git.defalsify.org/vise.git/logging"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/models"
|
||||
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/models"
|
||||
)
|
||||
|
||||
var (
|
||||
@ -14,54 +14,52 @@ var (
|
||||
|
||||
const (
|
||||
AliceChecksum = "0xeae046BF396e91f5A8D74f863dC57c107c8a4a70"
|
||||
BobChecksum = "0xB3117202371853e24B725d4169D87616A7dDb127"
|
||||
AliceSession = "5553425"
|
||||
BobChecksum = "0xB3117202371853e24B725d4169D87616A7dDb127"
|
||||
AliceSession = "5553425"
|
||||
)
|
||||
|
||||
type MockApi struct {
|
||||
TransactionsContent []dataserviceapi.Last10TxResponse
|
||||
VouchersContent []dataserviceapi.TokenHoldings
|
||||
VoucherDataContent *models.VoucherDataResult
|
||||
VouchersContent []dataserviceapi.TokenHoldings
|
||||
VoucherDataContent *models.VoucherDataResult
|
||||
}
|
||||
|
||||
func (m MockApi) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
|
||||
func(m MockApi) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m MockApi) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
|
||||
func(m MockApi) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m MockApi) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
|
||||
func(m MockApi) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m MockApi) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
func(m MockApi) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
logg.DebugCtxf(ctx, "mockapi fetchvouchers", "key", publicKey)
|
||||
return m.VouchersContent, nil
|
||||
}
|
||||
|
||||
func (m MockApi) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
|
||||
func(m MockApi) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
|
||||
logg.DebugCtxf(ctx, "mockapi fetchtransactions", "key", publicKey)
|
||||
return m.TransactionsContent, nil
|
||||
}
|
||||
|
||||
func (m MockApi) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
|
||||
func(m MockApi) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
|
||||
return m.VoucherDataContent, nil
|
||||
}
|
||||
|
||||
func (m MockApi) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
func(m MockApi) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m MockApi) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
func(m MockApi) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m MockApi) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
|
||||
func(m MockApi) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m MockApi) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
|
||||
@ -53,65 +53,7 @@ func (m *MockAccountService) CheckAliasAddress(ctx context.Context, alias string
|
||||
return args.Get(0).(*models.AliasAddress), args.Error(1)
|
||||
}
|
||||
|
||||
func (m *MockAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
func(m MockAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
args := m.Called(publicKey, hint)
|
||||
return args.Get(0).(*models.RequestAliasResult), args.Error(1)
|
||||
}
|
||||
|
||||
func (m *MockAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
args := m.Called(inviterPhone, inviteePhone)
|
||||
return args.Get(0).(*models.SendSMSResponse), args.Error(1)
|
||||
}
|
||||
|
||||
func (m *MockAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *MockAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m MockAccountService) PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error) {
|
||||
args := m.Called(amount, from, poolAddress, tokenAddress)
|
||||
return args.Get(0).(*models.PoolDepositResult), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
|
||||
args := m.Called()
|
||||
return args.Get(0).([]dataserviceapi.PoolDetails), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
|
||||
args := m.Called()
|
||||
return args.Get(0).(*dataserviceapi.PoolDetails), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
args := m.Called(poolAddress, publicKey)
|
||||
return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
args := m.Called(poolAddress)
|
||||
return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
|
||||
args := m.Called(amount, from, fromTokenAddress, poolAddress, toTokenAddress)
|
||||
return args.Get(0).(*models.PoolSwapQuoteResult), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
|
||||
args := m.Called(amount, from, fromTokenAddress, poolAddress, toTokenAddress)
|
||||
return args.Get(0).(*models.PoolSwapResult), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
|
||||
args := m.Called(poolAddress, fromTokenAddress, toTokenAddress, publicKey)
|
||||
return args.Get(0).(*models.MaxLimitResult), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
|
||||
args := m.Called(poolAddress, tokenAddress)
|
||||
return args.Get(0).(*models.TokenInPoolResult), args.Error(1)
|
||||
}
|
||||
|
||||
@ -35,10 +35,10 @@ func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey
|
||||
func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
return []dataserviceapi.TokenHoldings{
|
||||
dataserviceapi.TokenHoldings{
|
||||
TokenAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
|
||||
TokenSymbol: "SRF",
|
||||
TokenDecimals: "6",
|
||||
Balance: "2745987",
|
||||
ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
|
||||
TokenSymbol: "SRF",
|
||||
TokenDecimals: "6",
|
||||
Balance: "2745987",
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
@ -57,58 +57,10 @@ func (tas *TestAccountService) TokenTransfer(ctx context.Context, amount, from,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error) {
|
||||
return &models.PoolDepositResult{}, nil
|
||||
}
|
||||
|
||||
func (m *TestAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
func (m TestAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
return &models.AliasAddress{}, nil
|
||||
}
|
||||
|
||||
func (m *TestAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
func (m TestAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
return &models.RequestAliasResult{}, nil
|
||||
}
|
||||
|
||||
func (m *TestAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
return &models.SendSMSResponse{}, nil
|
||||
}
|
||||
|
||||
func (m *TestAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *TestAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
|
||||
return []dataserviceapi.PoolDetails{}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
|
||||
return &dataserviceapi.PoolDetails{}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
return []dataserviceapi.TokenHoldings{}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
|
||||
return []dataserviceapi.TokenHoldings{}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
|
||||
return &models.PoolSwapQuoteResult{}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
|
||||
return &models.PoolSwapResult{}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
|
||||
return &models.MaxLimitResult{}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
|
||||
return &models.TokenInPoolResult{}, nil
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user