Merge branch 'develop'

Author: Pedro Pablo Bustamante Barrera

args/arguments.go

@@ -96,6 +96,12 @@ func BuildQuery(params map[string]interface{}) string {
 	return query.Encode()
 }
 
+func Parameter(key string, val interface{}) Argument {
+	return func(params map[string]interface{}) {
+		params[key] = val
+	}
+}
+
 func Currencies(val []string) Argument {
 	return func(params map[string]interface{}) {
 		params[internal.ArgNameCurrencies] = val
@@ -132,6 +138,12 @@ func SortBy(val SortByType) Argument {
 	}
 }
 
+func OrderBy(val OrderByType) Argument {
+	return func(params map[string]interface{}) {
+		params[internal.ArgNameOrderBy] = val
+	}
+}
+
 func From(val string) Argument {
 	return func(params map[string]interface{}) {
 		params[internal.ArgNameFrom] = val
@@ -586,10 +598,17 @@ type FeeRequest struct {
 	Currency    string `json:"currency"`
 	Amount      string `json:"amount"`
 	NetworkCode string `json:"network_code,omitempty"`
+	NetworkFee  string `json:"network_fee,omitempty"`
 }
 
 func FeeRequests(val []FeeRequest) Argument {
 	return func(params map[string]interface{}) {
 		params[internal.SDKArgNameFeeRequest] = val
 	}
 }
+
+func GroupTransactions(val bool) Argument {
+	return func(params map[string]interface{}) {
+		params[internal.ArgNameGroupTransactions] = val
+	}
+}

args/constants.go

@@ -40,13 +40,22 @@ const (
 	SortDESC SortType = "DESC"
 )
 
-// SortBy is the field used for sorting lists
+// SortBy is a field used for sorting lists
 type SortByType string
 
 const (
 	SortByTimestamp SortByType = "timestamp"
 	SortByID        SortByType = "id"
-	SortByCreatedAt SortByType = "created_at"
+)
+
+// OrderBy is a field used for sorting lists
+type OrderByType string
+
+const (
+	OrderByID             OrderByType = "id"
+	OrderByCreatedAt      OrderByType = "created_at"
+	OrderByUpdateAt       OrderByType = "updated_at"
+	OrderByLastActivityAt OrderByType = "last_activity_at"
 )
 
 // PeriodType is the period of a candle

internal/argnames.go

@@ -13,6 +13,7 @@ const (
 	ArgNameSort                 string = "sort"
 	ArgNameSortBy               string = "by"
 	ArgNameIdentifyBy           string = "by"
+	ArgNameOrderBy              string = "order_by"
 	ArgNameTo                   string = "to"
 	ArgNameSince                string = "since"
 	ArgNameUntil                string = "until"
@@ -75,6 +76,7 @@ const (
 	ArgNameMode                 string = "mode"
 	ArgNameTargetCurrency       string = "target_currency"
 	ArgNamePrefferedNetwork     string = "preferred_network"
+	ArgNameGroupTransactions    string = "group_transactions"
 
 	ArgNameDepositAddressGenerationEnabled string = "deposit_address_generation_enabled"
 

models/models.go

@@ -17,26 +17,35 @@ type Currency struct {
 	QRPrefix            string    `json:"qr_prefix"`
 	CryptoPaymentIDName string    `json:"crypto_payment_id_name"`
 	CryptoExplorer      string    `json:"crypto_explorer"`
+	AccountTopOrder     int64     `json:"account_top_order"`
 	Delisted            bool      `json:"delisted"`
 	Networks            []Network `json:"networks"`
 }
 
 type Network struct {
-	Network            string `json:"network"`
-	Protocol           string `json:"protocol"`
-	Default            bool   `json:"default"`
-	PayinEnabled       bool   `json:"payin_enabled"`
-	PayoutEnabled      bool   `json:"payout_enabled"`
-	PrecisionPayout    string `json:"presicion_payout"`
-	PayoutFee          string `str:"payout_fee"`
-	PayoutIsPaymentID  bool   `json:"payout_is_payment_id"`
-	PayinPaymentID     bool   `json:"payin_payment_id"`
-	PayinConfirmations int    `json:"payin_confirmation"`
-	AddressRegex       string `json:"address_confirmation"`
-	PaymentIDRegex     string `json:"payment_id_regex"`
-	LowProcessingTime  string `json:"low_processing_time"`
-	HighProcessingTime string `json:"high_processing_time"`
-	AvgProcessingTime  string `json:"avg_processing_time"`
+	Code                string            `json:"code"`
+	Network             string            `json:"network"`
+	NetworkName         string            `json:"network_name"`
+	IsEnsAvailable      bool              `json:"is_ens_available"`
+	Protocol            string            `json:"protocol"`
+	Default             bool              `json:"default"`
+	PayinEnabled        bool              `json:"payin_enabled"`
+	PayoutEnabled       bool              `json:"payout_enabled"`
+	PrecisionPayout     string            `json:"presicion_payout"`
+	PayoutFee           string            `json:"payout_fee"`
+	PayoutIsPaymentID   bool              `json:"payout_is_payment_id"`
+	PayinPaymentID      bool              `json:"payin_payment_id"`
+	PayinConfirmations  int               `json:"payin_confirmation"`
+	AddressRegex        string            `json:"address_confirmation"`
+	PaymentIDRegex      string            `json:"payment_id_regex"`
+	LowProcessingTime   string            `json:"low_processing_time"`
+	HighProcessingTime  string            `json:"high_processing_time"`
+	AvgProcessingTime   string            `json:"avg_processing_time"`
+	CryptoPaymentIdName string            `json:"crypto_payment_id_name"`
+	CryptoExplorer      string            `json:"crypto_explorer"`
+	ContractAddress     string            `json:"contract_address"`
+	IsMultiChain        bool              `json:"is_multichain"`
+	AssetId             map[string]string `json:"asset_id"`
 }
 
 // Balance is the amount of currency a user have
@@ -172,14 +181,16 @@ type Trade struct {
 // Transaction is a movement of currency,
 // not in the market, but related on the exchange
 type Transaction struct {
-	ID        int64                       `json:"id"`
-	Status    args.TransactionStatusType  `json:"status"`
-	Type      args.TransactionTypeType    `json:"type"`
-	SubType   args.TransactionSubTypeType `json:"subtype"`
-	CreatedAt string                      `json:"created_at"`
-	UpdatedAt string                      `json:"updated_at"`
-	Native    NativeTransaction           `json:"native"`
-	Meta      MetaTransaction             `json:"meta"`
+	ID             int64                       `json:"id"`
+	Status         args.TransactionStatusType  `json:"status"`
+	Type           args.TransactionTypeType    `json:"type"`
+	SubType        args.TransactionSubTypeType `json:"subtype"`
+	CreatedAt      string                      `json:"created_at"`
+	UpdatedAt      string                      `json:"updated_at"`
+	LastActivityAt string                      `json:"last_activity_at"`
+	Native         NativeTransaction           `json:"native"`
+	Meta           MetaTransaction             `json:"meta"`
+	CommitRisk     CommitRisk                  `json:"commit_risk"`
 }
 
 type NativeTransaction struct {
@@ -217,6 +228,12 @@ type MetaTransaction struct {
 	PaymentMethodType string                         `json:"payment_method_type"`
 }
 
+type CommitRisk struct {
+	Score  int  `json:"score"`
+	Rbf    bool `json:"rbf"`
+	LowFee bool `json:"low_fee"`
+}
+
 // CryptoAddress is an crypto address
 type CryptoAddress struct {
 	Currency    string `json:"currency"`

rest/change_credentials_test.go

@@ -0,0 +1,27 @@
+package rest
+
+import (
+	"testing"
+)
+
+func TestChangeCredentials(t *testing.T) {
+	client, bg := beforeEach()
+	result, err := client.GetWalletBallances(bg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(result) == 0 {
+		t.Fatal("should have results")
+	}
+	if err = checkList(checkBalance, result); err != nil {
+		t.Fatal(err)
+	}
+	client.ChangeCredentials("", "")
+	result, err = client.GetWalletBallances(bg)
+	if err == nil {
+		t.Fatal(err)
+	}
+	if len(result) != 0 {
+		t.Fatal(err)
+	}
+}

rest/change_window_test.go

@@ -0,0 +1,27 @@
+package rest
+
+import (
+	"testing"
+)
+
+func TestChangeWindow(t *testing.T) {
+	client, bg := beforeEach()
+	result, err := client.GetWalletBallances(bg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(result) == 0 {
+		t.Fatal("should have results")
+	}
+	if err = checkList(checkBalance, result); err != nil {
+		t.Fatal(err)
+	}
+	client.ChangeWindow(100)
+	result, err = client.GetWalletBallances(bg)
+	if err == nil {
+		t.Fatal(err)
+	}
+	if len(result) != 0 {
+		t.Fatal(err)
+	}
+}