Cosmwasm: Add special interface so the cosmos addresses can be created with the appropriate prefix (#593)

Author: barnjamin

core/definitions/src/address.ts

@@ -34,6 +34,13 @@ export interface Address {
   toUniversalAddress(): UniversalAddress;
 }
 
+export interface ChainSpecificAddress extends Address {
+  setChain(chain: Chain): void;
+}
+export function isChainSpecificAddress(thing: any): thing is ChainSpecificAddress {
+  return typeof thing === "object" && "setChain" in thing;
+}
+
 export type MappedPlatforms = keyof WormholeRegistry.PlatformToNativeAddressMapping;
 
 /** Utility type to map platform to its native address implementation */
@@ -87,7 +94,14 @@ export function toNative<C extends Chain>(
       `No native address type registered for platform ${platform}, import the platform directly or, if using sdk package, import the addresses conditional export`,
     );
   try {
-    return new nativeCtr(ua) as unknown as NativeAddress<C>;
+    const nativeAddress = new nativeCtr(ua) as unknown as NativeAddress<C>;
+
+    if (isChainSpecificAddress(nativeAddress)) {
+      // idk why but this typeguard doesnt actually work?
+      (nativeAddress as ChainSpecificAddress).setChain(chain);
+    }
+
+    return nativeAddress;
   } catch (_) {
     // try to parse it as a universal address
     return (UniversalAddress.instanceof(ua) ? ua : new UniversalAddress(ua)).toNative(chain);

platforms/cosmwasm/__tests__/unit/address.test.ts

@@ -1,21 +1,29 @@
-import { CosmwasmAddress } from './../../src/index.js';
+import { toNative } from "@wormhole-foundation/sdk-connect";
+import { CosmwasmAddress } from "./../../src/index.js";
 
 describe("Cosmwasm Address Tests", () => {
   describe("Parse Address", () => {
     test("An address parses", () => {
       let address = new CosmwasmAddress(
-        "terra1c02vds4uhgtrmcw7ldlg75zumdqxr8hwf7npseuf2h58jzhpgjxsgmwkvk"
+        "terra1c02vds4uhgtrmcw7ldlg75zumdqxr8hwf7npseuf2h58jzhpgjxsgmwkvk",
       );
       expect(address).toBeTruthy();
 
       address = new CosmwasmAddress(
-        "xpla137w0wfch2dfmz7jl2ap8pcmswasj8kg06ay4dtjzw7tzkn77ufxqfw7acv"
+        "xpla137w0wfch2dfmz7jl2ap8pcmswasj8kg06ay4dtjzw7tzkn77ufxqfw7acv",
       );
       expect(address).toBeTruthy();
     });
 
     test("An invalid address is rejected", () => {
       expect(() => new CosmwasmAddress("bogusybogusybogus")).toThrow();
     });
+    test("A hex address gets the appropriate prefix", () => {
+      const hexAddress = "0x017ce8aec5af3bb3ac0158d49771d4c8feba2e54a614fa2a1c0c95e9c4c37185";
+      const address = toNative("Xpla", hexAddress);
+      expect(address.toString()).toEqual(
+        "xpla1q97w3tk94uam8tqptr2fwuw5erlt5tj55c2052supj27n3xrwxzsj3f2qj",
+      );
+    });
   });
 });

platforms/cosmwasm/src/address.ts

@@ -1,6 +1,7 @@
 import type { Address } from "@wormhole-foundation/sdk-connect";
 import { UniversalAddress, encoding, registerNative } from "@wormhole-foundation/sdk-connect";
-import type { AnyCosmwasmAddress } from "./types.js";
+import { chainToAddressPrefix } from "./constants.js";
+import type { AnyCosmwasmAddress, CosmwasmChains } from "./types.js";
 import { _platform } from "./types.js";
 
 /*
@@ -186,6 +187,11 @@ export class CosmwasmAddress implements Address {
     return new UniversalAddress(buff);
   }
 
+  setChain(chain: CosmwasmChains): void {
+    // @ts-expect-error -- readonly
+    this.domain = chainToAddressPrefix.get(chain);
+  }
+
   static isValidAddress(address: string): boolean {
     try {
       const maybe = encoding.bech32.decodeToBytes(address);