@paimaexample/wallets 0.3.117 → 0.3.120

package/esm/wallets/src/polkadot/polkadot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"polkadot.d.ts","sourceRoot":"","sources":["../../../../src/wallets/src/polkadot/polkadot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EACL,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,iBAAiB,CAAC;AAMzB,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC;AACrC,MAAM,MAAM,WAAW,GAAG,iBAAiB,CAAC;AAQ5C,qBAAa,iBACX,YAAW,UAAU,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC;IAEnE,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA4C;WAEtD,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;IAkBzE,MAAM,CAAC,QAAQ,IAAI,iBAAiB;IAOpC,aAAa,QAAa,OAAO,CAAC,gBAAgB,CAAC,CA0BjD;IACF,eAAe,GACb,MAAM,gBAAgB,CAAC,WAAW,CAAC,KAClC,OAAO,CAAC,gBAAgB,CAAC,CAM1B;IACF,YAAY,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,gBAAgB,CAAC,CAW5D;IACF,WAAW,QAAO,SAAS,GAAG,gBAAgB,CAE5C;IACF,kBAAkB,QAAO,gBAAgB,CAKvC;IACF,WAAW,QAAO,OAAO,CAEvB;CACH;AAED,qBAAa,gBAAiB,YAAW,SAAS,CAAC,WAAW,CAAC;IAE3D,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,QAAQ,CAAC,OAAO,EAAE,eAAe;gBADhB,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,EAC3C,OAAO,EAAE,eAAe;IAEnC,MAAM,CAAC,IAAI,GACT,MAAM,gBAAgB,CAAC,WAAW,CAAC,KAClC,OAAO,CAAC,gBAAgB,CAAC,CAS1B;IACF,aAAa,QAAO,gBAAgB,CAAC,WAAW,CAAC,CAE/C;IACF,UAAU,QAAO,cAAc,CAK7B;IACF,WAAW,GAAU,SAAS,MAAM,KAAG,OAAO,CAAC,aAAa,CAAC,CAa3D;CACH"}

package/esm/wallets/src/polkadot/polkadot.js

@@ -0,0 +1,133 @@
+import { AddressType } from "../../../utils/src/mod.js";
+import { optionToActive, } from "../IProvider.js";
+import { web3Enable, web3FromSource } from "@polkadot/extension-dapp";
+import { utf8ToHex } from "web3-utils";
+import { getWindow } from "../windows.js";
+import { web3Accounts, web3FromAddress } from "@polkadot/extension-dapp";
+// declare global {
+//   interface Window {
+//     injectedWeb3?: Record<string, InjectedWindowProvider>;
+//   }
+// }
+export class PolkadotConnector {
+    provider;
+    static INSTANCE = undefined;
+    static async getWalletOptions() {
+        const injectedWeb3 = getWindow()?.injectedWeb3;
+        if (injectedWeb3 == null)
+            return [];
+        return Object.keys(injectedWeb3).map((wallet) => ({
+            metadata: {
+                name: wallet,
+                // polkadot provides no way to get a human-friendly name or icon for wallets
+                displayName: wallet,
+            },
+            api: async () => {
+                // const { web3Enable, web3FromSource } = await import('@polkadot/extension-dapp');
+                await web3Enable(/*gameName*/ "paima");
+                const injector = await web3FromSource(wallet);
+                return injector;
+            },
+        }));
+    }
+    static instance() {
+        if (PolkadotConnector.INSTANCE == null) {
+            const newInstance = new PolkadotConnector();
+            PolkadotConnector.INSTANCE = newInstance;
+        }
+        return PolkadotConnector.INSTANCE;
+    }
+    connectSimple = async () => {
+        if (this.provider != null) {
+            return this.provider;
+        }
+        const extensions = await web3Enable(/*gameName*/ "paima");
+        if (extensions.length === 0) {
+            throw new Error(`[polkadot] no extension detected`);
+        }
+        // we get all accounts instead of picking a specific extension
+        // because some extensions could have no accounts in them
+        const allAccounts = await web3Accounts();
+        for (const account of allAccounts) {
+            const injector = await web3FromAddress(account.address);
+            if (injector.signer.signRaw == null)
+                continue;
+            return await this.connectExternal({
+                metadata: {
+                    name: account.meta.source,
+                    // polkadot provides no way to get a human-friendly name or icon for wallets
+                    displayName: account.meta.source,
+                },
+                api: injector,
+            });
+        }
+        throw new Error("[polkadot] No account detected that supports signing! Found extensions: " + extensions.map(e => e.name).join(", "));
+    };
+    connectExternal = async (conn) => {
+        if (this.provider?.getConnection().metadata?.name === conn.metadata.name) {
+            return this.provider;
+        }
+        this.provider = await PolkadotProvider.init(conn);
+        return this.provider;
+    };
+    connectNamed = async (name) => {
+        if (this.provider?.getConnection().metadata?.name === name) {
+            return this.provider;
+        }
+        const provider = (await PolkadotConnector.getWalletOptions()).find((entry) => entry.metadata.name === name);
+        if (provider == null) {
+            throw new Error(`Polkadot wallet ${name} not found`);
+        }
+        return await this.connectExternal(await optionToActive(provider));
+    };
+    getProvider = () => {
+        return this.provider;
+    };
+    getOrThrowProvider = () => {
+        if (this.provider == null) {
+            throw new Error(`PolkadotConnector not initialized yet`);
+        }
+        return this.provider;
+    };
+    isConnected = () => {
+        return this.provider != null;
+    };
+}
+export class PolkadotProvider {
+    conn;
+    address;
+    constructor(conn, address) {
+        this.conn = conn;
+        this.address = address;
+    }
+    static init = async (conn) => {
+        // { address, name, type: "sr25519" }
+        const addresses = await conn.api.accounts.get(true);
+        const account = addresses.filter(a => a.type === "sr25519")[0]?.address;
+        if (account == null) {
+            throw new Error("Unknown error while receiving Polkadot accounts");
+        }
+        return new PolkadotProvider(conn, account);
+    };
+    getConnection = () => {
+        return this.conn;
+    };
+    getAddress = () => {
+        return {
+            type: AddressType.POLKADOT,
+            address: this.address,
+        };
+    };
+    signMessage = async (message) => {
+        if (this.conn.api.signer.signRaw == null) {
+            throw new Error(`[polkadot] extension ${this.conn.metadata.name} does not support signRaw`);
+        }
+        const hexMessage = utf8ToHex(message);
+        const { signature } = await this.conn.api.signer.signRaw({
+            address: this.getAddress().address,
+            data: hexMessage,
+            type: "bytes",
+        });
+        return signature;
+    };
+}

