Skip to content

Commit

Permalink
modify token name
Browse files Browse the repository at this point in the history
  • Loading branch information
@Musiczombie
Musiczombie committed Feb 6, 2020
1 parent 6507af3 commit d4a708c
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 75 deletions.
32 changes: 16 additions & 16 deletions statis/statis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,12 @@ func (a *analysis) getFeeData() {
for _, fee := range fees.ObjectFees {
switch fee.ObjectType {
case 0:
if idx := strings.Index(fee.ObjectName, ":"); idx <= 0 {
name := getFullName(fee.ObjectName)
if name != "" {
fee.ObjectName = name
}
}
//if idx := strings.Index(fee.ObjectName, ":"); idx <= 0 {
// name := getFullName(fee.ObjectName)
// if name != "" {
// fee.ObjectName = name
// }
//}
// if strings.Compare(fee.ObjectName, "libra") == 0 || strings.Compare(fee.ObjectName, "bitcoin") == 0 {
// fee.ObjectName = getFullName(fee.ObjectName)
// }
Expand Down Expand Up @@ -606,12 +606,12 @@ func (a *analysis) analysisAccount(action *types.RPCAction) {
}

assetName := asset.AssetName
if idx := strings.Index(asset.AssetName, ":"); idx <= 0 {
if len(action.From.String()) > 0 {
assetName = action.From.String() + ":" + asset.AssetName
tokenShortName[asset.AssetName] = assetName
}
}
//if idx := strings.Index(asset.AssetName, ":"); idx <= 0 {
// if len(action.From.String()) > 0 {
// assetName = action.From.String() + ":" + asset.AssetName
// tokenShortName[asset.AssetName] = assetName
// }
//}
db.InsertTokenInfo(assetName, assetInfo.Decimals, assetInfo.AssetId, asset.AssetName)
tokenAssetIDName[assetInfo.AssetId] = assetName

Expand Down Expand Up @@ -649,7 +649,7 @@ func (a *analysis) getTokenName(assetId uint64) string {
return data
}

func getFullName(shortName string) string {
name, _ := tokenShortName[shortName]
return name
}
//func getFullName(shortName string) string {
// name, _ := tokenShortName[shortName]
// return name
//}
10 changes: 5 additions & 5 deletions task/action.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ func (a *ActionTask) analysisAction(data *types.BlockAndResult, dbTx *sql.Tx) er
if actionResult.Status == types.ReceiptStatusSuccessful {
if action.Type == types.IssueAsset {
issueAssetPayload := parsedPayload.(types.IssueAssetObject)
if idx := strings.Index(issueAssetPayload.AssetName, ":"); idx <= 0 {
if len(action.From.String()) > 0 {
issueAssetPayload.AssetName = action.From.String() + ":" + issueAssetPayload.AssetName
}
}
//if idx := strings.Index(issueAssetPayload.AssetName, ":"); idx <= 0 {
// if len(action.From.String()) > 0 {
// issueAssetPayload.AssetName = action.From.String() + ":" + issueAssetPayload.AssetName
// }
//}
parsedPayload = issueAssetPayload
}
}
Expand Down
71 changes: 35 additions & 36 deletions task/fee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ package task

import (
"database/sql"
"github.com/browser/client"
"github.com/browser/db"
. "github.com/browser/log"
"github.com/browser/types"
"go.uber.org/zap"
"math/big"
"strings"
)

type FeeTask struct {
Expand All @@ -18,20 +16,20 @@ type FeeTask struct {
nodeTokens map[string]string
}

func (f *FeeTask) getTokenName(dbTx *sql.Tx, name string) (string, error) {
if tokenName, ok := f.nodeTokens[name]; ok {
return tokenName, nil
} else {
asset, err := client.GetAssetInfoByName(name)
if err != nil {
ZapLog.Error("GetAssetInfoByName error", zap.Error(err), zap.String("name", name))
return "", err
}
dbToken := db.QueryTokenById(dbTx, asset.AssetId)
f.nodeTokens[name] = dbToken.AssetName
return dbToken.AssetName, nil
}
}
//func (f *FeeTask) getTokenName(dbTx *sql.Tx, name string) (string, error) {
// if tokenName, ok := f.nodeTokens[name]; ok {
// return tokenName, nil
// } else {
// asset, err := client.GetAssetInfoByName(name)
// if err != nil {
// ZapLog.Error("GetAssetInfoByName error", zap.Error(err), zap.String("name", name))
// return "", err
// }
// dbToken := db.QueryTokenById(dbTx, asset.AssetId)
// f.nodeTokens[name] = dbToken.AssetName
// return dbToken.AssetName, nil
// }
//}

func (f *FeeTask) analysisFeeAction(data *types.BlockAndResult, dbTx *sql.Tx) error {
receipts := data.Receipts
Expand All @@ -42,21 +40,21 @@ func (f *FeeTask) analysisFeeAction(data *types.BlockAndResult, dbTx *sql.Tx) er
gasPrice := big.NewInt(0).Set(tx.GasPrice)
for j, aRs := range receipt.ActionResults {
at := tx.RPCActions[j]
if at.Type == types.IssueAsset && aRs.Status == types.ReceiptStatusSuccessful {
iActionAsset, err := parsePayload(at)
if err != nil {
ZapLog.Error("parsePayload error: ", zap.Error(err))
return err
}
obj := iActionAsset.(types.IssueAssetObject)
tokenName := obj.AssetName
if idx := strings.Index(obj.AssetName, ":"); idx <= 0 {
if len(at.From.String()) > 0 {
tokenName = at.From.String() + ":" + obj.AssetName
}
}
f.nodeTokens[obj.AssetName] = tokenName
}
//if at.Type == types.IssueAsset && aRs.Status == types.ReceiptStatusSuccessful {
// iActionAsset, err := parsePayload(at)
// if err != nil {
// ZapLog.Error("parsePayload error: ", zap.Error(err))
// return err
// }
// obj := iActionAsset.(types.IssueAssetObject)
// tokenName := obj.AssetName
// if idx := strings.Index(obj.AssetName, ":"); idx <= 0 {
// if len(at.From.String()) > 0 {
// tokenName = at.From.String() + ":" + obj.AssetName
// }
// }
// f.nodeTokens[obj.AssetName] = tokenName
//}
feeFrom := at.From.String()
for k, aR := range aRs.GasAllot {
if tx.GasPrice.Cmp(bigZero) == 0 {
Expand All @@ -80,11 +78,12 @@ func (f *FeeTask) analysisFeeAction(data *types.BlockAndResult, dbTx *sql.Tx) er
Reason: aR.Reason,
}
if aR.Reason == 0 {
assetName, err := f.getTokenName(dbTx, aR.Account.String())
if err != nil {
return err
}
mFee.To = assetName
//assetName, err := f.getTokenName(dbTx, aR.Account.String())
//if err != nil {
// return err
//}
//mFee.To = assetName
mFee.To = aR.Account.String()
}
err := db.InsertFee(mFee, dbTx)
if err != nil {
Expand Down
12 changes: 5 additions & 7 deletions task/internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
"bytes"
"database/sql"
"encoding/json"
"strings"

"github.com/browser/db"
. "github.com/browser/log"
"github.com/browser/types"
Expand Down Expand Up @@ -73,11 +71,11 @@ func (i *InternalTask) analysisInternalAction(data *types.BlockAndResult, dbTx *
if iState == types.ReceiptStatusSuccessful {
if ia.Action.Type == types.IssueAsset {
issueAssetPayload := parsedPayload.(types.IssueAssetObject)
if idx := strings.Index(issueAssetPayload.AssetName, ":"); idx <= 0 {
if len(ia.Action.From.String()) > 0 {
issueAssetPayload.AssetName = ia.Action.From.String() + ":" + issueAssetPayload.AssetName
}
}
//if idx := strings.Index(issueAssetPayload.AssetName, ":"); idx <= 0 {
// if len(ia.Action.From.String()) > 0 {
// issueAssetPayload.AssetName = ia.Action.From.String() + ":" + issueAssetPayload.AssetName
// }
//}
parsedPayload = issueAssetPayload
}
}
Expand Down
21 changes: 10 additions & 11 deletions task/token.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/browser/types"
"go.uber.org/zap"
"math/big"
"strings"
)

type TokenTask struct {
Expand Down Expand Up @@ -152,11 +151,11 @@ func saveToken(tx *sql.Tx, action *types.RPCAction, blockTime uint64, height uin
if action.Type == types.IssueAsset {
obj := iActionAsset.(types.IssueAssetObject)
tokenName := obj.AssetName
if idx := strings.Index(obj.AssetName, ":"); idx <= 0 {
if len(action.From.String()) > 0 {
tokenName = action.From.String() + ":" + obj.AssetName
}
}
//if idx := strings.Index(obj.AssetName, ":"); idx <= 0 {
// if len(action.From.String()) > 0 {
// tokenName = action.From.String() + ":" + obj.AssetName
// }
//}
tokenInfo, err := client.GetAssetInfoByName(obj.AssetName)
if err != nil || tokenInfo == nil {
ZapLog.Panic("get asset info by name error", zap.Error(err), zap.String("assetName", obj.AssetName))
Expand Down Expand Up @@ -237,11 +236,11 @@ func rollbackToken(tx *sql.Tx, action *types.RPCAction, blockTime uint64, height
if action.Type == types.IssueAsset {
obj := iActionAsset.(types.IssueAssetObject)
tokenName := obj.AssetName
if idx := strings.Index(obj.AssetName, ":"); idx <= 0 {
if len(action.From.String()) > 0 {
tokenName = action.From.String() + ":" + obj.AssetName
}
}
//if idx := strings.Index(obj.AssetName, ":"); idx <= 0 {
// if len(action.From.String()) > 0 {
// tokenName = action.From.String() + ":" + obj.AssetName
// }
//}
db.DeleteTokenByName(tx, tokenName)
} else if action.Type == types.IncreaseAsset {
obj := iActionAsset.(types.IncAssetObject)
Expand Down

0 comments on commit d4a708c

Please sign in to comment.