From 7e37910d9aac3833ba28037044b4420eec420638 Mon Sep 17 00:00:00 2001 From: David Blackstone Date: Mon, 16 Nov 2026 18:42:52 -0500 Subject: [PATCH 1/3] feat(aria-extension): add Aria browser wallet adapter Add @interchain-kit/aria-extension so dApps can connect to the Aria extension: window.aria (Keplr-compatible) for Cosmos chains and window.aria.ethereum for EVM chains. Aria's enable connects the site without checking the chain, so a chain outside Aria's list only fails at getKey with "Unknown chain". The Cosmos wallet asks for the key on connect and suggests the chain then, as an enable failure does for Keplr. --- examples/react/package.json | 1 + examples/react/src/main.tsx | 2 + pnpm-lock.yaml | 14 ++++ wallets/aria-extension/README.md | 41 ++++++++++ .../aria-extension/__tests__/first.test.ts | 78 +++++++++++++++++++ wallets/aria-extension/jest.config.js | 18 +++++ wallets/aria-extension/package.json | 43 ++++++++++ wallets/aria-extension/src/constant.ts | 2 + wallets/aria-extension/src/extension.ts | 17 ++++ wallets/aria-extension/src/index.ts | 14 ++++ wallets/aria-extension/src/registry.ts | 25 ++++++ wallets/aria-extension/tsconfig.esm.json | 9 +++ wallets/aria-extension/tsconfig.json | 9 +++ 13 files changed, 273 insertions(+) create mode 100644 wallets/aria-extension/README.md create mode 100644 wallets/aria-extension/__tests__/first.test.ts create mode 100644 wallets/aria-extension/jest.config.js create mode 100644 wallets/aria-extension/package.json create mode 100644 wallets/aria-extension/src/constant.ts create mode 100644 wallets/aria-extension/src/extension.ts create mode 100644 wallets/aria-extension/src/index.ts create mode 100644 wallets/aria-extension/src/registry.ts create mode 100644 wallets/aria-extension/tsconfig.esm.json create mode 100644 wallets/aria-extension/tsconfig.json diff --git a/examples/react/package.json b/examples/react/package.json index 9c543e732..cb8050276 100644 --- a/examples/react/package.json +++ b/examples/react/package.json @@ -26,6 +26,7 @@ "@cosmjs/crypto": "^0.38.1", "@cosmjs/proto-signing": "^0.38.1", "@esbuild-plugins/node-globals-polyfill": "^0.2.3", + "@interchain-kit/aria-extension": "workspace:*", "@interchain-kit/backpack-extension": "workspace:*", "@interchain-kit/coin98-extension": "workspace:*", "@interchain-kit/compass-extension": "workspace:*", diff --git a/examples/react/src/main.tsx b/examples/react/src/main.tsx index e3b129fe8..770a590de 100644 --- a/examples/react/src/main.tsx +++ b/examples/react/src/main.tsx @@ -34,6 +34,7 @@ import { trustWallet } from '@interchain-kit/trust-extension'; import { leapCosmosExtensionMetaMask } from '@interchain-kit/leap-cosmos-extension-metamask'; import { xdefinWallet } from '@interchain-kit/xdefi-extension'; import { vultisigWallet } from '@interchain-kit/vultisig-extension'; +import { ariaWallet } from '@interchain-kit/aria-extension'; // import { MockWallet } from "@interchain-kit/mock-wallet"; import { metaMaskWallet } from '@interchain-kit/metamask-extension'; import { exodusWallet } from '@interchain-kit/exodus-extension'; @@ -218,6 +219,7 @@ const _wallets: BaseWallet[] = [ // backPackWallet, // solflareWallet, // vultisigWallet, + // ariaWallet, ]; ReactDOM.createRoot(document.getElementById('root')!).render( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 726cfe3f6..ca9c080ff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -214,6 +214,9 @@ importers: '@esbuild-plugins/node-globals-polyfill': specifier: ^0.2.3 version: 0.2.3(esbuild@0.27.3) + '@interchain-kit/aria-extension': + specifier: workspace:* + version: link:../../wallets/aria-extension/dist '@interchain-kit/backpack-extension': specifier: workspace:* version: link:../../wallets/backpack-extension/dist @@ -725,6 +728,17 @@ importers: version: 2.2.12(typescript@5.9.3) publishDirectory: dist + wallets/aria-extension: + dependencies: + '@interchain-kit/core': + specifier: workspace:* + version: link:../../packages/core/dist + devDependencies: + makage: + specifier: ^0.1.12 + version: 0.1.12 + publishDirectory: dist + wallets/backpack-extension: dependencies: '@interchain-kit/core': diff --git a/wallets/aria-extension/README.md b/wallets/aria-extension/README.md new file mode 100644 index 000000000..42f83d81c --- /dev/null +++ b/wallets/aria-extension/README.md @@ -0,0 +1,41 @@ +# @interchain-kit/aria-extension + +Aria browser extension wallet adapter for [Interchain Kit](https://github.com/hyperweb-io/interchain-kit). + +[Aria](https://aria.orchestralabs.org) is a multi-chain wallet by Orchestra Labs. This package connects dApps to `window.aria`, Aria's Keplr-compatible provider, for Cosmos chains, and to `window.aria.ethereum` for EVM chains. + +## Install + +```sh +npm install @interchain-kit/aria-extension @interchain-kit/react +``` + +## Usage + +```tsx +import { ChainProvider } from '@interchain-kit/react'; +import { ariaWallet } from '@interchain-kit/aria-extension'; +import { chain as cosmoshubChain, assetList as cosmoshubAssetList } from 'chain-registry/mainnet/cosmoshub'; + +export function App() { + return ( + + {/* your app */} + + ); +} +``` + +## Requirements + +- [Aria extension](https://chromewebstore.google.com/detail/aria-wallet/cgghllcclkhfpkjhgomhehlebgphifbm) installed (Chrome) + +## How it works + +The adapter detects Aria via `window.aria` and uses the standard `CosmosWallet` implementation (`enable`, `getKey`, `signAmino`, `signDirect`, `signArbitrary`, `sendTx`, etc.) and `EthereumWallet` for EVM chains. + +Aria's `enable` connects the site without checking the chain, so on connect the adapter asks Aria for the account key and, if Aria reports the chain as unknown, suggests it through `experimentalSuggestChain` with the chain's registry data. diff --git a/wallets/aria-extension/__tests__/first.test.ts b/wallets/aria-extension/__tests__/first.test.ts new file mode 100644 index 000000000..927abea8d --- /dev/null +++ b/wallets/aria-extension/__tests__/first.test.ts @@ -0,0 +1,78 @@ +import { CosmosWallet, EthereumWallet } from '@interchain-kit/core'; + +import { AriaCosmosWallet, ariaExtensionInfo, ariaWallet } from '../src'; + +describe('Aria extension', () => { + it('exposes correct wallet metadata', () => { + expect(ariaWallet.info.name).toBe('aria-extension'); + expect(ariaWallet.info.prettyName).toBe('Aria'); + expect(ariaWallet.info.mode).toBe('extension'); + expect(ariaWallet.info.windowKey).toBe('aria'); + expect(ariaWallet.info.cosmosKey).toBe('aria'); + expect(ariaWallet.info.ethereumKey).toBe('aria.ethereum'); + expect(ariaWallet.info.keystoreChange).toBe('aria_keystorechange'); + expect(ariaWallet.info.downloads).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + browser: 'chrome', + link: 'https://chromewebstore.google.com/detail/aria-wallet/cgghllcclkhfpkjhgomhehlebgphifbm', + }), + ]), + ); + }); + + it('uses Aria for Cosmos and EVM chains', () => { + expect(ariaWallet.getWalletByChainType('cosmos')).toBeInstanceOf(AriaCosmosWallet); + expect(ariaWallet.getWalletByChainType('cosmos')).toBeInstanceOf(CosmosWallet); + expect(ariaWallet.getWalletByChainType('eip155')).toBeInstanceOf(EthereumWallet); + }); +}); + +describe('AriaCosmosWallet connect', () => { + const setup = (getKey: jest.Mock, enable = jest.fn().mockResolvedValue(undefined)) => { + const wallet = new AriaCosmosWallet(ariaExtensionInfo); + wallet.client = { enable, getKey }; + const addSuggestChain = jest.spyOn(wallet, 'addSuggestChain').mockResolvedValue(undefined); + return { wallet, enable, addSuggestChain }; + }; + + it('connects to a chain Aria knows without suggesting it', async () => { + const { wallet, enable, addSuggestChain } = setup(jest.fn().mockResolvedValue({})); + + await wallet.connect('cosmoshub-4'); + + expect(enable).toHaveBeenCalledWith('cosmoshub-4'); + expect(addSuggestChain).not.toHaveBeenCalled(); + }); + + it('suggests a chain Aria does not know', async () => { + const { wallet, addSuggestChain } = setup( + jest + .fn() + .mockRejectedValue(new Error('Unknown chain: mychain-1. Add it via experimentalSuggestChain().')), + ); + + await wallet.connect('mychain-1'); + + expect(addSuggestChain).toHaveBeenCalledWith('mychain-1'); + }); + + it('passes other getKey errors through', async () => { + const { wallet, addSuggestChain } = setup(jest.fn().mockRejectedValue(new Error('No accounts found in wallet'))); + + await expect(wallet.connect('cosmoshub-4')).rejects.toThrow('No accounts found in wallet'); + expect(addSuggestChain).not.toHaveBeenCalled(); + }); + + it('does not suggest a chain when the user rejects the connection', async () => { + const getKey = jest.fn(); + const { wallet, addSuggestChain } = setup( + getKey, + jest.fn().mockRejectedValue(new Error('User rejected the connection request')), + ); + + await expect(wallet.connect('cosmoshub-4')).rejects.toThrow('User rejected the connection request'); + expect(getKey).not.toHaveBeenCalled(); + expect(addSuggestChain).not.toHaveBeenCalled(); + }); +}); diff --git a/wallets/aria-extension/jest.config.js b/wallets/aria-extension/jest.config.js new file mode 100644 index 000000000..057a9420e --- /dev/null +++ b/wallets/aria-extension/jest.config.js @@ -0,0 +1,18 @@ +/** @type {import('ts-jest').JestConfigWithTsJest} */ +module.exports = { + preset: 'ts-jest', + testEnvironment: 'node', + transform: { + '^.+\\.tsx?$': [ + 'ts-jest', + { + babelConfig: false, + tsconfig: 'tsconfig.json', + }, + ], + }, + transformIgnorePatterns: [`/node_modules/*`], + testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$', + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'], + modulePathIgnorePatterns: ['dist/*'] +}; diff --git a/wallets/aria-extension/package.json b/wallets/aria-extension/package.json new file mode 100644 index 000000000..23e2bb60e --- /dev/null +++ b/wallets/aria-extension/package.json @@ -0,0 +1,43 @@ +{ + "name": "@interchain-kit/aria-extension", + "version": "0.11.0", + "author": "Orchestra Labs ", + "description": "Aria browser extension wallet adapter for Interchain Kit", + "main": "index.js", + "module": "esm/index.js", + "types": "index.d.ts", + "homepage": "https://github.com/hyperweb-io/interchain-kit", + "license": "MIT", + "publishConfig": { + "access": "public", + "directory": "dist" + }, + "repository": { + "type": "git", + "url": "https://github.com/hyperweb-io/interchain-kit" + }, + "bugs": { + "url": "https://github.com/hyperweb-io/interchain-kit/issues" + }, + "scripts": { + "clean": "makage clean", + "build": "makage build", + "lint": "eslint . --fix", + "test": "jest", + "test:watch": "jest --watch", + "watch:dev": "tsc -w -p tsconfig.esm.json & tsc -w", + "prepack": "npm run build" + }, + "keywords": [ + "aria", + "cosmos", + "wallet", + "interchain-kit" + ], + "dependencies": { + "@interchain-kit/core": "workspace:*" + }, + "devDependencies": { + "makage": "^0.1.12" + } +} diff --git a/wallets/aria-extension/src/constant.ts b/wallets/aria-extension/src/constant.ts new file mode 100644 index 000000000..a4016453a --- /dev/null +++ b/wallets/aria-extension/src/constant.ts @@ -0,0 +1,2 @@ +export const ICON = + 'data:image/png;base64,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'; diff --git a/wallets/aria-extension/src/extension.ts b/wallets/aria-extension/src/extension.ts new file mode 100644 index 000000000..457c18e87 --- /dev/null +++ b/wallets/aria-extension/src/extension.ts @@ -0,0 +1,17 @@ +import { CosmosWallet } from '@interchain-kit/core'; + +// Aria's enable connects the site without checking the chain, so a chain Aria doesn't know +// only fails at getKey ("Unknown chain"). Suggest it then, as enable failing does for Keplr. +export class AriaCosmosWallet extends CosmosWallet { + async connect(chainId: string): Promise { + await super.connect(chainId); + try { + await this.client.getKey(chainId); + } catch (error) { + if (!(error as any)?.message?.includes('Unknown chain')) { + throw error; + } + await this.addSuggestChain(chainId); + } + } +} diff --git a/wallets/aria-extension/src/index.ts b/wallets/aria-extension/src/index.ts new file mode 100644 index 000000000..19dc9fdbf --- /dev/null +++ b/wallets/aria-extension/src/index.ts @@ -0,0 +1,14 @@ +import { EthereumWallet, ExtensionWallet } from '@interchain-kit/core'; + +import { AriaCosmosWallet } from './extension'; +import { ariaExtensionInfo } from './registry'; + +export * from './extension'; +export * from './registry'; + +const ariaWallet = new ExtensionWallet(ariaExtensionInfo); + +ariaWallet.setNetworkWallet('cosmos', new AriaCosmosWallet(ariaExtensionInfo)); +ariaWallet.setNetworkWallet('eip155', new EthereumWallet(ariaExtensionInfo)); + +export { ariaWallet }; diff --git a/wallets/aria-extension/src/registry.ts b/wallets/aria-extension/src/registry.ts new file mode 100644 index 000000000..a8b1d99ed --- /dev/null +++ b/wallets/aria-extension/src/registry.ts @@ -0,0 +1,25 @@ +import { Wallet } from '@interchain-kit/core'; + +import { ICON } from './constant'; + +export const ariaExtensionInfo: Wallet = { + name: 'aria-extension', + prettyName: 'Aria', + logo: ICON, + mode: 'extension', + windowKey: 'aria', + cosmosKey: 'aria', + ethereumKey: 'aria.ethereum', + walletIdentifyKey: 'aria.ethereum.isAria', + keystoreChange: 'aria_keystorechange', + downloads: [ + { + device: 'desktop', + browser: 'chrome', + link: 'https://chromewebstore.google.com/detail/aria-wallet/cgghllcclkhfpkjhgomhehlebgphifbm', + }, + { + link: 'https://aria.orchestralabs.org', + }, + ], +}; diff --git a/wallets/aria-extension/tsconfig.esm.json b/wallets/aria-extension/tsconfig.esm.json new file mode 100644 index 000000000..800d7506d --- /dev/null +++ b/wallets/aria-extension/tsconfig.esm.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "dist/esm", + "module": "es2022", + "rootDir": "src/", + "declaration": false + } +} diff --git a/wallets/aria-extension/tsconfig.json b/wallets/aria-extension/tsconfig.json new file mode 100644 index 000000000..1a9d5696c --- /dev/null +++ b/wallets/aria-extension/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src/" + }, + "include": ["src/**/*.ts"], + "exclude": ["dist", "node_modules", "**/*.spec.*", "**/*.test.*"] +} From 5bfe508c55222a424a3e3c603036fa5571e65a17 Mon Sep 17 00:00:00 2001 From: David Blackstone Date: Mon, 16 Nov 2026 23:30:19 -0500 Subject: [PATCH 2/3] feat(aria-extension): Solana through window.aria.solana Aria injects a Phantom-style Solana provider at window.aria.solana. The adapter registered only Cosmos and EVM, so a Solana chain failed with: Unsupported chain type: "solana". --- wallets/aria-extension/README.md | 4 ++-- wallets/aria-extension/__tests__/first.test.ts | 6 ++++-- wallets/aria-extension/src/index.ts | 3 ++- wallets/aria-extension/src/registry.ts | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/wallets/aria-extension/README.md b/wallets/aria-extension/README.md index 42f83d81c..34ea33650 100644 --- a/wallets/aria-extension/README.md +++ b/wallets/aria-extension/README.md @@ -2,7 +2,7 @@ Aria browser extension wallet adapter for [Interchain Kit](https://github.com/hyperweb-io/interchain-kit). -[Aria](https://aria.orchestralabs.org) is a multi-chain wallet by Orchestra Labs. This package connects dApps to `window.aria`, Aria's Keplr-compatible provider, for Cosmos chains, and to `window.aria.ethereum` for EVM chains. +[Aria](https://aria.orchestralabs.org) is a multi-chain wallet by Orchestra Labs. This package connects dApps to `window.aria`, Aria's Keplr-compatible provider, for Cosmos chains, to `window.aria.ethereum` for EVM chains, and to `window.aria.solana` for Solana. ## Install @@ -36,6 +36,6 @@ export function App() { ## How it works -The adapter detects Aria via `window.aria` and uses the standard `CosmosWallet` implementation (`enable`, `getKey`, `signAmino`, `signDirect`, `signArbitrary`, `sendTx`, etc.) and `EthereumWallet` for EVM chains. +The adapter detects Aria via `window.aria` and uses the standard `CosmosWallet` implementation (`enable`, `getKey`, `signAmino`, `signDirect`, `signArbitrary`, `sendTx`, etc.) `EthereumWallet` for EVM chains, and `SolanaWallet` for Solana. Aria's `enable` connects the site without checking the chain, so on connect the adapter asks Aria for the account key and, if Aria reports the chain as unknown, suggests it through `experimentalSuggestChain` with the chain's registry data. diff --git a/wallets/aria-extension/__tests__/first.test.ts b/wallets/aria-extension/__tests__/first.test.ts index 927abea8d..50c02fdfd 100644 --- a/wallets/aria-extension/__tests__/first.test.ts +++ b/wallets/aria-extension/__tests__/first.test.ts @@ -1,4 +1,4 @@ -import { CosmosWallet, EthereumWallet } from '@interchain-kit/core'; +import { CosmosWallet, EthereumWallet, SolanaWallet } from '@interchain-kit/core'; import { AriaCosmosWallet, ariaExtensionInfo, ariaWallet } from '../src'; @@ -10,6 +10,7 @@ describe('Aria extension', () => { expect(ariaWallet.info.windowKey).toBe('aria'); expect(ariaWallet.info.cosmosKey).toBe('aria'); expect(ariaWallet.info.ethereumKey).toBe('aria.ethereum'); + expect(ariaWallet.info.solanaKey).toBe('aria.solana'); expect(ariaWallet.info.keystoreChange).toBe('aria_keystorechange'); expect(ariaWallet.info.downloads).toEqual( expect.arrayContaining([ @@ -21,10 +22,11 @@ describe('Aria extension', () => { ); }); - it('uses Aria for Cosmos and EVM chains', () => { + it('uses Aria for Cosmos, EVM and Solana chains', () => { expect(ariaWallet.getWalletByChainType('cosmos')).toBeInstanceOf(AriaCosmosWallet); expect(ariaWallet.getWalletByChainType('cosmos')).toBeInstanceOf(CosmosWallet); expect(ariaWallet.getWalletByChainType('eip155')).toBeInstanceOf(EthereumWallet); + expect(ariaWallet.getWalletByChainType('solana')).toBeInstanceOf(SolanaWallet); }); }); diff --git a/wallets/aria-extension/src/index.ts b/wallets/aria-extension/src/index.ts index 19dc9fdbf..aeb4883da 100644 --- a/wallets/aria-extension/src/index.ts +++ b/wallets/aria-extension/src/index.ts @@ -1,4 +1,4 @@ -import { EthereumWallet, ExtensionWallet } from '@interchain-kit/core'; +import { EthereumWallet, ExtensionWallet, SolanaWallet } from '@interchain-kit/core'; import { AriaCosmosWallet } from './extension'; import { ariaExtensionInfo } from './registry'; @@ -10,5 +10,6 @@ const ariaWallet = new ExtensionWallet(ariaExtensionInfo); ariaWallet.setNetworkWallet('cosmos', new AriaCosmosWallet(ariaExtensionInfo)); ariaWallet.setNetworkWallet('eip155', new EthereumWallet(ariaExtensionInfo)); +ariaWallet.setNetworkWallet('solana', new SolanaWallet(ariaExtensionInfo)); export { ariaWallet }; diff --git a/wallets/aria-extension/src/registry.ts b/wallets/aria-extension/src/registry.ts index a8b1d99ed..61b6ca7df 100644 --- a/wallets/aria-extension/src/registry.ts +++ b/wallets/aria-extension/src/registry.ts @@ -10,6 +10,7 @@ export const ariaExtensionInfo: Wallet = { windowKey: 'aria', cosmosKey: 'aria', ethereumKey: 'aria.ethereum', + solanaKey: 'aria.solana', walletIdentifyKey: 'aria.ethereum.isAria', keystoreChange: 'aria_keystorechange', downloads: [ From 030740eb30d6faa85a81efed87a2262a7eff6eb9 Mon Sep 17 00:00:00 2001 From: David Blackstone Date: Tue, 17 Nov 2026 00:46:52 -0500 Subject: [PATCH 3/3] feat(aria-extension): Solana connect sets the chain's cluster in Aria SolanaWallet's sign methods name no chain, so Aria simulated and sent every Solana request on mainnet. Connect now calls Aria's changeCluster with the chain's cluster: the one its RPC names (as Solana's wallet adapter reads an endpoint), else its genesis-hash chain ID, else mainnet. --- wallets/aria-extension/README.md | 2 + .../aria-extension/__tests__/first.test.ts | 52 ++++++++++++++++++- wallets/aria-extension/src/extension.ts | 30 ++++++++++- wallets/aria-extension/src/index.ts | 6 +-- 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/wallets/aria-extension/README.md b/wallets/aria-extension/README.md index 34ea33650..1971eeb99 100644 --- a/wallets/aria-extension/README.md +++ b/wallets/aria-extension/README.md @@ -39,3 +39,5 @@ export function App() { The adapter detects Aria via `window.aria` and uses the standard `CosmosWallet` implementation (`enable`, `getKey`, `signAmino`, `signDirect`, `signArbitrary`, `sendTx`, etc.) `EthereumWallet` for EVM chains, and `SolanaWallet` for Solana. Aria's `enable` connects the site without checking the chain, so on connect the adapter asks Aria for the account key and, if Aria reports the chain as unknown, suggests it through `experimentalSuggestChain` with the chain's registry data. + +On Solana, connect first tells Aria the chain's cluster (`changeCluster`): devnet or testnet when the chain's RPC names one, as Solana's wallet adapter reads an endpoint, else the cluster of its genesis-hash chain ID, else mainnet. Aria then simulates and sends that chain's transactions on that cluster, and refuses a cluster it has no RPCs for, such as a local validator. diff --git a/wallets/aria-extension/__tests__/first.test.ts b/wallets/aria-extension/__tests__/first.test.ts index 50c02fdfd..aa0636b85 100644 --- a/wallets/aria-extension/__tests__/first.test.ts +++ b/wallets/aria-extension/__tests__/first.test.ts @@ -1,6 +1,6 @@ import { CosmosWallet, EthereumWallet, SolanaWallet } from '@interchain-kit/core'; -import { AriaCosmosWallet, ariaExtensionInfo, ariaWallet } from '../src'; +import { AriaCosmosWallet, ariaExtensionInfo, AriaSolanaWallet, ariaWallet, solanaCluster } from '../src'; describe('Aria extension', () => { it('exposes correct wallet metadata', () => { @@ -26,6 +26,7 @@ describe('Aria extension', () => { expect(ariaWallet.getWalletByChainType('cosmos')).toBeInstanceOf(AriaCosmosWallet); expect(ariaWallet.getWalletByChainType('cosmos')).toBeInstanceOf(CosmosWallet); expect(ariaWallet.getWalletByChainType('eip155')).toBeInstanceOf(EthereumWallet); + expect(ariaWallet.getWalletByChainType('solana')).toBeInstanceOf(AriaSolanaWallet); expect(ariaWallet.getWalletByChainType('solana')).toBeInstanceOf(SolanaWallet); }); }); @@ -78,3 +79,52 @@ describe('AriaCosmosWallet connect', () => { expect(addSuggestChain).not.toHaveBeenCalled(); }); }); + +describe('AriaSolanaWallet connect', () => { + const solanaChain = (chainId: string | undefined, rpc?: string): any => ({ + chainName: `solana-${chainId}`, + chainType: 'solana', + chainId, + ...(rpc ? { apis: { rpc: [{ address: rpc }] } } : {}), + }); + const setup = (chains: any[], changeCluster = jest.fn().mockResolvedValue({})) => { + const wallet = new AriaSolanaWallet(ariaExtensionInfo); + wallet.setChainMap(chains); + const connect = jest.fn().mockResolvedValue({ publicKey: 'So1' }); + wallet.solana = { changeCluster, connect }; + return { wallet, changeCluster, connect }; + }; + + // interchain-kit's example names its devnet chain by testnet's genesis hash, on the devnet RPC + it("sets the chain's cluster in Aria before connecting", async () => { + const chain = solanaChain('4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z', 'https://api.devnet.solana.com'); + const { wallet, changeCluster, connect } = setup([chain]); + + await wallet.connect(chain.chainId); + + expect(changeCluster).toHaveBeenCalledWith('devnet'); + expect(changeCluster.mock.invocationCallOrder[0]).toBeLessThan(connect.mock.invocationCallOrder[0]); + }); + + it('a chain Aria has no RPCs for is refused, and the site is not connected', async () => { + const chain = solanaChain('local', 'http://localhost:8899'); + const refusal = Object.assign(new Error('Aria has no Solana cluster solana:localnet.'), { code: -32602 }); + const { wallet, connect } = setup([chain], jest.fn().mockRejectedValue(refusal)); + + await expect(wallet.connect(chain.chainId)).rejects.toThrow('Aria has no Solana cluster solana:localnet.'); + expect(connect).not.toHaveBeenCalled(); + }); + + it.each([ + ['the RPC names devnet', 'devnet', solanaChain('x', 'https://devnet.helius-rpc.com/?api-key=k')], + ['the RPC names testnet', 'testnet', solanaChain('x', 'https://api.testnet.solana.com')], + ['a local RPC', 'localnet', solanaChain('x', 'http://127.0.0.1:8899')], + ['the devnet genesis hash', 'devnet', solanaChain('EtWTRABZaYq6iMfeYKouRu166VU2xqa1')], + ['the testnet CAIP-2 ID', 'testnet', solanaChain('solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z')], + ['the mainnet genesis hash', 'mainnet', solanaChain('5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp')], + ["a mainnet provider's RPC", 'mainnet', solanaChain(undefined, 'https://mainnet.helius-rpc.com')], + ['no chain at all', 'mainnet', undefined], + ])('%s: %s', (_, cluster, chain) => { + expect(solanaCluster(chain, chain?.chainId)).toBe(cluster); + }); +}); diff --git a/wallets/aria-extension/src/extension.ts b/wallets/aria-extension/src/extension.ts index 457c18e87..72b8f41ae 100644 --- a/wallets/aria-extension/src/extension.ts +++ b/wallets/aria-extension/src/extension.ts @@ -1,4 +1,6 @@ -import { CosmosWallet } from '@interchain-kit/core'; +import { CosmosWallet, SolanaWallet } from '@interchain-kit/core'; + +type Chain = ReturnType; // Aria's enable connects the site without checking the chain, so a chain Aria doesn't know // only fails at getKey ("Unknown chain"). Suggest it then, as enable failing does for Keplr. @@ -15,3 +17,29 @@ export class AriaCosmosWallet extends CosmosWallet { } } } + +// Solana's clusters by genesis hash, the reference in their CAIP-2 chain IDs +const GENESIS_CLUSTERS: Record = { + '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': 'mainnet', + EtWTRABZaYq6iMfeYKouRu166VU2xqa1: 'devnet', + '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z': 'testnet', +}; + +/** The cluster a Solana chain transacts on: its RPC's, read as Solana's wallet adapter reads an + * endpoint, else its genesis hash, else mainnet. */ +export function solanaCluster(chain: Chain | undefined, chainId: string | undefined): string { + const rpc = chain?.apis?.rpc?.[0]?.address ?? ''; + if (/\bdevnet\b/.test(rpc)) return 'devnet'; + if (/\btestnet\b/.test(rpc)) return 'testnet'; + if (/\/\/(localhost|127\.0\.0\.1)\b/.test(rpc)) return 'localnet'; + return GENESIS_CLUSTERS[(chainId ?? '').replace(/^solana:/, '').slice(0, 32)] ?? 'mainnet'; +} + +// Aria sends each window.aria.solana request on the cluster changeCluster set. SolanaWallet's sign +// methods name no chain, so connect sets the chain's cluster for the requests after it. +export class AriaSolanaWallet extends SolanaWallet { + async connect(chainId: Chain['chainId']): Promise { + await this.solana.changeCluster(solanaCluster(this.chainMap.get(chainId), chainId)); + await super.connect(chainId); + } +} diff --git a/wallets/aria-extension/src/index.ts b/wallets/aria-extension/src/index.ts index aeb4883da..a7e292905 100644 --- a/wallets/aria-extension/src/index.ts +++ b/wallets/aria-extension/src/index.ts @@ -1,6 +1,6 @@ -import { EthereumWallet, ExtensionWallet, SolanaWallet } from '@interchain-kit/core'; +import { EthereumWallet, ExtensionWallet } from '@interchain-kit/core'; -import { AriaCosmosWallet } from './extension'; +import { AriaCosmosWallet, AriaSolanaWallet } from './extension'; import { ariaExtensionInfo } from './registry'; export * from './extension'; @@ -10,6 +10,6 @@ const ariaWallet = new ExtensionWallet(ariaExtensionInfo); ariaWallet.setNetworkWallet('cosmos', new AriaCosmosWallet(ariaExtensionInfo)); ariaWallet.setNetworkWallet('eip155', new EthereumWallet(ariaExtensionInfo)); -ariaWallet.setNetworkWallet('solana', new SolanaWallet(ariaExtensionInfo)); +ariaWallet.setNetworkWallet('solana', new AriaSolanaWallet(ariaExtensionInfo)); export { ariaWallet };