Change all amount-related fields from bytes to decimal string in protobuf (iotexproject#628)

Author: lizhefeng

action/action.go

@@ -113,7 +113,7 @@ func (elp *Envelope) Proto() *iotextypes.ActionCore {
 		GasLimit: elp.gasLimit,
 	}
 	if elp.gasPrice != nil {
-		actCore.GasPrice = elp.gasPrice.Bytes()
+		actCore.GasPrice = elp.gasPrice.String()
 	}
 
 	// TODO assert each action
@@ -164,7 +164,7 @@ func (elp *Envelope) LoadProto(pbAct *iotextypes.ActionCore) error {
 	elp.nonce = pbAct.GetNonce()
 	elp.gasLimit = pbAct.GetGasLimit()
 	elp.gasPrice = &big.Int{}
-	elp.gasPrice.SetBytes(pbAct.GetGasPrice())
+	elp.gasPrice.SetString(pbAct.GetGasPrice(), 10)
 
 	switch {
 	case pbAct.GetTransfer() != nil:

action/claimreward.go

@@ -44,15 +44,19 @@ func (c *ClaimFromRewardingFund) ByteStream() []byte {
 // Proto converts a claim action struct to a claim action protobuf
 func (c *ClaimFromRewardingFund) Proto() *iotextypes.ClaimFromRewardingFund {
 	return &iotextypes.ClaimFromRewardingFund{
-		Amount: c.amount.Bytes(),
+		Amount: c.amount.String(),
 		Data:   c.data,
 	}
 }
 
 // LoadProto converts a claim action protobuf to a claim action struct
 func (c *ClaimFromRewardingFund) LoadProto(claim *iotextypes.ClaimFromRewardingFund) error {
 	*c = ClaimFromRewardingFund{}
-	c.amount = big.NewInt(0).SetBytes(claim.Amount)
+	amount, ok := big.NewInt(0).SetString(claim.Amount, 10)
+	if !ok {
+		errors.New("failed to set claim amount")
+	}
+	c.amount = amount
 	c.data = claim.Data
 	return nil
 }

action/createdeposit.go

@@ -83,8 +83,8 @@ func (d *CreateDeposit) Proto() *iotextypes.CreateDeposit {
 		ChainID:   d.chainID,
 		Recipient: d.recipient,
 	}
-	if d.amount != nil && len(d.amount.Bytes()) > 0 {
-		act.Amount = d.amount.Bytes()
+	if d.amount != nil && len(d.amount.String()) > 0 {
+		act.Amount = d.amount.String()
 	}
 	return act
 }
@@ -102,7 +102,7 @@ func (d *CreateDeposit) LoadProto(pbDpst *iotextypes.CreateDeposit) error {
 
 	d.chainID = pbDpst.GetChainID()
 	d.amount = big.NewInt(0)
-	d.amount.SetBytes(pbDpst.GetAmount())
+	d.amount.SetString(pbDpst.GetAmount(), 10)
 	d.recipient = pbDpst.GetRecipient()
 	return nil
 }

action/depositreward.go

@@ -44,15 +44,19 @@ func (d *DepositToRewardingFund) ByteStream() []byte {
 // Proto converts a deposit action struct to a deposit action protobuf
 func (d *DepositToRewardingFund) Proto() *iotextypes.DepositToRewardingFund {
 	return &iotextypes.DepositToRewardingFund{
-		Amount: d.amount.Bytes(),
+		Amount: d.amount.String(),
 		Data:   d.data,
 	}
 }
 
 // LoadProto converts a deposit action protobuf to a deposit action struct
 func (d *DepositToRewardingFund) LoadProto(deposit *iotextypes.DepositToRewardingFund) error {
 	*d = DepositToRewardingFund{}
-	d.amount = big.NewInt(0).SetBytes(deposit.Amount)
+	amount, ok := big.NewInt(0).SetString(deposit.Amount, 10)
+	if !ok {
+		return errors.New("failed to set deposit amount")
+	}
+	d.amount = amount
 	d.data = deposit.Data
 	return nil
 }

action/execution.go

@@ -99,8 +99,8 @@ func (ex *Execution) Proto() *iotextypes.Execution {
 		Contract: ex.contract,
 		Data:     ex.data,
 	}
-	if ex.amount != nil && len(ex.amount.Bytes()) > 0 {
-		act.Amount = ex.amount.Bytes()
+	if ex.amount != nil && len(ex.amount.String()) > 0 {
+		act.Amount = ex.amount.String()
 	}
 	return act
 }
@@ -117,7 +117,7 @@ func (ex *Execution) LoadProto(pbAct *iotextypes.Execution) error {
 
 	ex.contract = pbAct.GetContract()
 	ex.amount = &big.Int{}
-	ex.amount.SetBytes(pbAct.GetAmount())
+	ex.amount.SetString(pbAct.GetAmount(), 10)
 	ex.data = pbAct.GetData()
 	return nil
 }

action/protocol/account/accountpb/account.pb.go

@@ -12,7 +12,7 @@ package accountpb;
 message Account {
     // used by state-based model
     uint64 nonce  = 1;
-    bytes balance  = 2;
+    string balance  = 2;
     bytes root  = 3;
     bytes codeHash  = 4;
     bool isCandidate = 5;

action/protocol/account/accountpb/account.proto

@@ -43,10 +43,10 @@ func (bs SubChain) Serialize() ([]byte, error) {
 		DepositCount:       bs.DepositCount,
 	}
 	if bs.SecurityDeposit != nil {
-		gen.SecurityDeposit = bs.SecurityDeposit.Bytes()
+		gen.SecurityDeposit = bs.SecurityDeposit.String()
 	}
 	if bs.OperationDeposit != nil {
-		gen.OperationDeposit = bs.OperationDeposit.Bytes()
+		gen.OperationDeposit = bs.OperationDeposit.String()
 	}
 	return proto.Marshal(gen)
 }
@@ -73,8 +73,8 @@ func (bs *SubChain) Deserialize(data []byte) error {
 		CurrentHeight:      gen.CurrentHeight,
 		DepositCount:       gen.DepositCount,
 	}
-	bs.SecurityDeposit.SetBytes(gen.SecurityDeposit)
-	bs.OperationDeposit.SetBytes(gen.OperationDeposit)
+	bs.SecurityDeposit.SetString(gen.SecurityDeposit, 10)
+	bs.OperationDeposit.SetString(gen.OperationDeposit, 10)
 	return nil
 }
 
@@ -237,7 +237,7 @@ func (bs Deposit) Serialize() ([]byte, error) {
 		Confirmed: bs.Confirmed,
 	}
 	if bs.Amount != nil {
-		gen.Amount = bs.Amount.Bytes()
+		gen.Amount = bs.Amount.String()
 	}
 	return proto.Marshal(gen)
 }
@@ -254,6 +254,6 @@ func (bs *Deposit) Deserialize(data []byte) error {
 		Addr:      gen.Address,
 		Confirmed: gen.Confirmed,
 	}
-	bs.Amount.SetBytes(gen.Amount)
+	bs.Amount.SetString(gen.Amount, 10)
 	return nil
 }