package/esm/wallets/src/polkadot/wrapper.d.ts

@@ -0,0 +1,6 @@
+import type { Result } from "../../../utils/src/mod.js";
+import type { IProvider } from "../IProvider.js";
+import type { WalletMode, ApiForMode } from "../utils.js";
+import { type LoginInfoMap } from "../wallet-modes.js";
+export declare function polkadotLoginWrapper(loginInfo: LoginInfoMap[WalletMode.Polkadot]): Promise<Result<IProvider<ApiForMode<WalletMode.Polkadot>>>>;
+//# sourceMappingURL=wrapper.d.ts.map

package/esm/wallets/src/polkadot/wrapper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../../src/wallets/src/polkadot/wrapper.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,KAAK,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAGxE,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,GAC3C,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAa7D"}

package/esm/wallets/src/polkadot/wrapper.js

@@ -0,0 +1,19 @@
+// import { buildEndpointErrorFxn, PaimaMiddlewareErrorCode } from '../errors.js';
+// import { getGameName } from '../state.js';
+// import type { LoginInfoMap } from '../types.js';
+// import { PolkadotConnector } from '@paimaexample/providers';
+// import type { ApiForMode, IProvider, WalletMode } from '@paimaexample/providers';
+// import { connectInjected } from './wallet-modes.js';
+// import type { Result } from '@paimaexample/utils';
+import { connectInjected } from "../wallet-modes.js";
+import { PolkadotConnector } from "./polkadot.js";
+export async function polkadotLoginWrapper(loginInfo) {
+    const loginResult = await connectInjected('polkadotLoginWrapper', loginInfo, PolkadotConnector.instance());
+    if (loginResult.success === false) {
+        return loginResult;
+    }
+    return {
+        success: true,
+        result: loginResult.result,
+    };
+}

package/esm/wallets/src/utils.d.ts

@@ -1,7 +1,9 @@
 import type { ActiveConnection, IConnector, IInjectedConnector, IProvider } from "./IProvider.js";
+import { AlgorandConnector } from "./algorand/algorand.js";
 import { EthersConnector } from "./evm/ethers.js";
 import { EvmInjectedConnector } from "./evm/injected.js";
 import { CardanoConnector } from "./cardano/cardano.js";
+import { PolkadotConnector } from "./polkadot/polkadot.js";
 import { MinaConnector } from "./mina/mina.js";
 import { AvailConnector } from "./avail/avail.js";
 import { MidnightConnector } from "./midnight/midnight.js";
