Skip to content

Commit 7cbf512

Browse files
committed
use unquote for parsing
1 parent ceaacec commit 7cbf512

2 files changed

Lines changed: 25 additions & 14 deletions

File tree

usecase/parser/msg.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2644,7 +2644,7 @@ func ParseMsgTierLockTier(
26442644
for _, event := range events.GetEventsByType("chainmain.tieredrewards.v1.EventPositionCreated") {
26452645
if msgIndex := event.GetAttributeByKey("msg_index"); msgIndex != nil && *msgIndex == strconv.Itoa(parserParams.MsgIndex) {
26462646
if positionId := event.GetAttributeByKey("position_id"); positionId != nil {
2647-
params.PositionId = *positionId
2647+
params.PositionId = utils.UnquoteOrRaw(*positionId)
26482648
}
26492649
break
26502650
}
@@ -2691,7 +2691,7 @@ func ParseMsgTierCommitDelegationToTier(
26912691
for _, event := range events.GetEventsByType("chainmain.tieredrewards.v1.EventDelegationCommitted") {
26922692
if msgIndex := event.GetAttributeByKey("msg_index"); msgIndex != nil && *msgIndex == strconv.Itoa(parserParams.MsgIndex) {
26932693
if positionId := event.GetAttributeByKey("position_id"); positionId != nil {
2694-
params.PositionId = *positionId
2694+
params.PositionId = utils.UnquoteOrRaw(*positionId)
26952695
}
26962696
break
26972697
}
@@ -2738,7 +2738,7 @@ func ParseMsgTierAddToTierPosition(
27382738
for _, event := range events.GetEventsByType("chainmain.tieredrewards.v1.EventPositionAmountAdded") {
27392739
if msgIndex := event.GetAttributeByKey("msg_index"); msgIndex != nil && *msgIndex == strconv.Itoa(parserParams.MsgIndex) {
27402740
if positionId := event.GetAttributeByKey("position_id"); positionId != nil {
2741-
params.PositionId = *positionId
2741+
params.PositionId = utils.UnquoteOrRaw(*positionId)
27422742
}
27432743
break
27442744
}
@@ -2823,10 +2823,10 @@ func ParseMsgTierRedelegate(
28232823
params.CompletionTime = *completionTime
28242824
}
28252825
if positionId := event.GetAttributeByKey("position_id"); positionId != nil {
2826-
params.PositionId = *positionId
2826+
params.PositionId = utils.UnquoteOrRaw(*positionId)
28272827
}
28282828
if unbondingId := event.GetAttributeByKey("unbonding_id"); unbondingId != nil {
2829-
params.UnbondingId = *unbondingId
2829+
params.UnbondingId = utils.UnquoteOrRaw(*unbondingId)
28302830
}
28312831
break
28322832
}
@@ -2873,13 +2873,13 @@ func ParseMsgTierUndelegate(
28732873
for _, event := range events.GetEventsByType("chainmain.tieredrewards.v1.EventPositionUndelegated") {
28742874
if msgIndex := event.GetAttributeByKey("msg_index"); msgIndex != nil && *msgIndex == strconv.Itoa(parserParams.MsgIndex) {
28752875
if completionTime := event.GetAttributeByKey("completion_time"); completionTime != nil {
2876-
params.CompletionTime = *completionTime
2876+
params.CompletionTime = utils.UnquoteOrRaw(*completionTime)
28772877
}
28782878
if positionId := event.GetAttributeByKey("position_id"); positionId != nil {
2879-
params.PositionId = *positionId
2879+
params.PositionId = utils.UnquoteOrRaw(*positionId)
28802880
}
28812881
if unbondingId := event.GetAttributeByKey("unbonding_id"); unbondingId != nil {
2882-
params.UnbondingId = *unbondingId
2882+
params.UnbondingId = utils.UnquoteOrRaw(*unbondingId)
28832883
}
28842884
break
28852885
}
@@ -2926,10 +2926,10 @@ func ParseMsgTierTriggerExitFromTier(
29262926
for _, event := range events.GetEventsByType("chainmain.tieredrewards.v1.EventExitTriggered") {
29272927
if msgIndex := event.GetAttributeByKey("msg_index"); msgIndex != nil && *msgIndex == strconv.Itoa(parserParams.MsgIndex) {
29282928
if exitUnlockAt := event.GetAttributeByKey("exit_unlock_at"); exitUnlockAt != nil {
2929-
params.ExitUnlockAt = *exitUnlockAt
2929+
params.ExitUnlockAt = utils.UnquoteOrRaw(*exitUnlockAt)
29302930
}
29312931
if positionId := event.GetAttributeByKey("position_id"); positionId != nil {
2932-
params.PositionId = *positionId
2932+
params.PositionId = utils.UnquoteOrRaw(*positionId)
29332933
}
29342934
break
29352935
}
@@ -2976,7 +2976,7 @@ func ParseMsgTierClearPosition(
29762976
for _, event := range events.GetEventsByType("chainmain.tieredrewards.v1.EventExitCleared") {
29772977
if msgIndex := event.GetAttributeByKey("msg_index"); msgIndex != nil && *msgIndex == strconv.Itoa(parserParams.MsgIndex) {
29782978
if positionId := event.GetAttributeByKey("position_id"); positionId != nil {
2979-
params.PositionId = *positionId
2979+
params.PositionId = utils.UnquoteOrRaw(*positionId)
29802980
}
29812981
break
29822982
}
@@ -3127,13 +3127,13 @@ func ParseMsgTierExitTierWithDelegation(
31273127
for _, event := range events.GetEventsByType("chainmain.tieredrewards.v1.EventExitTierWithDelegation") {
31283128
if msgIndex := event.GetAttributeByKey("msg_index"); msgIndex != nil && *msgIndex == strconv.Itoa(parserParams.MsgIndex) {
31293129
if positionId := event.GetAttributeByKey("position_id"); positionId != nil {
3130-
params.PositionId = *positionId
3130+
params.PositionId = utils.UnquoteOrRaw(*positionId)
31313131
}
31323132
if transferredAmount := event.GetAttributeByKey("transferred_amount"); transferredAmount != nil {
3133-
params.TransferredAmount = *transferredAmount
3133+
params.TransferredAmount = utils.UnquoteOrRaw(*transferredAmount)
31343134
}
31353135
if transferredShares := event.GetAttributeByKey("transferred_shares"); transferredShares != nil {
3136-
params.TransferredShares = *transferredShares
3136+
params.TransferredShares = utils.UnquoteOrRaw(*transferredShares)
31373137
}
31383138
if fullExit := event.GetAttributeByKey("full_exit"); fullExit != nil {
31393139
params.FullExit = *fullExit == "true"

usecase/parser/utils/utils.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package utils
2+
3+
import "strconv"
4+
5+
func UnquoteOrRaw(s string) string {
6+
unquoted, err := strconv.Unquote(s)
7+
if err != nil {
8+
return s
9+
}
10+
return unquoted
11+
}

0 commit comments

Comments
 (0)