Rename RewardAddresses to ValidationRewardsOwners (#240)

ava-labs · Feb 26, 2024 · 5ec3965 · 5ec3965
1 parent 3fad5f7
commit 5ec3965
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/mapper/pchain/tx_builder.go b/mapper/pchain/tx_builder.go
@@ -136,7 +136,7 @@ func buildAddValidatorTx(
 	}
 
 	rewardsOwner, err := buildOutputOwner(
-		metadata.RewardAddresses,
+		metadata.ValidationRewardsOwners,
 		metadata.Locktime,
 		metadata.Threshold,
 	)
@@ -203,7 +203,12 @@ func buildAddDelegatorTx(
 	if err != nil {
 		return nil, nil, err
 	}
-	rewardsOwner, err := buildOutputOwner(metadata.RewardAddresses, metadata.Locktime, metadata.Threshold)
+
+	rewardsOwner, err := buildOutputOwner(
+		metadata.ValidationRewardsOwners,
+		metadata.Locktime,
+		metadata.Threshold,
+	)
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/mapper/pchain/types.go b/mapper/pchain/types.go
@@ -112,12 +112,12 @@ type ExportMetadata struct {
 
 // StakingMetadata contain response fields returned by /construction/metadata for P-chain AddValidator/AddDelegator transactions
 type StakingMetadata struct {
-	NodeID          string   `json:"node_id"`
-	RewardAddresses []string `json:"reward_addresses"`
-	Start           uint64   `json:"start"`
-	End             uint64   `json:"end"`
-	Shares          uint32   `json:"shares"`
-	Locktime        uint64   `json:"locktime"`
-	Threshold       uint32   `json:"threshold"`
-	Memo            string   `json:"memo"`
+	NodeID                  string   `json:"node_id"`
+	ValidationRewardsOwners []string `json:"reward_addresses"`
+	Start                   uint64   `json:"start"`
+	End                     uint64   `json:"end"`
+	Shares                  uint32   `json:"shares"`
+	Locktime                uint64   `json:"locktime"`
+	Threshold               uint32   `json:"threshold"`
+	Memo                    string   `json:"memo"`
 }
diff --git a/service/backend/pchain/construction.go b/service/backend/pchain/construction.go
@@ -156,20 +156,20 @@ func buildStakingMetadata(options map[string]interface{}) (*pmapper.Metadata, *t
 		return nil, nil, err
 	}
 
-	stakingMetadata := &pmapper.StakingMetadata{
-		NodeID:          preprocessOptions.NodeID,
-		Start:           preprocessOptions.Start,
-		End:             preprocessOptions.End,
-		Memo:            preprocessOptions.Memo,
-		Locktime:        preprocessOptions.Locktime,
-		Threshold:       preprocessOptions.Threshold,
-		RewardAddresses: preprocessOptions.RewardAddresses,
-		Shares:          preprocessOptions.Shares,
-	}
-
 	zeroAvax := mapper.AtomicAvaxAmount(big.NewInt(0))
 
-	return &pmapper.Metadata{StakingMetadata: stakingMetadata}, zeroAvax, nil
+	return &pmapper.Metadata{
+		StakingMetadata: &pmapper.StakingMetadata{
+			NodeID:                  preprocessOptions.NodeID,
+			Start:                   preprocessOptions.Start,
+			End:                     preprocessOptions.End,
+			Memo:                    preprocessOptions.Memo,
+			Locktime:                preprocessOptions.Locktime,
+			Threshold:               preprocessOptions.Threshold,
+			ValidationRewardsOwners: preprocessOptions.RewardAddresses,
+			Shares:                  preprocessOptions.Shares,
+		},
+	}, zeroAvax, nil
 }
 
 func (b *Backend) getBaseTxFee(ctx context.Context) (*types.Amount, error) {