grassrootseconomics/sarafu-api
8
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: grassrootseconomics:c1797e7a32b5bf08fc7d8bfe7c7d8ddad29b1533
Branches Tags
grassrootseconomics:master
grassrootseconomics:update-alias
grassrootseconomics:pool-swap-endpoints
grassrootseconomics:sohail/experimental
grassrootseconomics:sms-address-pin-reset
grassrootseconomics:sms-api
grassrootseconomics:multi-pool
grassrootseconomics:pool-swap-endpoints-issue#9
grassrootseconomics:ens-names
grassrootseconomics:dev-pool-swap
grassrootseconomics:sarafu-api-logs
grassrootseconomics:dev-api-aliases-v2
grassrootseconomics:dev-api-aliases
grassrootseconomics:lash/alias
grassrootseconomics:lash/dev-api-events
grassrootseconomics:lash/dev-api
grassrootseconomics:v0.9.0-beta.1
..
compare: grassrootseconomics:b5ccaea57560984cdc0d1c1a0f9308a8703aabe8
Branches Tags
grassrootseconomics:update-alias
grassrootseconomics:master
grassrootseconomics:pool-swap-endpoints
grassrootseconomics:sohail/experimental
grassrootseconomics:sms-address-pin-reset
grassrootseconomics:sms-api
grassrootseconomics:multi-pool
grassrootseconomics:pool-swap-endpoints-issue#9
grassrootseconomics:ens-names
grassrootseconomics:dev-pool-swap
grassrootseconomics:sarafu-api-logs
grassrootseconomics:dev-api-aliases-v2
grassrootseconomics:dev-api-aliases
grassrootseconomics:lash/alias
grassrootseconomics:lash/dev-api-events
grassrootseconomics:lash/dev-api
grassrootseconomics:v0.9.0-beta.1

No commits in common. "c1797e7a32b5bf08fc7d8bfe7c7d8ddad29b1533" and "b5ccaea57560984cdc0d1c1a0f9308a8703aabe8" have entirely different histories.
c1797e7a32 ... b5ccaea575

7 changed files with 14 additions and 16 deletions
Show Stats Expand all files Collapse all files

10
dev/api.go
View File

@ -864,17 +864,17 @@ func (das *DevAccountService) GetPoolSwappableFromVouchers(ctx context.Context,
return swapFromList, nil
}
func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
var swapToList []dataserviceapi.TokenHoldings
func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
var swapToList []dataserviceapi.TokenDetails
_, 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{
ContractAddress: voucher.Address,
swapToList = append(swapToList, dataserviceapi.TokenDetails{
TokenAddress: voucher.Address,
TokenSymbol: voucher.Symbol,
TokenDecimals: strconv.Itoa(voucher.Decimals),
TokenDecimals: defaultDecimals,
})
}
return swapToList, nil

2
go.mod
View File

@ -8,7 +8,7 @@ require (
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
github.com/gofrs/uuid v4.4.0+incompatible
github.com/grassrootseconomics/eth-custodial v1.3.0-beta
github.com/grassrootseconomics/ussd-data-service v1.5.0-beta
github.com/grassrootseconomics/ussd-data-service v1.4.7-beta
github.com/stretchr/testify v1.9.0
)

2
go.sum
View File

@ -24,8 +24,6 @@ github.com/grassrootseconomics/ussd-data-service v1.4.4-beta h1:turlyo0i3OLj29mW
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/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=

2
remote/account_service.go
View File

@ -24,7 +24,7 @@ type AccountService interface {
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)
GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, 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)

6
remote/http/service.go
View File

@ -390,7 +390,7 @@ func (as *HTTPAccountService) getPoolSwappableFromVouchers(ctx context.Context,
return r.PoolSwappableVouchers, nil
}
func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
svc := dev.NewDevAccountService(ctx, as.SS)
if as.UseApi {
return as.getPoolSwappableVouchers(ctx, poolAddress)
@ -399,9 +399,9 @@ func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, pool
}
}
func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
var r struct {
PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
PoolSwappableVouchers []dataserviceapi.TokenDetails `json:"filtered"`
}
basePath, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to")

4
testutil/mocks/service_mock.go
View File

@ -91,9 +91,9 @@ func (m MockAccountService) GetPoolSwappableFromVouchers(ctx context.Context, po
return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
}
func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
args := m.Called(poolAddress)
return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
return args.Get(0).([]dataserviceapi.TokenDetails), args.Error(1)
}
func (m MockAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {

4
testutil/testservice/account_service.go
View File

@ -93,8 +93,8 @@ func (m TestAccountService) GetPoolSwappableFromVouchers(ctx context.Context, po
return []dataserviceapi.TokenHoldings{}, nil
}
func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
return []dataserviceapi.TokenHoldings{}, nil
func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
return []dataserviceapi.TokenDetails{}, nil
}
func (m TestAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {