v1.6.7

Author: bergjefferson

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.7 - 2023-11-17
+### Updated 
+- Imporve stardard withdrawal
+
 ## 1.6.6 - 2023-10-25
 ### Updated 
 - RoundCeil for sell price, roundFloor for buy price 

cmd/test/account_client_test.go

@@ -282,3 +282,16 @@ func TestGetOpenOrders(t *testing.T) {
 		t.Logf("%v", lib.String(r))
 	}
 }
+
+func TestGetEstimatedWithdrawalGasFees(t *testing.T) {
+	client := new(spot.Client)
+	client.SetAppConfig(appConfig)
+	response, err := client.GetEstimatedWithdrawalGasFee(appConfig.AccountAddress, 0)
+	if err != nil {
+		t.Errorf("%v", err)
+	} else if response.Success() {
+		t.Logf("%v", lib.String(response.Data))
+	} else {
+		t.Logf("%v", lib.String(response))
+	}
+}

degate/binance/common.go

@@ -40,15 +40,16 @@ type GasFeeResponse struct {
 }
 
 type OffChainFee struct {
-	UpdateAccountGasFees      []*GasFee `json:"update_account_gas_fees"`
-	WithdrawalGasFees         []*GasFee `json:"withdrawal_gas_fees"`
-	TransferGasFees           []*GasFee `json:"transfer_gas_fees"`
-	TransferNoIDGasFees       []*GasFee `json:"transfer_no_id_gas_fees"`
-	OrderGasFees              []*GasFee `json:"order_gas_fees"`
-	AddPairGasFees            []*GasFee `json:"add_pair_gas_fees"`
-	MiningGasFees             []*GasFee `json:"mining_gas_fees"`
-	OnChainCancelOrderGasFees []*GasFee `json:"on_chain_cancel_order_gas_fees"`
-	OrderGasMultiple          uint32    `json:"order_gas_multiple"`
+	UpdateAccountGasFees       []*GasFee `json:"update_account_gas_fees"`
+	WithdrawalGasFees          []*GasFee `json:"withdrawal_gas_fees"`
+	EstimatedWithdrawalGasFees []*GasFee `json:"estimated_withdrawal_gas_fees"`
+	TransferGasFees            []*GasFee `json:"transfer_gas_fees"`
+	TransferNoIDGasFees        []*GasFee `json:"transfer_no_id_gas_fees"`
+	OrderGasFees               []*GasFee `json:"order_gas_fees"`
+	AddPairGasFees             []*GasFee `json:"add_pair_gas_fees"`
+	MiningGasFees              []*GasFee `json:"mining_gas_fees"`
+	OnChainCancelOrderGasFees  []*GasFee `json:"on_chain_cancel_order_gas_fees"`
+	OrderGasMultiple           uint32    `json:"order_gas_multiple"`
 }
 
 type GasFee struct {

degate/lib/convert.go

@@ -876,6 +876,8 @@ func ConvertGasFees(fees *model.GasFees, tokens []*model.TokenInfo) (offChainFee
 
 	offChainFee.WithdrawalGasFees, err = ConvertGasFee(fees.WithdrawalGasFees, tokens)
 
+	offChainFee.EstimatedWithdrawalGasFees, err = ConvertGasFee(fees.EstimatedWithdrawalGasFees, tokens)
+
 	offChainFee.TransferGasFees, err = ConvertGasFee(fees.TransferGasFees, tokens)
 
 	offChainFee.TransferNoIDGasFees, err = ConvertGasFee(fees.TransferNoIDGasFees, tokens)

degate/model/param.go

@@ -135,3 +135,8 @@ type Token struct {
 type DGPairPriceParam struct {
 	Pairs string `json:"pairs"`
 }
+
+type WithdrawalGasParam struct {
+	To      string `json:"to" form:"to" `            // account address
+	TokenId uint64 `json:"token_id" form:"token_id"` // token id
+}

degate/model/user.go

@@ -118,20 +118,21 @@ type OffChainFee struct {
 }
 
 type GasFees struct {
-	UpdateAccountGasFees      *GasFee `json:"update_account_gas_fees"`
-	WithdrawalGasFees         *GasFee `json:"withdrawal_gas_fees"`
-	TransferGasFees           *GasFee `json:"transfer_gas_fees"`
-	TransferNoIDGasFees       *GasFee `json:"transfer_no_id_gas_fees"`
-	OrderGasFees              *GasFee `json:"order_gas_fees"`
-	AddPairGasFees            *GasFee `json:"add_pair_gas_fees"`
-	MiningGasFees             *GasFee `json:"mining_gas_fees"`
-	OnChainCancelOrderGasFees *GasFee `json:"on_chain_cancel_order_gas_fees"`
-	DepositFeeConfirmGasFees  *GasFee `json:"deposit_fee_confirm_gas_fees"`
-	EthPrice                  string  `json:"eth_price"`
-	GasPrice                  string  `json:"gas_price"`
-	PriorityFee               string  `json:"priority_fee"`
-	EnclaveAddress            string  `json:"enclave_address"`
-	CreateTime                int64   `json:"create_time"`
+	UpdateAccountGasFees       *GasFee `json:"update_account_gas_fees"`
+	WithdrawalGasFees          *GasFee `json:"withdrawal_gas_fees"`
+	EstimatedWithdrawalGasFees *GasFee `json:"estimated_withdrawal_gas_fees"`
+	TransferGasFees            *GasFee `json:"transfer_gas_fees"`
+	TransferNoIDGasFees        *GasFee `json:"transfer_no_id_gas_fees"`
+	OrderGasFees               *GasFee `json:"order_gas_fees"`
+	AddPairGasFees             *GasFee `json:"add_pair_gas_fees"`
+	MiningGasFees              *GasFee `json:"mining_gas_fees"`
+	OnChainCancelOrderGasFees  *GasFee `json:"on_chain_cancel_order_gas_fees"`
+	DepositFeeConfirmGasFees   *GasFee `json:"deposit_fee_confirm_gas_fees"`
+	EthPrice                   string  `json:"eth_price"`
+	GasPrice                   string  `json:"gas_price"`
+	PriorityFee                string  `json:"priority_fee"`
+	EnclaveAddress             string  `json:"enclave_address"`
+	CreateTime                 int64   `json:"create_time"`
 }
 
 func (g *GasFees) GetTokenIds() (ids map[uint64]uint64) {
@@ -146,6 +147,11 @@ func (g *GasFees) GetTokenIds() (ids map[uint64]uint64) {
 			ids[token.TokenID] = token.TokenID
 		}
 	}
+	if g.EstimatedWithdrawalGasFees != nil {
+		for _, token := range g.EstimatedWithdrawalGasFees.Tokens {
+			ids[token.TokenID] = token.TokenID
+		}
+	}
 	if g.TransferGasFees != nil {
 		for _, token := range g.TransferGasFees.Tokens {
 			ids[token.TokenID] = token.TokenID

degate/spot/account_client.go

@@ -595,7 +595,8 @@ func (c *Client) Withdraw(param *model.WithdrawParam) (response *binance.Withdra
 	}
 	volume = quantity.String()
 
-	gasResponse, err := c.GetGasFee()
+	//获取 gas fee
+	gasResponse, err := c.GetEstimatedWithdrawalGasFee(param.Address, tokenData.TokenID)
 	if err != nil {
 		return
 	}
@@ -604,7 +605,7 @@ func (c *Client) Withdraw(param *model.WithdrawParam) (response *binance.Withdra
 		return
 	}
 
-	gasFees = gasResponse.Data.WithdrawalGasFees
+	gasFees = gasResponse.Data.EstimatedWithdrawalGasFees
 
 	if len(gasFees) == 0 {
 		err = fmt.Errorf("not find gas fee token")

degate/spot/exchange_client.go

@@ -3,9 +3,10 @@ package spot
 import (
 	"errors"
 	"fmt"
+	"strconv"
+
 	"github.com/degatedev/degate-sdk-golang/conf"
 	"github.com/degatedev/degate-sdk-golang/degate/request"
-	"strconv"
 
 	"github.com/degatedev/degate-sdk-golang/degate/binance"
 	"github.com/degatedev/degate-sdk-golang/degate/lib"
@@ -66,6 +67,55 @@ func (c *Client) GetGasFee() (response *binance.GasFeeResponse, err error) {
 	return
 }
 
+func (c *Client) GetEstimatedWithdrawalGasFee(toAddr string, tokenId uint64) (response *binance.GasFeeResponse, err error) {
+	header, err := c.GetHeaderSign()
+	if err != nil {
+		return
+	}
+
+	r := &model.WithdrawalGasParam{
+		To:      toAddr,
+		TokenId: tokenId,
+	}
+
+	res := &model.GasFeeResponse{}
+	err = c.Get("user/getEstimatedWithdrawalGas", header, r, res)
+	if err != nil {
+		return
+	}
+	response = &binance.GasFeeResponse{}
+	if err = model.Copy(response, &res.Response); err != nil {
+		return
+	}
+	if res.Success() && res.Data != nil {
+		var tokensInfo []*model.TokenInfo
+		ids := res.Data.GetTokenIds()
+		if len(ids) > 0 {
+			var (
+				idString string
+				tokenRes *model.TokensResponse
+			)
+			for id := range ids {
+				idString += strconv.Itoa(int(id)) + ","
+			}
+			idString = idString[0 : len(idString)-1]
+			tokenRes, err = c.TokenList(&model.TokenListParam{
+				Ids: idString,
+			})
+			if err != nil {
+				return
+			}
+			if !tokenRes.Success() || len(tokenRes.Data) == 0 {
+				err = errors.New("not find tokens")
+				return
+			}
+			tokensInfo = tokenRes.Data
+		}
+		response.Data, _ = lib.ConvertGasFees(res.Data, tokensInfo)
+	}
+	return
+}
+
 func (c *Client) GetTradeFee(param *model.TradeFeeParam) (response *binance.TradeFeeResponse, err error) {
 	res := &model.TradeFeeResponse{}
 	token := conf.Conf.GetTokenInfo(param.Symbol)