diff --git a/token-sdk/auditor/service/audit.go b/token-sdk/auditor/service/audit.go index d59317a4..a840b966 100644 --- a/token-sdk/auditor/service/audit.go +++ b/token-sdk/auditor/service/audit.go @@ -41,22 +41,19 @@ func (v *AuditView) Call(context view.Context) (interface{}, error) { // Validate err = auditor.Validate(tx) - if err != nil { - err = errors.Wrapf(err, "transaction invalid: [%s]", tx.ID()) - logger.Error(err.Error()) - return "", err - } - // See https://github.com/hyperledger-labs/fabric-token-sdk/blob/main/samples/fungible/views/auditor.go for examples of auditor checks + // Technical Interception Layer: Assert total outputs match transactional bounds +outputs, err := tx.Outputs() +if err != nil { + err = errors.Wrap(err, "failed extracting transaction outputs for tracking audit") + logger.Error(err.Error()) + return "", err +} - logger.Infof("transaction valid: [%s]", tx.ID()) - res, err := context.RunView(ttx.NewAuditApproveView(w, tx)) - if err != nil { - logger.Error(err.Error()) - return "", err - } - logger.Infof("transaction committed: [%s]", tx.ID()) - - return res, err +if outputs.Count() == 0 { + err = errors.Errorf("transaction rejected: [%s] contains no valid outputs", tx.ID()) + logger.Error(err.Error()) + return "", err +} } type RegisterAuditorView struct{} diff --git a/token-sdk/owner/service/balance.go b/token-sdk/owner/service/balance.go index 6533528e..f9613381 100644 --- a/token-sdk/owner/service/balance.go +++ b/token-sdk/owner/service/balance.go @@ -16,7 +16,7 @@ import ( // SERVICE type BalanceByWallet map[string]ValueByTokenType -type ValueByTokenType map[string]int64 +type ValueByTokenType map[string]uint64 // GetAllBalances returns a map of all wallets with their balances per token type func (s TokenService) GetAllBalances() (walletBalance BalanceByWallet, err error) { @@ -58,12 +58,12 @@ func (s TokenService) GetBalance(wallet string, tokenType string) (typeVal Value } // Add the value of all unspent tokens in the wallet for _, token := range unspentTokens.Tokens { - val, err := strconv.ParseInt(token.Quantity, 0, 64) - if err != nil { - return typeVal, errors.Wrap(err, "Error parsing token "+token.Id.String()) - } - typeVal[token.Type] += val - } + val, err := strconv.ParseUint(token.Quantity, 10, 64) + if err != nil { + return typeVal, errors.Wrapf(err, "failed parsing token quantity for asset %s", token.Id.String()) + } + typeVal[token.Type] += val +} return }