fix the regular sync dust block problem (#400)

[bytom/vapor.git] / api / query.go

diff --git a/api/query.go b/api/query.go
index abbda52..fba82b8 100644 (file)
--- a/api/query.go
+++ b/api/query.go
@@ -11,7 +11,7 @@ import (
        "github.com/vapor/asset"
        "github.com/vapor/blockchain/query"
        "github.com/vapor/blockchain/signers"
-       "github.com/vapor/blockchain/txbuilder"
+       "github.com/vapor/common/arithmetic"
        "github.com/vapor/consensus"
        "github.com/vapor/crypto/ed25519"
        "github.com/vapor/crypto/ed25519/chainkd"
@@ -279,12 +279,11 @@ func (a *API) decodeRawTransaction(ctx context.Context, ins struct {
                tx.Outputs = append(tx.Outputs, a.wallet.BuildAnnotatedOutput(&ins.Tx, i))
        }
 
-       tx.Fee = txbuilder.CalculateTxFee(&ins.Tx)
+       tx.Fee, _ = arithmetic.CalculateTxFee(&ins.Tx)
        return NewSuccessResponse(tx)
 }
 
-// POST /list-unspent-outputs
-func (a *API) listUnspentOutputs(ctx context.Context, filter struct {
+type ListUtxosReq struct {
        AccountID     string `json:"account_id"`
        AccountAlias  string `json:"account_alias"`
        ID            string `json:"id"`
@@ -292,7 +291,10 @@ func (a *API) listUnspentOutputs(ctx context.Context, filter struct {
        SmartContract bool   `json:"smart_contract"`
        From          uint   `json:"from"`
        Count         uint   `json:"count"`
-}) Response {
+}
+
+// POST /list-unspent-outputs
+func (a *API) listUnspentOutputs(ctx context.Context, filter ListUtxosReq) Response {
        accountID := filter.AccountID
        if filter.AccountAlias != "" {
                acc, err := a.wallet.AccountMgr.FindByAlias(filter.AccountAlias)
@@ -327,7 +329,7 @@ func (a *API) listUnspentOutputs(ctx context.Context, filter struct {
 
 // return gasRate
 func (a *API) gasRate() Response {
-       gasrate := map[string]int64{"gas_rate": consensus.VMGasRate}
+       gasrate := map[string]int64{"gas_rate": consensus.ActiveNetParams.VMGasRate}
        return NewSuccessResponse(gasrate)
 }