Merge pull request #17 from Zondax/fix/wrong-cbor-unmarshalling

fix: some methods parsing
Zondax · Mar 22, 2023 · 5b2415f · 5b2415f
2 parents c5d4478 + 3a2728a
commit 5b2415f
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 5 deletions.
diff --git a/parser/constants.go b/parser/constants.go
@@ -46,7 +46,7 @@ const (
 	MethodSubmitPoRepForBulkVerify    = "SubmitPoRepForBulkVerify"    // MethodsPower
 	MethodCurrentTotalPower           = "CurrentTotalPower"           // MethodsPower
 	MethodUpdatePledgeTotal           = "UpdatePledgeTotal"           // MethodsPower
-	MethodDeprecated1                 = "Deprecated1"                 // MethodsPower
+	MethodPowerDeprecated1            = "Deprecated1"                 // MethodsPower - OnConsensusFault
 	MethodOnDeferredCronEvent         = "OnDeferredCronEvent"         // MethodsMiner
 	MethodPreCommitSector             = "PreCommitSector"             // MethodsMiner
 	MethodProveCommitSector           = "ProveCommitSector"           // MethodsMiner
@@ -91,6 +91,8 @@ const (
 	MethodRestoreBytes                = "RestoreBytes"                // MethodsVerifiedRegistry
 	MethodRemoveExpiredAllocations    = "RemoveExpiredAllocations"    // MethodsVerifiedRegistry
 	MethodRemoveVerifiedClientDataCap = "RemoveVerifiedClientDataCap" // MethodsVerifiedRegistry
+	MethodVerifiedDeprecated1         = "Deprecated1"                 // MethodsVerifiedRegistry - UseBytes
+	MethodVerifiedDeprecated2         = "Deprecated2"                 // MethodsVerifiedRegistry - RestoreBytes
 	MethodInvokeContract              = "InvokeContract"              // MethodsEVM
 	MethodGetBytecode                 = "GetBytecode"                 // MethodsEVM
 	MethodGetStorageAt                = "GetStorageAt"                // MethodsEVM

diff --git a/parser/power.go b/parser/power.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"bytes"
+	"github.com/filecoin-project/go-state-types/abi"
 
 	filTypes "github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/specs-actors/actors/builtin/power"
@@ -22,8 +23,9 @@ func (p *Parser) parseStoragepower(txType string, msg *filTypes.Message, msgRct
 	case MethodEnrollCronEvent:
 		return p.enrollCronEvent(msg.Params)
 	case MethodCronTick:
-	case MethodUpdatePledgeTotal: // TODO
-	case MethodDeprecated1:
+	case MethodUpdatePledgeTotal:
+		return p.updatePledgeTotal(msg.Params)
+	case MethodPowerDeprecated1: // OnConsensusFault
 	case MethodSubmitPoRepForBulkVerify:
 		return p.submitPoRepForBulkVerify(msg.Params)
 	case MethodCurrentTotalPower:
@@ -113,3 +115,15 @@ func (p *Parser) updateClaimedPower(raw []byte) (map[string]interface{}, error)
 	metadata[ParamsKey] = params
 	return metadata, nil
 }
+
+func (p *Parser) updatePledgeTotal(raw []byte) (map[string]interface{}, error) {
+	metadata := make(map[string]interface{})
+	reader := bytes.NewReader(raw)
+	var params abi.TokenAmount
+	err := params.UnmarshalCBOR(reader)
+	if err != nil {
+		return metadata, err
+	}
+	metadata[ParamsKey] = params
+	return metadata, nil
+}
diff --git a/parser/reward.go b/parser/reward.go
@@ -3,6 +3,7 @@ package parser
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-state-types/abi"
 	filTypes "github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/specs-actors/actors/builtin/reward"
 )
@@ -38,7 +39,7 @@ func (p *Parser) awardBlockReward(raw []byte) (map[string]interface{}, error) {
 func (p *Parser) updateNerworkKpi(raw []byte) (map[string]interface{}, error) {
 	metadata := make(map[string]interface{})
 	reader := bytes.NewReader(raw)
-	var blockRewards reward.State
+	var blockRewards abi.StoragePower
 	err := blockRewards.UnmarshalCBOR(reader)
 	if err != nil {
 		return metadata, err

diff --git a/parser/verifiedRegistry.go b/parser/verifiedRegistry.go
@@ -2,7 +2,6 @@ package parser
 
 import (
 	"bytes"
-
 	"github.com/filecoin-project/go-state-types/builtin/v10/verifreg"
 	filTypes "github.com/filecoin-project/lotus/chain/types"
 )
@@ -26,6 +25,10 @@ func (p *Parser) parseVerifiedRegistry(txType string, msg *filTypes.Message, msg
 		return p.removeVerifiedClientDataCap(msg.Params)
 	case MethodRemoveExpiredAllocations:
 		return p.removeExpiredAllocations(msg.Params, msgRct.Return)
+	case MethodVerifiedDeprecated1: // UseBytes
+		return p.deprecated1(msg.Params)
+	case MethodVerifiedDeprecated2: // RestoreBytes
+		return p.deprecated2(msg.Params)
 	case UnknownStr:
 		return p.unknownMetadata(msg.Params, msgRct.Return)
 	}
@@ -111,3 +114,27 @@ func (p *Parser) removeExpiredAllocations(raw, rawReturn []byte) (map[string]int
 	metadata[ReturnKey] = expiredReturn
 	return metadata, nil
 }
+
+func (p *Parser) deprecated1(raw []byte) (map[string]interface{}, error) {
+	metadata := make(map[string]interface{})
+	reader := bytes.NewReader(raw)
+	var params verifreg.RestoreBytesParams
+	err := params.UnmarshalCBOR(reader)
+	if err != nil {
+		return metadata, err
+	}
+	metadata[ParamsKey] = params
+	return metadata, nil
+}
+
+func (p *Parser) deprecated2(raw []byte) (map[string]interface{}, error) {
+	metadata := make(map[string]interface{})
+	reader := bytes.NewReader(raw)
+	var params verifreg.UseBytesParams
+	err := params.UnmarshalCBOR(reader)
+	if err != nil {
+		return metadata, err
+	}
+	metadata[ParamsKey] = params
+	return metadata, nil
+}