@@ -10,8 +12,10 @@ export declare const enum WalletMode {
     EvmEthers = 1,
     Midnight = 2,
     Cardano = 3,
-    Mina = 4,
-    AvailJs = 5
+    Polkadot = 4,
+    Algorand = 5,
+    Mina = 6,
+    AvailJs = 7
 }
 export declare const WalletNameMap: Record<WalletMode, string>;
 export declare const WalletModeMap: {
@@ -19,8 +23,10 @@ export declare const WalletModeMap: {
     1: EthersConnector;
     2: MidnightConnector;
     3: CardanoConnector;
-    4: MinaConnector;
-    5: AvailConnector;
+    4: PolkadotConnector;
+    5: AlgorandConnector;
+    6: MinaConnector;
+    7: AvailConnector;
 };
 type ExtractGeneric<T> = T extends IConnector<infer U> ? U : never;
 export type ApiForMode<Mode extends WalletMode> = ExtractGeneric<(typeof WalletModeMap)[Mode]>;
@@ -32,6 +38,8 @@ export type InjectionPreference<T> = {
 export declare function allInjectedWallets(): Promise<{
     [WalletMode.EvmInjected]: ReturnType<typeof EvmInjectedConnector.getWalletOptions>;
     [WalletMode.Cardano]: ReturnType<typeof CardanoConnector.getWalletOptions>;
+    [WalletMode.Polkadot]: Awaited<ReturnType<typeof PolkadotConnector.getWalletOptions>>;
+    [WalletMode.Algorand]: ReturnType<typeof AlgorandConnector.getWalletOptions>;
     [WalletMode.Mina]: ReturnType<typeof MinaConnector.getWalletOptions>;
     [WalletMode.Midnight]: ReturnType<typeof MidnightConnector.getWalletOptions>;
 }>;

package/esm/wallets/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/wallets/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,0BAAkB,UAAU;IAC1B,WAAW,IAAA;IACX,SAAS,IAAA;IACT,QAAQ,IAAA;IACR,OAAO,IAAA;IAGP,IAAI,IAAA;IACJ,OAAO,IAAA;CACR;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CASpD,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;CASzB,CAAC;AAEF,KAAK,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACnE,MAAM,MAAM,UAAU,CAAC,IAAI,SAAS,UAAU,IAAI,cAAc,CAC9D,CAAC,OAAO,aAAa,CAAC,CAAC,IAAI,CAAC,CAC7B,CAAC;AAEF,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAC7B;IACA,IAAI,EAAE,MAAM,CAAC;CACd,GACC;IACA,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CACjC,CAAC;AAEJ,wBAAsB,kBAAkB,IAAI,OAAO,CAAC;IAClD,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,UAAU,CAClC,OAAO,oBAAoB,CAAC,gBAAgB,CAC7C,CAAC;IACF,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IAK3E,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACrE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;CAC9E,CAAC,CASD;AACD,wBAAsB,qBAAqB,CAAC,GAAG,EAC7C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,GAAG,mBAAmB,CAAC,GAAG,CAAC,EAChD,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,GACjC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAiBzB;AAED,wBAAgB,YAAY,CAC1B,IAAI,SAAS,UAAU,EACvB,GAAG,SAAS,UAAU,CAAC,IAAI,CAAC,EAC5B,IAAI,SAAS,MAAM,SAAS,CAAC,GAAG,CAAC,EAEjC,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,IAAI,EACd,GAAG,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GACxC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAKlC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/wallets/src/utils.ts"],"names":[],"mappings":"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"}

package/esm/wallets/src/utils.js

@@ -1,8 +1,8 @@
-// import { AlgorandConnector } from "./algorand/algorand.ts";
+import { AlgorandConnector } from "./algorand/algorand.js";
 import { EthersConnector } from "./evm/ethers.js";
 import { EvmInjectedConnector } from "./evm/injected.js";
 import { CardanoConnector } from "./cardano/cardano.js";
-// import { PolkadotConnector } from "./polkadot/polkadot.ts";
+import { PolkadotConnector } from "./polkadot/polkadot.js";
 import { MinaConnector } from "./mina/mina.js";
 import { AvailConnector } from "./avail/avail.js";
 import { MidnightConnector } from "./midnight/midnight.js";
@@ -12,18 +12,18 @@ export var WalletMode;
     WalletMode[WalletMode["EvmEthers"] = 1] = "EvmEthers";
     WalletMode[WalletMode["Midnight"] = 2] = "Midnight";
     WalletMode[WalletMode["Cardano"] = 3] = "Cardano";
-    // Polkadot,
-    // Algorand,
-    WalletMode[WalletMode["Mina"] = 4] = "Mina";
-    WalletMode[WalletMode["AvailJs"] = 5] = "AvailJs";
+    WalletMode[WalletMode["Polkadot"] = 4] = "Polkadot";
+    WalletMode[WalletMode["Algorand"] = 5] = "Algorand";
+    WalletMode[WalletMode["Mina"] = 6] = "Mina";
+    WalletMode[WalletMode["AvailJs"] = 7] = "AvailJs";
 })(WalletMode || (WalletMode = {}));
 export const WalletNameMap = {
     [WalletMode.EvmInjected]: "EVM",
     [WalletMode.EvmEthers]: "EVM",
     [WalletMode.Midnight]: "Midnight",
     [WalletMode.Cardano]: "Cardano",
-    // [WalletMode.Polkadot]: 'Polkadot',
-    // [WalletMode.Algorand]: 'Algorand',
+    [WalletMode.Polkadot]: 'Polkadot',
+    [WalletMode.Algorand]: 'Algorand',
     [WalletMode.Mina]: "Mina",
     [WalletMode.AvailJs]: "Avail",
 };
