totalUnits fees.Add

ava-labs · Apr 25, 2024 · d4fa834 · d4fa834
1 parent a9693dd
commit d4fa834
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/chain/transaction.go b/chain/transaction.go
@@ -454,7 +454,6 @@ func (t *Transaction) marshalActions(p *codec.Packer) error {
 func unmarshalActions(
 	p *codec.Packer,
 	actionRegistry *codec.TypeParser[Action, bool],
-	authRegistry *codec.TypeParser[Auth, bool],
 ) ([]Action, error) {
 	actionCount := p.UnpackInt(true)
 	actions := make([]Action, 0)
@@ -523,7 +522,7 @@ func UnmarshalTx(
 	if err != nil {
 		return nil, fmt.Errorf("%w: could not unmarshal base", err)
 	}
-	actions, err := unmarshalActions(p, actionRegistry, authRegistry)
+	actions, err := unmarshalActions(p, actionRegistry)
 	if err != nil {
 		return nil, fmt.Errorf("%w: could not unmarshal actions", err)
 	}

diff --git a/rpc/jsonrpc_client.go b/rpc/jsonrpc_client.go
@@ -132,16 +132,17 @@ func (cli *JSONRPCClient) GenerateTransaction(
 		return nil, nil, 0, err
 	}
 
-	var totalUnits fees.Dimensions
+	totalUnits := fees.Dimensions{}
 	for _, action := range actions {
 		maxUnits, err := chain.EstimateMaxUnits(parser.Rules(time.Now().UnixMilli()), action, authFactory)
 		if err != nil {
 			return nil, nil, 0, err
 		}
-		totalUnits, err = fees.Add(totalUnits, maxUnits)
+		nTotalUnits, err := fees.Add(totalUnits, maxUnits)
 		if err != nil {
 			return nil, nil, 0, err
 		}
+		totalUnits = nTotalUnits
 	}
 	maxFee, err := fees.MulSum(unitPrices, totalUnits)
 	if err != nil {