Compare commits
5 Commits
2731a787e3
...
75a7ec6b32
| Author | SHA1 | Date | |
|---|---|---|---|
| 75a7ec6b32 | |||
| 3e82e16923 | |||
| c11060648d | |||
| 01569b9b39 | |||
| 96c323f202 |
@ -26,6 +26,7 @@ const (
|
|||||||
AliasResolverPrefix = "/api/v1/resolve"
|
AliasResolverPrefix = "/api/v1/resolve"
|
||||||
ExternalSMSPrefix = "/api/v1/external"
|
ExternalSMSPrefix = "/api/v1/external"
|
||||||
AliasUpdatePrefix = "/api/v1/internal/update"
|
AliasUpdatePrefix = "/api/v1/internal/update"
|
||||||
|
CreditSendPrefix = "/api/v1/credit-send"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -57,6 +58,7 @@ var (
|
|||||||
AliasResolverURL string
|
AliasResolverURL string
|
||||||
ExternalSMSURL string
|
ExternalSMSURL string
|
||||||
AliasUpdateURL string
|
AliasUpdateURL string
|
||||||
|
CreditSendURL string
|
||||||
)
|
)
|
||||||
|
|
||||||
func setBase() error {
|
func setBase() error {
|
||||||
@ -105,6 +107,7 @@ func LoadConfig() error {
|
|||||||
AliasResolverURL, _ = url.JoinPath(aliasEnsURLBase, AliasResolverPrefix)
|
AliasResolverURL, _ = url.JoinPath(aliasEnsURLBase, AliasResolverPrefix)
|
||||||
ExternalSMSURL, _ = url.JoinPath(externalSMSBase, ExternalSMSPrefix)
|
ExternalSMSURL, _ = url.JoinPath(externalSMSBase, ExternalSMSPrefix)
|
||||||
AliasUpdateURL, _ = url.JoinPath(aliasEnsURLBase, AliasUpdatePrefix)
|
AliasUpdateURL, _ = url.JoinPath(aliasEnsURLBase, AliasUpdatePrefix)
|
||||||
|
CreditSendURL, _ = url.JoinPath(dataURLBase, CreditSendPrefix)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
23
dev/api.go
23
dev/api.go
@ -587,10 +587,10 @@ func (das *DevAccountService) FetchVouchers(ctx context.Context, publicKey strin
|
|||||||
//TODO: Iterate over the account acc.Balances object
|
//TODO: Iterate over the account acc.Balances object
|
||||||
for _, voucher := range das.vouchers {
|
for _, voucher := range das.vouchers {
|
||||||
holdings = append(holdings, dataserviceapi.TokenHoldings{
|
holdings = append(holdings, dataserviceapi.TokenHoldings{
|
||||||
TokenAddress: voucher.Address,
|
TokenAddress: voucher.Address,
|
||||||
TokenSymbol: voucher.Symbol,
|
TokenSymbol: voucher.Symbol,
|
||||||
TokenDecimals: strconv.Itoa(voucher.Decimals),
|
TokenDecimals: strconv.Itoa(voucher.Decimals),
|
||||||
Balance: strconv.Itoa(int(defaultVoucherBalance)),
|
Balance: strconv.Itoa(int(defaultVoucherBalance)),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -861,10 +861,10 @@ func (das *DevAccountService) GetPoolSwappableFromVouchers(ctx context.Context,
|
|||||||
}
|
}
|
||||||
for _, v := range p.Vouchers {
|
for _, v := range p.Vouchers {
|
||||||
swapFromList = append(swapFromList, dataserviceapi.TokenHoldings{
|
swapFromList = append(swapFromList, dataserviceapi.TokenHoldings{
|
||||||
TokenAddress: v.Address,
|
TokenAddress: v.Address,
|
||||||
TokenSymbol: v.Symbol,
|
TokenSymbol: v.Symbol,
|
||||||
TokenDecimals: string(defaultDecimals),
|
TokenDecimals: string(defaultDecimals),
|
||||||
Balance: fmt.Sprintf("%f", defaultVoucherBalance),
|
Balance: fmt.Sprintf("%f", defaultVoucherBalance),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -907,3 +907,10 @@ func (das *DevAccountService) CheckTokenInPool(ctx context.Context, poolAddress,
|
|||||||
CanSwapFrom: true,
|
CanSwapFrom: true,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (das *DevAccountService) GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error) {
|
||||||
|
return &models.CreditSendLimitsResult{
|
||||||
|
MaxRAT: "45599996",
|
||||||
|
MaxSAT: "3507692",
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|||||||
@ -20,3 +20,8 @@ type MaxLimitResult struct {
|
|||||||
type TokenInPoolResult struct {
|
type TokenInPoolResult struct {
|
||||||
CanSwapFrom bool `json:"canSwapFrom"`
|
CanSwapFrom bool `json:"canSwapFrom"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CreditSendLimitsResult struct {
|
||||||
|
MaxRAT string `json:"maxRAT"`
|
||||||
|
MaxSAT string `json:"maxSAT"`
|
||||||
|
}
|
||||||
|
|||||||
@ -30,4 +30,5 @@ type AccountService interface {
|
|||||||
PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, 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)
|
GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error)
|
||||||
CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error)
|
CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error)
|
||||||
|
GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -517,10 +517,10 @@ func (as *HTTPAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, pool
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (as *HTTPAccountService) getSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokeAddress, publicKey string) (*models.MaxLimitResult, error) {
|
func (as *HTTPAccountService) getSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
|
||||||
var r models.MaxLimitResult
|
var r models.MaxLimitResult
|
||||||
|
|
||||||
ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "limit", fromTokenAddress, toTokeAddress, publicKey)
|
ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "limit", fromTokenAddress, toTokenAddress, publicKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -742,6 +742,26 @@ func (as *HTTPAccountService) SendPINResetSMS(ctx context.Context, admin, phone
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCreditSendMaxLimit calls the API to check credit limits and return the maxRAT and maxSAT
|
||||||
|
func (as *HTTPAccountService) GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error) {
|
||||||
|
var r models.CreditSendLimitsResult
|
||||||
|
|
||||||
|
ep, err := url.JoinPath(config.CreditSendURL, poolAddress, fromTokenAddress, toTokenAddress, 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
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: remove eth-custodial api dependency
|
// TODO: remove eth-custodial api dependency
|
||||||
func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
|
func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
|
||||||
var okResponse api.OKResponse
|
var okResponse api.OKResponse
|
||||||
|
|||||||
@ -120,3 +120,8 @@ func (m MockAccountService) CheckTokenInPool(ctx context.Context, poolAddress, t
|
|||||||
args := m.Called(poolAddress, tokenAddress)
|
args := m.Called(poolAddress, tokenAddress)
|
||||||
return args.Get(0).(*models.TokenInPoolResult), args.Error(1)
|
return args.Get(0).(*models.TokenInPoolResult), args.Error(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m MockAccountService) GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error) {
|
||||||
|
args := m.Called(poolAddress, fromTokenAddress, toTokenAddress, publicKey)
|
||||||
|
return args.Get(0).(*models.CreditSendLimitsResult), args.Error(1)
|
||||||
|
}
|
||||||
|
|||||||
@ -116,3 +116,8 @@ func (m TestAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAd
|
|||||||
func (m TestAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
|
func (m TestAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
|
||||||
return &models.TokenInPoolResult{}, nil
|
return &models.TokenInPoolResult{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m TestAccountService) GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error) {
|
||||||
|
return &models.CreditSendLimitsResult{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user