@@ -32,8 +32,8 @@ export const WalletModeMap = {
     [WalletMode.EvmEthers]: EthersConnector.instance(),
     [WalletMode.Midnight]: MidnightConnector.instance(),
     [WalletMode.Cardano]: CardanoConnector.instance(),
-    // [WalletMode.Polkadot]: PolkadotConnector.instance(),
-    // [WalletMode.Algorand]: AlgorandConnector.instance(),
+    [WalletMode.Polkadot]: PolkadotConnector.instance(),
+    [WalletMode.Algorand]: AlgorandConnector.instance(),
     [WalletMode.Mina]: MinaConnector.instance(),
     [WalletMode.AvailJs]: AvailConnector.instance(),
 };
@@ -41,8 +41,8 @@ export async function allInjectedWallets() {
     return {
         [WalletMode.EvmInjected]: EvmInjectedConnector.getWalletOptions(),
         [WalletMode.Cardano]: CardanoConnector.getWalletOptions(),
-        // [WalletMode.Polkadot]: await PolkadotConnector.getWalletOptions(),
-        // [WalletMode.Algorand]: AlgorandConnector.getWalletOptions(),
+        [WalletMode.Polkadot]: await PolkadotConnector.getWalletOptions(),
+        [WalletMode.Algorand]: AlgorandConnector.getWalletOptions(),
         [WalletMode.Mina]: MinaConnector.getWalletOptions(),
         [WalletMode.Midnight]: MidnightConnector.getWalletOptions(),
     };

package/esm/wallets/src/wallet-modes.d.ts

@@ -1,11 +1,14 @@
 import type { ApiPromise } from "avail-js-sdk";
 import type { Result } from "../../utils/src/mod.js";
+import type { AlgorandApi } from "./algorand/algorand.js";
 import type { CardanoApi } from "./cardano/cardano.js";
 import type { EthersApi } from "./evm/ethers.js";
 import type { EvmApi } from "./evm/injected.js";
 import type { ActiveConnection, IInjectedConnector, IProvider } from "./IProvider.js";
 import type { MinaApi } from "./mina/mina.js";
-import { type InjectionPreference, type WalletMode } from "./utils.js";
+import type { PolkadotApi } from "./polkadot/polkadot.js";
+import { type InjectionPreference, WalletMode } from "./utils.js";
+import { AddressType } from "../../utils/src/mod.js";
 import type { MidnightApi } from "./midnight/midnight.js";
 import type { Chain } from "viem/chains";
 export type BaseLoginInfo<Api> = {
@@ -30,6 +33,8 @@ export type LoginInfoMap = {
         preferBatchedMode: boolean;
     };
     [WalletMode.Cardano]: BaseLoginInfo<CardanoApi>;
+    [WalletMode.Polkadot]: BaseLoginInfo<PolkadotApi>;
+    [WalletMode.Algorand]: BaseLoginInfo<AlgorandApi>;
     [WalletMode.Mina]: BaseLoginInfo<MinaApi>;
     [WalletMode.AvailJs]: {
         connection: ActiveConnection<ApiPromise>;
@@ -45,5 +50,6 @@ type ToUnion<T> = {
 }[keyof T];
 export type LoginInfo = ToUnion<LoginInfoMap>;
 export declare function connectInjected<Api>(typeName: string, loginInfo: BaseLoginInfo<Api>, connector: IInjectedConnector<Api>): Promise<Result<IProvider<Api>>>;
+export declare function getAddressType(mode: WalletMode): AddressType;
 export {};
 //# sourceMappingURL=wallet-modes.d.ts.map

package/esm/wallets/src/wallet-modes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-modes.d.ts","sourceRoot":"","sources":["../../../src/wallets/src/wallet-modes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EACV,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,MAAM,aAAa,CAAC,GAAG,IAAI;IAC/B,UAAU,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC;CACvC,CAAC;AACF,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG;QAChD,yFAAyF;QACzF,iBAAiB,EAAE,OAAO,CAAC;QAC3B;;;;;;WAMG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,KAAK,CAAC,EAAE,KAAK,CAAC;KACf,CAAC;IACF,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QACtB,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACxC,iBAAiB,EAAE,OAAO,CAAC;KAC5B,CAAC;IACF,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IAGhD,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACpB,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACzC,iBAAiB,EAAE,OAAO,CAAC;QAC3B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;CACnD,CAAC;AAEF,KAAK,OAAO,CAAC,CAAC,IAAI;KACf,CAAC,IAAI,MAAM,CAAC,GAAG;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,GAAG,CAAC,CAAC,CAAC,CAAC;CACnC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAS9C,wBAAsB,eAAe,CAAC,GAAG,EACvC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,EAC7B,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAuBjC"}
+{"version":3,"file":"wallet-modes.d.ts","sourceRoot":"","sources":["../../../src/wallets/src/wallet-modes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EACV,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAEL,KAAK,mBAAmB,EACxB,UAAU,EACX,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGzC,MAAM,MAAM,aAAa,CAAC,GAAG,IAAI;IAC/B,UAAU,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC;CACvC,CAAC;AACF,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG;QAChD,yFAAyF;QACzF,iBAAiB,EAAE,OAAO,CAAC;QAC3B;;;;;;WAMG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,KAAK,CAAC,EAAE,KAAK,CAAC;KACf,CAAC;IACF,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QACtB,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACxC,iBAAiB,EAAE,OAAO,CAAC;KAC5B,CAAC;IACF,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACpB,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACzC,iBAAiB,EAAE,OAAO,CAAC;QAC3B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;CACnD,CAAC;AAEF,KAAK,OAAO,CAAC,CAAC,IAAI;KACf,CAAC,IAAI,MAAM,CAAC,GAAG;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,GAAG,CAAC,CAAC,CAAC,CAAC;CACnC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAS9C,wBAAsB,eAAe,CAAC,GAAG,EACvC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,EAC7B,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAuBjC;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,CAuB5D"}

package/esm/wallets/src/wallet-modes.js

@@ -1,5 +1,5 @@
-// import type { PolkadotApi } from "./polkadot/polkadot.ts";
-import { connectInjectedWallet, } from "./utils.js";
+import { connectInjectedWallet, WalletMode, } from "./utils.js";
+import { AddressType } from "../../utils/src/mod.js";
 function getWalletName(info) {
     if (info.preference == null)
         return undefined;
@@ -24,3 +24,27 @@ export async function connectInjected(typeName, loginInfo, connector) {
         };
     }
 }
+export function getAddressType(mode) {
+    switch (mode) {
+        case WalletMode.EvmInjected:
+        case WalletMode.EvmEthers:
+            return AddressType.EVM;
+        case WalletMode.Cardano:
+            return AddressType.CARDANO;
+        case WalletMode.Polkadot:
+            return AddressType.POLKADOT;
+        case WalletMode.Algorand:
+            return AddressType.ALGORAND;
+        case WalletMode.Mina:
+            return AddressType.MINA;
+        case WalletMode.Midnight:
+            return AddressType.MIDNIGHT;
+        case WalletMode.AvailJs:
+            return AddressType.AVAIL;
+        case WalletMode.Polkadot:
+            return AddressType.POLKADOT;
+        default:
+            throw new Error(`Unsupported wallet mode: ${mode}`);
+    }
+}
+;

package/esm/wallets/src/wallets.js

@@ -1,7 +1,7 @@
-// import { algorandLoginWrapper } from "./algorand/wrapper.ts";
+import { algorandLoginWrapper } from "./algorand/wrapper.js";
 import { cardanoLoginWrapper } from "./cardano/wrapper.js";
 import { evmLoginWrapper } from "./evm/wrapper-injected.js";
-// import { polkadotLoginWrapper } from "./polkadot/wrapper.ts";
+import { polkadotLoginWrapper } from "./polkadot/wrapper.js";
 import { ethersLoginWrapper } from "./evm/wrapper-ethers.js";
 import { minaLoginWrapper } from "./mina/wrapper.js";
 import { availJsLoginWrapper } from "./avail/wrapper.js";
@@ -32,13 +32,12 @@ async function login(loginInfo) {
         case WalletMode.Cardano: {
             return await cardanoLoginWrapper(loginInfo);
         }
-        // TODO: Disabled as these did not compile with deno-vite or deno-fresh
-        // case WalletMode.Polkadot: {
-        //   return await polkadotLoginWrapper(loginInfo);
-        // }
-        // case WalletMode.Algorand: {
-        //   return await algorandLoginWrapper(loginInfo);
-        // }
+        case WalletMode.Polkadot: {
+            return await polkadotLoginWrapper(loginInfo);
+        }
+        case WalletMode.Algorand: {
+            return await algorandLoginWrapper(loginInfo);
+        }
         case WalletMode.Mina: {
             return await minaLoginWrapper(loginInfo);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paimaexample/wallets",
-  "version": "0.3.117",
+  "version": "0.3.120",
   "description": "Your package.",
   "repository": {
     "type": "git",
@@ -21,15 +21,19 @@
   "scripts": {},
   "dependencies": {
     "@aurowallet/mina-provider": "^1.0.12",
+    "@cardano-foundation/cardano-verify-datasignature": "1.0.11",
     "@coderspirit/nominal": "^4.1.1",
-    "@dcspark/cip34-js": "3.0.1",
     "@foxglove/crc": "^1.0.1",
     "@metamask/providers": "^22.1.0",
-    "@midnight-ntwrk/onchain-runtime": "^0.3.0",
+    "@perawallet/connect": "^1.4.2",
+    "@polkadot/extension-dapp": "^0.58.10",
+    "@polkadot/extension-inject": "^0.58.10",
     "@polkadot/util": "^13.4.3",
+    "@polkadot/util-crypto": "^13.4.3",
     "@sinclair/typebox": "0.34.41",
     "@subsquid/ss58-codec": "^1.2.3",
     "abitype": "1.1.0",
+    "algosdk": "^3.4.0",
     "assert-never": "^1.4.0",
     "avail-js-sdk": "^0.4.2",
     "bech32": "^2.0.0",
@@ -41,6 +45,7 @@
     "js-base64": "^3.7.7",
     "js-sha3": "^0.9.3",
     "js-sha512": "^0.9.0",
+    "mina-signer": "^3.0.7",
     "mqtt": "^5.14.0",
     "mqtt-pattern": "^2.1.0",
     "viem": "2.37.3",

package/script/concise/src/batcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batcher.d.ts","sourceRoot":"","sources":["../../../src/concise/src/batcher.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,KAAK,SAAS,EACd,KAAK,cAAc,EAEnB,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAmBhC,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAEjD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,cAAc,EACpC,cAAc,EAAE,aAAa,EAC7B,iBAAiB,EAAE,WAAW,EAC9B,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,GAChB,mBAAmB,CAkBrB;AAED,wDAAwD;AACxD,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,oBAAoB,EAAE,cAAc,EACpC,cAAc,EAAE,aAAa,EAC7B,iBAAiB,EAAE,WAAW,EAC9B,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,MAAM,GAAG,SAAqB,GACrC,cAAc,CAgBhB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM,CAmBnE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,mBAAmB,EAAE,GAC5B;IACD,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;CACd,CAyCA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AACF,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,qBAAqB,EAAE,CA8BzE"}
+{"version":3,"file":"batcher.d.ts","sourceRoot":"","sources":["../../../src/concise/src/batcher.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,KAAK,SAAS,EACd,KAAK,cAAc,EAEnB,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAmBhC,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAEjD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,cAAc,EACpC,cAAc,EAAE,aAAa,EAC7B,iBAAiB,EAAE,WAAW,EAC9B,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,GAChB,mBAAmB,CAYrB;AAED,wDAAwD;AACxD,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,oBAAoB,EAAE,cAAc,EACpC,cAAc,EAAE,aAAa,EAC7B,iBAAiB,EAAE,WAAW,EAC9B,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,MAAM,GAAG,SAAqB,GACrC,cAAc,CAQhB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM,CAOnE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,mBAAmB,EAAE,GAC5B;IACD,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;CACd,CAyCA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AACF,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,qBAAqB,EAAE,CA8BzE"}

package/script/concise/src/batcher.js

@@ -8,20 +8,14 @@ exports.createMessageForBatcher = createMessageForBatcher;
 exports.hashBatchSubunit = hashBatchSubunit;
 exports.buildBatchData = buildBatchData;
 exports.extractBatches = extractBatches;
-const mod_js_1 = require("../../utils/src/mod.js");
+const mod_js_1 = require("../../crypto/src/mod.js");
 const mod_js_2 = require("./v2/mod.js");
 const js_sha3_1 = __importDefault(require("js-sha3"));
-const value_1 = require("@sinclair/typebox/value");
 const { keccak_256 } = js_sha3_1.default;
 function createBatcherSubunit(millisecondTimestamp, _walletAddress, walletAddressType, signature, inputData) {
     let walletAddress;
-    switch (walletAddressType) {
-        case mod_js_1.AddressType.EVM:
-            walletAddress = value_1.Value.Decode(mod_js_1.TypeboxHelpers.Evm.Address, _walletAddress);
-            break;
-        default:
-            throw new Error("NYI: Unsupported wallet address type: " + walletAddressType);
-    }
+    const cryptoManager = mod_js_1.CryptoManager.getCryptoManager(walletAddressType);
+    walletAddress = cryptoManager.decodeAddress(_walletAddress);
     return {
         addressType: walletAddressType,
         address: walletAddress,
@@ -32,14 +26,8 @@ function createBatcherSubunit(millisecondTimestamp, _walletAddress, walletAddres
 }
 /** This is what wallets sign when submitting a batch */
 function createMessageForBatcher(namespace, millisecondTimestamp, _walletAddress, walletAddressType, inputData, target = undefined) {
-    let walletAddress;
-    switch (walletAddressType) {
-        case mod_js_1.AddressType.EVM:
-            walletAddress = value_1.Value.Decode(mod_js_1.TypeboxHelpers.Evm.Address, _walletAddress);
-            break;
-        default:
-            throw new Error("NYI: Unsupported wallet address type: " + walletAddressType);
-    }
+    const cryptoManager = mod_js_1.CryptoManager.getCryptoManager(walletAddressType);
+    const walletAddress = cryptoManager.decodeAddress(_walletAddress);
     return ((namespace ?? "") + (target ?? "") + millisecondTimestamp +
         walletAddress + inputData)
         .replace(/[^a-zA-Z0-9]/g, "-")
@@ -53,14 +41,8 @@ function createMessageForBatcher(namespace, millisecondTimestamp, _walletAddress
  *       So it contains the address indirectly
  */
 function hashBatchSubunit(input) {
-    let walletAddress;
-    switch (input.addressType) {
-        case mod_js_1.AddressType.EVM:
-            walletAddress = value_1.Value.Decode(mod_js_1.TypeboxHelpers.Evm.Address, input.address);
-            break;
-        default:
-            throw new Error("NYI: Unsupported wallet address type: " + input.addressType);
-    }
+    const cryptoManager = mod_js_1.CryptoManager.getCryptoManager(input.addressType);
+    const walletAddress = cryptoManager.decodeAddress(input.address);
     return "0x" +
         keccak_256(walletAddress + input.input + input.timestamp);
 }

package/script/concise/src/delegate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delegate.d.ts","sourceRoot":"","sources":["../../../src/concise/src/delegate.ts"],"names":[],"mappings":"AAQA,OAAO,EACP,WAAW,EAGT,KAAK,UAAU,EAEf,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAGhC,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM;;;;yDAYtD;AAED,eAAO,MAAM,eAAe;8BAEZ,MAAM,iBACH,aAAa,kBACZ,OAAO;2CAOX,MAAM,iBACH,aAAa,gBACd,aAAa,GAAG,IAAI;CAIrC,CAAC;AAWF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,YAAY,UAAU,2BAcvB,CAAC;AAEF,eAAO,MAAM,cAAc;yBACA,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC;4CAKxB,UAAU,6BACT,WAAW,wBAChB,UAAU,yBACT,WAAW,mBACjB,aAAa,eACjB,aAAa,aACf,MAAM,gBACH,OAAO,KACpB,OAAO,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;4BAmDxE,MAAM,KAChB,OAAO,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;8CAc1D,UAAU,6BACT,WAAW,aAC3B,MAAM,kBACD,aAAa,qBACV,WAAW,eACjB,aAAa,GAAG,IAAI,kBACjB,WAAW,GAAG,IAAI,KACjC,OAAO,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAyCvF,CAAC"}
+{"version":3,"file":"delegate.d.ts","sourceRoot":"","sources":["../../../src/concise/src/delegate.ts"],"names":[],"mappings":"AAQA,OAAO,EACP,WAAW,EAGT,KAAK,UAAU,EAEf,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAIhC,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM;;;;yDAYtD;AAED,eAAO,MAAM,eAAe;8BAEZ,MAAM,iBACH,aAAa,kBACZ,OAAO;2CAOX,MAAM,iBACH,aAAa,gBACd,aAAa,GAAG,IAAI;CAIrC,CAAC;AAWF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,YAAY,UAAU,2BAcvB,CAAC;AAEF,eAAO,MAAM,cAAc;yBACA,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC;4CAKxB,UAAU,6BACT,WAAW,wBAChB,UAAU,yBACT,WAAW,mBACjB,aAAa,eACjB,aAAa,aACf,MAAM,gBACH,OAAO,KACpB,OAAO,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;4BAoCxE,MAAM,KAChB,OAAO,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;8CAc1D,UAAU,6BACT,WAAW,aAC3B,MAAM,kBACD,aAAa,qBACV,WAAW,eACjB,aAAa,GAAG,IAAI,kBACjB,WAAW,GAAG,IAAI,KACjC,OAAO,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CA4BvF,CAAC"}

package/script/concise/src/delegate.js

@@ -7,6 +7,7 @@ const accounts_1 = require("viem/accounts");
 const viem_1 = require("viem");
 const mod_js_2 = require("../../utils/src/mod.js");
 const value_1 = require("@sinclair/typebox/value");
+const mod_js_3 = require("../../crypto/src/mod.js");
 function extractDelegateWallet(inputData) {
     const parsed = (0, mod_js_1.parseStmInput)(inputData, mod_js_1.BuiltinGrammar, mod_js_1.KeyedBuiltinGrammar);
     return parsed;
@@ -45,23 +46,10 @@ exports.accountPayload = {
     },
     // TODO This should use the Wallet connector to sign the message
     linkAddress: async (primaryAccountPrivateKey, primaryAccountAddressType, newAccountPrivateKey, newAccountAddressType, _primaryAddress, _newAddress, accountId, isNewPrimary) => {
-        // TODO Unify for any wallet type.
-        let primaryAddress;
-        switch (primaryAccountAddressType) {
-            case mod_js_2.AddressType.EVM:
-                primaryAddress = value_1.Value.Decode(mod_js_2.TypeboxHelpers.Evm.Address, _primaryAddress);
-                break;
-            default:
-                throw new Error("NYI: Primary account address type is not EVM");
-        }
-        let newAddress;
-        switch (newAccountAddressType) {
-            case mod_js_2.AddressType.EVM:
-                newAddress = value_1.Value.Decode(mod_js_2.TypeboxHelpers.Evm.Address, _newAddress);
-                break;
-            default:
-                throw new Error("NYI: New account address type is not EVM");
-        }
+        const primaryCryptoManager = mod_js_3.CryptoManager.getCryptoManager(primaryAccountAddressType);
+        const primaryAddress = primaryCryptoManager.decodeAddress(_primaryAddress);
+        const newCryptoManager = mod_js_3.CryptoManager.getCryptoManager(newAccountAddressType);
+        const newAddress = newCryptoManager.decodeAddress(_newAddress);
         const signatureFromPrimary = await (0, exports.signMessage)(exports.accountMessages.linkAccount(accountId, newAddress, isNewPrimary), primaryAccountPrivateKey);
         const signatureFromNewAddress = await (0, exports.signMessage)(exports.accountMessages.linkAccount(accountId, primaryAddress, isNewPrimary), newAccountPrivateKey);
         return [
@@ -89,26 +77,14 @@ exports.accountPayload = {
     },
     // TODO This should use the Wallet connector to sign the message
     unlinkAddress: async (primaryAccountPrivateKey, primaryAccountAddressType, accountId, _targetAddress, targetAddressType, _newPrimary, newPrimaryType) => {
-        // TODO Unify for any wallet type.
-        let targetAddress;
-        switch (targetAddressType) {
-            case mod_js_2.AddressType.EVM:
-                targetAddress = value_1.Value.Decode(mod_js_2.TypeboxHelpers.Evm.Address, _targetAddress);
-                break;
-            default:
-                throw new Error("NYI: Target address type is not EVM");
-        }
-        let newPrimary = null;
-        if (_newPrimary) {
-            switch (newPrimaryType) {
-                case mod_js_2.AddressType.EVM:
-                    newPrimary = value_1.Value.Decode(mod_js_2.TypeboxHelpers.Evm.Address, _newPrimary);
-                    break;
-                default:
-                    throw new Error("NYI: New primary address type is not EVM");
-            }
+        const targetCryptoManager = mod_js_3.CryptoManager.getCryptoManager(targetAddressType);
+        const targetAddress = targetCryptoManager.decodeAddress(_targetAddress);
+        let newPrimaryAddress = null;
+        if (_newPrimary && newPrimaryType !== null) {
+            const newPrimaryCryptoManager = mod_js_3.CryptoManager.getCryptoManager(newPrimaryType);
+            newPrimaryAddress = newPrimaryCryptoManager.decodeAddress(_newPrimary);
         }
-        const signatureFromPrimary = await (0, exports.signMessage)(exports.accountMessages.unlinkAccountWithPrimary(accountId, targetAddress, newPrimary), primaryAccountPrivateKey);
+        const signatureFromPrimary = await (0, exports.signMessage)(exports.accountMessages.unlinkAccountWithPrimary(accountId, targetAddress, newPrimaryAddress), primaryAccountPrivateKey);
         return [
             mod_js_1.BuiltinGrammarPrefix.unlinkAddress,
             accountId,
@@ -116,7 +92,7 @@ exports.accountPayload = {
             primaryAccountAddressType,
             targetAddress,
             targetAddressType,
-            newPrimary ?? "",
+            newPrimaryAddress ?? "",
             newPrimaryType ?? -1,
         ];
     },

package/script/concise/src/v2/builtins/batcher.d.ts

@@ -11,7 +11,7 @@ export declare const BatcherInnerGrammar: {
     readonly "3": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").AlgorandAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
     readonly "4": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").MinaAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
     readonly "5": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").MidnightAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
-    readonly "7": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").MinaAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
+    readonly "7": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").SubstrateAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
 };
 export declare const KeyedBuiltinBatcherInnerGrammar: import("../types.js").CommandTuples<{
     readonly "-1": readonly [["userAddress", import("@sinclair/typebox").TLiteral<"0x0">], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
@@ -22,6 +22,6 @@ export declare const KeyedBuiltinBatcherInnerGrammar: import("../types.js").Comm
     readonly "3": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").AlgorandAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
     readonly "4": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").MinaAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
     readonly "5": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").MidnightAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
-    readonly "7": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").MinaAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
+    readonly "7": readonly [["userAddress", import("@sinclair/typebox").TUnsafe<import("../../../../utils/src/mod.js").SubstrateAddress>], readonly ["userSignature", import("@sinclair/typebox").TString], readonly ["conciseInput", import("@sinclair/typebox").TString], readonly ["millisecondTimestamp", import("@sinclair/typebox").TString]];
 }>;
 //# sourceMappingURL=batcher.d.ts.map