Skip to content

Nitro: trim \x prefix in data passed to replayer #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codchen merged 1 commit into from
Nov 9, 2022
Merged

Nitro: trim \x prefix in data passed to replayer #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions x/nitro/replay/replay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,17 @@ func writeTransactionToFile(directory string, tx []byte) (string, error) {
)
serialized += header
serialized += ","
serialized += strings.Join(transactionData.LegacyMessage.AccountKeys, "-")
serialized += strings.Join(
utils.Map(transactionData.LegacyMessage.AccountKeys, trimHexPrefix), "-")
serialized += ","
serialized += transactionData.LegacyMessage.RecentBlockhash
serialized += trimHexPrefix(transactionData.LegacyMessage.RecentBlockhash)
serialized += ","
instructions := utils.Map(transactionData.LegacyMessage.Instructions, func(i *types.CompiledInstruction) string {
return fmt.Sprintf(
"%d_%s_%s",
i.ProgramIdIndex,
strings.Join(utils.Map(i.Accounts, func(a uint32) string { return fmt.Sprintf("%d", a) }), ":"),
i.Data,
trimHexPrefix(i.Data),
)
})
serialized += strings.Join(instructions, "-")
Expand All @@ -133,16 +134,17 @@ func writeTransactionToFile(directory string, tx []byte) (string, error) {
)
serialized += header
serialized += ","
serialized += strings.Join(transactionData.V0LoadedMessage.Message.AccountKeys, "-")
serialized += strings.Join(
utils.Map(transactionData.V0LoadedMessage.Message.AccountKeys, trimHexPrefix), "-")
serialized += ","
serialized += transactionData.V0LoadedMessage.Message.RecentBlockhash
serialized += trimHexPrefix(transactionData.V0LoadedMessage.Message.RecentBlockhash)
serialized += ","
instructions := utils.Map(transactionData.V0LoadedMessage.Message.Instructions, func(i *types.CompiledInstruction) string {
return fmt.Sprintf(
"%d_%s_%s",
i.ProgramIdIndex,
strings.Join(utils.Map(i.Accounts, func(a uint32) string { return fmt.Sprintf("%d", a) }), ":"),
i.Data,
trimHexPrefix(i.Data),
)
})
serialized += strings.Join(instructions, "-")
Expand Down Expand Up @@ -185,3 +187,14 @@ func writeAccountToFile(directory string, account types.Account) (string, error)
filepath := fmt.Sprintf("%s%s", directory, account.Pubkey)
return filepath, os.WriteFile(filepath, []byte(serialized), 0644)
}

// input: \x1234 output: 1234
func trimHexPrefix(s string) string {
if len(s) < 2 {
return s
}
if s[:2] != "\\x" {
return s
}
return s[2:]
}
9 changes: 9 additions & 0 deletions x/nitro/replay/replay_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,12 @@ func TestWriteTransactionToFile(t *testing.T) {
require.Nil(t, err)
require.Equal(t, "0|1-2-3,a1-a2,recent,1_4:5:6_d1-2_7:8:9_d2|message|f|s1,s2", string(bz))
}

func TestTrimHexPrefix(t *testing.T) {
require.Equal(t, "", trimHexPrefix(""))
require.Equal(t, "a", trimHexPrefix("a"))
require.Equal(t, "\\y", trimHexPrefix("\\y"))
require.Equal(t, "", trimHexPrefix("\\x"))
require.Equal(t, "abc", trimHexPrefix("abc"))
require.Equal(t, "1234", trimHexPrefix("\\x1234"))
}