From faf0028c698f6808ec8009b7571685d4c5e0ed18 Mon Sep 17 00:00:00 2001 From: hernandp Date: Wed, 20 Nov 2024 14:53:55 -0300 Subject: [PATCH 1/2] fix: Normalize guardian address comparisons --- clients/js/src/cmds/editVaa.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/clients/js/src/cmds/editVaa.ts b/clients/js/src/cmds/editVaa.ts index 5d5da91118..606e646165 100644 --- a/clients/js/src/cmds/editVaa.ts +++ b/clients/js/src/cmds/editVaa.ts @@ -23,8 +23,9 @@ import { ethers } from "ethers"; import yargs from "yargs"; import { NETWORK_OPTIONS, NETWORKS } from "../consts"; import { parse, Payload, serialiseVAA, sign, Signature, VAA } from "../vaa"; -import { contracts, Network } from "@wormhole-foundation/sdk-base"; +import { contracts, Network, platformToAddressFormat } from "@wormhole-foundation/sdk-base"; import { getNetwork } from "../utils"; +import { UniversalAddress } from "@wormhole-foundation/sdk"; export const command = "edit-vaa"; export const desc = "Edits or generates a VAA"; @@ -256,8 +257,12 @@ const getSigsFromWormscanData = ( for (let data in wormscanData) { let guardianAddr = wormscanData[data].guardianAddr; let gsi = -1; + for (let idx = 0; idx < guardianSet.length; idx++) { - if (guardianSet[idx] === guardianAddr) { + const normalizedGuardianFromSet = new UniversalAddress(guardianSet[idx], platformToAddressFormat("Evm")); + const normalizedGuardianAddr = new UniversalAddress(guardianAddr, platformToAddressFormat("Evm")); + + if (normalizedGuardianAddr.toString() === normalizedGuardianFromSet.toString()) { gsi = idx; break; } From 58d078d3d3d0a0f83a873f5e19ecfdfaf88d5314 Mon Sep 17 00:00:00 2001 From: hernandp Date: Wed, 20 Nov 2024 15:13:23 -0300 Subject: [PATCH 2/2] use equals to compare. --- clients/js/src/cmds/editVaa.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/js/src/cmds/editVaa.ts b/clients/js/src/cmds/editVaa.ts index 606e646165..c2e3ba45ed 100644 --- a/clients/js/src/cmds/editVaa.ts +++ b/clients/js/src/cmds/editVaa.ts @@ -262,7 +262,7 @@ const getSigsFromWormscanData = ( const normalizedGuardianFromSet = new UniversalAddress(guardianSet[idx], platformToAddressFormat("Evm")); const normalizedGuardianAddr = new UniversalAddress(guardianAddr, platformToAddressFormat("Evm")); - if (normalizedGuardianAddr.toString() === normalizedGuardianFromSet.toString()) { + if (normalizedGuardianAddr.equals(normalizedGuardianFromSet)) { gsi = idx; break; }