refactor(svm): restructure utils into modular files under src folder #793
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…for better organization Signed-off-by: Pablo Maldonado <[email protected]>
Signed-off-by: Pablo Maldonado <[email protected]>
…be-in-src-from-the-test-directory
Signed-off-by: Pablo Maldonado <[email protected]>
Signed-off-by: Pablo Maldonado <[email protected]>
Signed-off-by: Pablo Maldonado <[email protected]>
Signed-off-by: Pablo Maldonado <[email protected]>
Reinis-FRP
reviewed
Dec 6, 2024
| { Property: "relayer", Value: new PublicKey(event.data.relayer).toString() }, | ||
| { Property: "depositor", Value: new PublicKey(event.data.depositor).toString() }, | ||
| { Property: "recipient", Value: new PublicKey(event.data.recipient).toString() }, | ||
| { Property: "message", Value: event.data.message.toString() }, |
There was a problem hiding this comment.
fill events don't have full message anymore. instead its messageHash
There was a problem hiding this comment.
ye, this will be broken now if used. I think it could be due to a merge issue you had.
Reinis-FRP
reviewed
Dec 6, 2024
| Property: "updatedRecipient", | ||
| Value: new PublicKey(event.data.relayExecutionInfo.updatedRecipient).toString(), | ||
| }, | ||
| { Property: "updatedMessage", Value: event.data.relayExecutionInfo.updatedMessage.toString() }, |
Reinis-FRP
reviewed
Dec 6, 2024
| @@ -36,7 +35,7 @@ const argv = yargs(hideBin(process.argv)) | |||
| .option("inputAmount", { type: "number", demandOption: true, describe: "Input amount" }) | |||
| .option("outputAmount", { type: "number", demandOption: true, describe: "Output amount" }) | |||
| .option("originChainId", { type: "string", demandOption: true, describe: "Origin chain ID" }) | |||
| .option("depositId", { type: "string", demandOption: true, describe: "Deposit ID" }) | |||
| .option("depositId", { type: "array", demandOption: true, describe: "Deposit ID" }) | |||
There was a problem hiding this comment.
its too cumbersome to pass array in command line (need to repeat --depositId param for each byte. Better use string and parse it as hex (if it starts with 0x) or number
Reinis-FRP
reviewed
Dec 6, 2024
| @@ -50,7 +49,7 @@ async function fillV3Relay(): Promise<void> { | |||
| const inputAmount = new BN(resolvedArgv.inputAmount); | |||
| const outputAmount = new BN(resolvedArgv.outputAmount); | |||
| const originChainId = new BN(resolvedArgv.originChainId); | |||
| const depositId = intToU8Array32(new BN(resolvedArgv.depositId)); | |||
| const depositId = resolvedArgv.depositId; | |||
Reinis-FRP
reviewed
Dec 6, 2024
| console.log("Fill events fetched successfully:"); | ||
| fillEvents.forEach((event, index) => { | ||
| console.log(`Fill Event ${index + 1}:`); | ||
| console.table([ | ||
| { Property: "inputToken", Value: strPublicKey(event.data.inputToken) }, | ||
| { Property: "outputToken", Value: strPublicKey(event.data.outputToken) }, | ||
| { Property: "inputToken", Value: new PublicKey(event.data.inputToken).toString() }, |
There was a problem hiding this comment.
why drop strPublicKey helper, we introduced this recently
Reinis-FRP
reviewed
Dec 6, 2024
| @@ -65,7 +64,7 @@ async function fillV3Relay(): Promise<void> { | |||
| inputAmount, | |||
| outputAmount, | |||
| originChainId, | |||
| depositId, | |||
| depositId: depositId.map((id) => Number(id)), | |||
There was a problem hiding this comment.
this might be based on old version. we had it fixed recently
Reinis-FRP
reviewed
Dec 6, 2024
| @@ -155,7 +154,7 @@ async function fillV3Relay(): Promise<void> { | |||
| state: statePda, | |||
| signer: signer.publicKey, | |||
| instructionParams: program.programId, | |||
| mint: outputToken, | |||
| mintAccount: outputToken, | |||
There was a problem hiding this comment.
same comment as before, likely due to a merge issue.
Reinis-FRP
reviewed
Dec 6, 2024
| /** | ||
| * Converts an integer to a 32-byte Uint8Array. | ||
| */ | ||
| export function intToU8Array32(num: number): number[] { |
There was a problem hiding this comment.
we had this fn also handle BigInt numbers
Reinis-FRP
reviewed
Dec 6, 2024
| /** | ||
| * Converts an EVM address to a Solana PublicKey. | ||
| */ | ||
| export const evmAddressToPublicKey = (address: string): PublicKey => { |
There was a problem hiding this comment.
this more belongs to conversionUtils
Reinis-FRP
reviewed
Dec 6, 2024
| /** | ||
| * Converts a Solana PublicKey to an EVM address. | ||
| */ | ||
| export const publicKeyToEvmAddress = (publicKey: PublicKey | string): string => { |
There was a problem hiding this comment.
this more belongs to conversionUtils
chrismaree
reviewed
Dec 6, 2024
| }, | ||
| }; | ||
|
|
||
| private static coderTypes: IdlTypeDef[] = [ |
There was a problem hiding this comment.
this can all be linted a lot better. might be ok to ignore though and we can run a seperate linting task to collaps JS objects after the fact.
chrismaree
reviewed
Dec 6, 2024
| @@ -0,0 +1,6 @@ | |||
| export * from "./relayHashUtils"; | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes proposed in this PR: