Skip to content

Commit

Permalink
Merge branch 'main' of github.com:cosmology-tech/cosmos-kit
Browse files Browse the repository at this point in the history
  • Loading branch information
liujun93 committed Sep 15, 2023
2 parents 60eedef + 0cde489 commit ed60791
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 30 deletions.
2 changes: 1 addition & 1 deletion packages/core/src/types/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export interface Wallet {
connectEventNamesOnWindow?: string[];
connectEventNamesOnClient?: string[];
downloads?: DownloadInfo[];
logo?: string;
logo?: string | { major: string; minor: string };
walletconnect?: {
name: string;
projectId: string;
Expand Down
1 change: 0 additions & 1 deletion packages/example/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ function MyApp({ Component, pageProps }: AppProps) {
...frontierWallets,
...coin98Wallets,
...finWallets,
...leapCosmosMetamask,
]}
throwErrors={false}
subscribeConnectEvents={false}
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/modal/components/views/WalletList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function DynamicWalletList({ wallets, onClose }: DynamicWalletListProps) {
};
}, []);

const walletsData: ConnectModalWalletListProps['wallets'] = useMemo(
const walletsData = useMemo(
() =>
wallets
.sort((a, b) => {
Expand All @@ -61,9 +61,9 @@ function DynamicWalletList({ wallets, onClose }: DynamicWalletListProps) {
wallet.walletInfo.mode === 'wallet-connect'
? 'walletConnect'
: undefined,
btmLogo: wallet.walletInfo.extends,
btmLogo: typeof wallet.walletInfo.logo === 'object' ? wallet.walletInfo.logo.minor : wallet.walletInfo.extends,
badge: ({ MetaMask: 'SNAP' })[wallet.walletInfo.extends],
shape: i < 2 && isLargeScreen ? 'square' : 'list',
shape: (i < 2 && isLargeScreen ? 'square' : 'list') as ('square' | 'list'),
downloadUrl: '',
originalWallet: wallet,
};
Expand Down
21 changes: 10 additions & 11 deletions packages/react/src/modal/components/views/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,22 @@ export type ModalViewImplGetter = (
props: WalletViewProps | WalletListViewProps
) => ModalViewImpl;

export const defaultModalViews: Record<keyof ModalViews, ModalViewImplGetter> =
{
Connecting: ConnectingView,
Connected: ConnectedView,
Error: ErrorView,
NotExist: NotExistView,
Rejected: RejectedView,
QRCode: QRCodeView,
WalletList: WalletListView,
};
export const defaultModalViews: Record<keyof ModalViews, ModalViewImplGetter> = {
Connecting: ConnectingView,
Connected: ConnectedView,
Error: ErrorView,
NotExist: NotExistView,
Rejected: RejectedView,
QRCode: QRCodeView,
WalletList: WalletListView,
};

export function getWalletProp(wallet: Wallet) {
const { prettyName, mode, name, logo, mobileDisabled } = wallet;
return {
name,
prettyName,
logo,
logo: typeof logo === 'object' ? logo.major : logo,
mobileDisabled:
typeof mobileDisabled === 'boolean' ? mobileDisabled : mobileDisabled(),
isMobile: mode === 'wallet-connect',
Expand Down
2 changes: 1 addition & 1 deletion wallets/leap-metamask-cosmos-snap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"dependencies": {
"@chain-registry/keplr": "1.8.0",
"@cosmos-kit/core": "^2.6.2",
"@leapwallet/cosmos-snap-provider": "0.1.21",
"@leapwallet/cosmos-snap-provider": "0.1.22",
"@metamask/providers": "^11.1.1"
},
"peerDependencies": {
Expand Down
5 changes: 4 additions & 1 deletion wallets/leap-metamask-cosmos-snap/src/constant.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
export const ICON =
export const LEAP_LOGO =
'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODA1IiBoZWlnaHQ9IjgwNSIgdmlld0JveD0iMCAwIDgwNSA4MDUiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMF8yMzY0XzMzNzU1KSI+CjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMV8yMzY0XzMzNzU1KSI+CjxwYXRoIGQ9Ik03MTIuMzEgMzczLjU3NUM3MTIuMzEgNDg3LjAzOSA1NzcuMzU1IDUzMy4xNDcgNDA5Ljc5MSA1MzMuMTQ3QzI0Mi4yMjYgNTMzLjE0NyAxMDUuMzA3IDQ4Ny4wMzkgMTA1LjMwNyAzNzMuNTc1QzEwNS4zMDcgMjYwLjExMSAyNDEuMjQ0IDE2OC4yOTcgNDA4LjgwOCAxNjguMjk3QzU3Ni4zNzMgMTY4LjI5NyA3MTIuMzEgMjYwLjMxMSA3MTIuMzEgMzczLjU3NVoiIGZpbGw9IiM0QkFGNzQiLz4KPHBhdGggZD0iTTY4MS41MTMgMTI2LjU0NEM2ODEuNTEzIDY2LjgwNDkgNjMzLjk3NSAxOC4yOTE5IDU3NS40MzUgMTguMjkxOUM1NDIuNDMzIDE4LjI5MTkgNTEyLjk2NyAzMy43Mjc5IDQ5My41MTkgNTcuNzgzOUM0NjcgNTEuNzY5OSA0MzguNzEyIDQ4LjM2MTkgNDA5LjQ0MiA0OC4zNjE5QzM4MC4xNzMgNDguMzYxOSAzNTEuODg1IDUxLjU2OTQgMzI1LjM2NSA1Ny43ODM5QzMwNS43MjEgMzMuNzI3OSAyNzYuMjU1IDE4LjI5MTkgMjQzLjQ0OSAxOC4yOTE5QzE4NC45MSAxOC4yOTE5IDEzNy4zNzEgNjYuODA0OSAxMzcuMzcxIDEyNi41NDRDMTM3LjM3MSAxNDYuMTkgMTQyLjQ3OSAxNjQuNDMyIDE1MS4zMTggMTgwLjI2OUMxNDIuODcxIDE5OC43MTIgMTM4LjM1MyAyMTguMzU4IDEzOC4zNTMgMjM4LjgwNUMxMzguMzUzIDM0NC4wNTEgMjU5Ljc1NCA0MjkuMjQ5IDQwOS40NDIgNDI5LjI0OUM1NTkuMTMxIDQyOS4yNDkgNjgwLjUzMSAzNDQuMDUxIDY4MC41MzEgMjM4LjgwNUM2ODAuNTMxIDIxOC4zNTggNjc2LjAxMyAxOTguNzEyIDY2Ny41NjYgMTgwLjI2OUM2NzYuNDA2IDE2NC40MzIgNjgxLjUxMyAxNDYuMTkgNjgxLjUxMyAxMjYuNTQ0WiIgZmlsbD0iIzMyREE2RCIvPgo8cGF0aCBkPSJNMjM0LjkgMTg2Ljc2NkMyNzAuNzAyIDE4Ni43NjYgMjk5LjcyNSAxNTcuMTQ4IDI5OS43MjUgMTIwLjYxMkMyOTkuNzI1IDg0LjA3NjMgMjcwLjcwMiA1NC40NTgxIDIzNC45IDU0LjQ1ODFDMTk5LjA5OCA1NC40NTgxIDE3MC4wNzQgODQuMDc2MyAxNzAuMDc0IDEyMC42MTJDMTcwLjA3NCAxNTcuMTQ4IDE5OS4wOTggMTg2Ljc2NiAyMzQuOSAxODYuNzY2WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTU4MC43OTggMTg2Ljc2NkM2MTYuNiAxODYuNzY2IDY0NS42MjQgMTU3LjE0OCA2NDUuNjI0IDEyMC42MTJDNjQ1LjYyNCA4NC4wNzYzIDYxNi42IDU0LjQ1ODEgNTgwLjc5OCA1NC40NTgxQzU0NC45OTYgNTQuNDU4MSA1MTUuOTczIDg0LjA3NjMgNTE1Ljk3MyAxMjAuNjEyQzUxNS45NzMgMTU3LjE0OCA1NDQuOTk2IDE4Ni43NjYgNTgwLjc5OCAxODYuNzY2WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTIwMC4yODggNTI1LjM1MUMyMTQuMjM1IDUyNS4zNTEgMjI1LjIzNiA1MTIuOTIyIDIyMy42NjQgNDk4Ljg5QzIxNy45NjcgNDQ5LjE3NCAxOTMuODA1IDM0MS41MjMgODcuNTMwMyAyNzYuNzcyQy01My45MDc0IDE5MC41NzEgNTguMDY0MSA0ODcuMjYyIDU4LjA2NDEgNDg3LjI2MkwyOC43OTQzIDUwNC41MDNDMTguOTcyMyA1MTAuMzE2IDIzLjA5NzUgNTI1LjM1MSAzNC4yOTQ3IDUyNS4zNTFIMjAwLjI4OFoiIGZpbGw9IiMzMkRBNkQiLz4KPHBhdGggZD0iTTYyMi4zNDMgNTI1LjM1MUM2MDkuNzcxIDUyNS4zNTEgNTk5Ljk0OSA1MTIuOTIyIDYwMS4zMjQgNDk4Ljg5QzYwNi4yMzUgNDQ5LjM3NCA2MjguMjM2IDM0MS41MjMgNzI0LjEgMjc2Ljc3MkM4NTEuOTgzIDE5MC41NzEgNzUwLjgxNiA0ODcuMjYyIDc1MC44MTYgNDg3LjI2Mkw3NzcuMzM1IDUwNC41MDNDNzg2LjE3NSA1MTAuMzE2IDc4Mi40NDMgNTI1LjM1MSA3NzIuNDI0IDUyNS4zNTFINjIyLjM0M1oiIGZpbGw9IiMzMkRBNkQiLz4KPHBhdGggZD0iTTIzNS4wMTcgMTMyLjI4OEMyNDEuNTI2IDEzMi4yODggMjQ2LjgwMyAxMjYuOTAzIDI0Ni44MDMgMTIwLjI2QzI0Ni44MDMgMTEzLjYxNyAyNDEuNTI2IDEwOC4yMzIgMjM1LjAxNyAxMDguMjMyQzIyOC41MDcgMTA4LjIzMiAyMjMuMjMgMTEzLjYxNyAyMjMuMjMgMTIwLjI2QzIyMy4yMyAxMjYuOTAzIDIyOC41MDcgMTMyLjI4OCAyMzUuMDE3IDEzMi4yODhaIiBmaWxsPSIjMEQwRDBEIi8+CjxwYXRoIGQ9Ik01ODAuNTg5IDEzMi4yODhDNTg3LjA5OSAxMzIuMjg4IDU5Mi4zNzYgMTI2LjkwMyA1OTIuMzc2IDEyMC4yNkM1OTIuMzc2IDExMy42MTcgNTg3LjA5OSAxMDguMjMyIDU4MC41ODkgMTA4LjIzMkM1NzQuMDggMTA4LjIzMiA1NjguODAzIDExMy42MTcgNTY4LjgwMyAxMjAuMjZDNTY4LjgwMyAxMjYuOTAzIDU3NC4wOCAxMzIuMjg4IDU4MC41ODkgMTMyLjI4OFoiIGZpbGw9IiMwRDBEMEQiLz4KPC9nPgo8cmVjdCB5PSI1ODYiIHdpZHRoPSI4MDUiIGhlaWdodD0iMzEwIiBmaWxsPSIjQUM0QkZGIi8+CjwvZz4KPGRlZnM+CjxjbGlwUGF0aCBpZD0iY2xpcDBfMjM2NF8zMzc1NSI+CjxyZWN0IHdpZHRoPSI4MDUiIGhlaWdodD0iODA1IiByeD0iMTQ0LjkiIGZpbGw9IndoaXRlIi8+CjwvY2xpcFBhdGg+CjxjbGlwUGF0aCBpZD0iY2xpcDFfMjM2NF8zMzc1NSI+CjxyZWN0IHdpZHRoPSI3NzIuOCIgaGVpZ2h0PSI1MTUuMiIgZmlsbD0id2hpdGUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE2IDE4KSIvPgo8L2NsaXBQYXRoPgo8L2RlZnM+Cjwvc3ZnPgo=';

export const METAMASK_LOGO =
'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI3LjAuMSwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiCgkgdmlld0JveD0iMCAwIDIwNC44IDE5Mi40IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyMDQuOCAxOTIuNDsiIHhtbDpzcGFjZT0icHJlc2VydmUiPgo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLnN0MHtkaXNwbGF5Om5vbmU7fQoJLnN0MXtmaWxsOiNGNTg0MUY7fQoJLnN0MntmaWxsOiNFMjc2MjU7fQoJLnN0M3tmaWxsOiNEN0MxQjM7fQoJLnN0NHtmaWxsOiMyRjM0M0I7fQoJLnN0NXtmaWxsOiNDQzYyMjg7fQoJLnN0NntmaWxsOiNDMEFEOUU7fQoJLnN0N3tmaWxsOiM3NjNFMUE7fQo8L3N0eWxlPgo8ZyBpZD0iYmdfeDI4X2RvX25vdF9leHBvcnRfeDI5XyIgY2xhc3M9InN0MCI+CjwvZz4KPGcgaWQ9Ik1NX0hlYWRfYmFja2dyb3VuZF9feDI4X0RvX25vdF9lZGl0X3gyOV8iPgoJPGc+CgkJPHBhdGggY2xhc3M9InN0MSIgZD0iTTE2Ny40LDk2LjFsNi45LTguMWwtMy0yLjJsNC44LTQuNGwtMy43LTIuOGw0LjgtMy42bC0zLjEtMi40bDUtMjQuNGwtNy42LTIyLjYgTTE3MS41LDI1LjZsLTQ4LjgsMTguMWwwLDAKCQkJbDAsMEg4MmwwLDBMMzMuMiwyNS42bDAuMywwLjJsLTAuMy0wLjJsLTcuNiwyMi42bDUuMSwyNC40TDI3LjUsNzVsNC45LDMuNmwtMy43LDIuOGw0LjgsNC40bC0zLDIuMmw2LjksOC4xbC0xMC41LDMyLjRoMGwwLDAKCQkJbDkuNywzMy4xbDM0LjEtOS40bDAtMC4xbDAsMC4xbDAsMGwwLDBsMCwwdjBsMCwwbDAsMGwwLDBsNi42LDUuNGwxMy41LDkuMmgyMy4xbDEzLjUtOS4ybDYuNi01LjRsMCwwdjBsMCwwbDAsMGwzNC4yLDkuNAoJCQlsOS44LTMzLjFsMCwwaDBsLTEwLjYtMzIuNCBNNzAuNywxNTIuMUw3MC43LDE1Mi4xTDcwLjcsMTUyLjEiLz4KCTwvZz4KPC9nPgo8ZyBpZD0iTG9nb3MiPgoJPGc+CgkJPHBvbHlnb24gY2xhc3M9InN0MiIgcG9pbnRzPSIxNzEuNSwyNS42IDExMS42LDY5LjcgMTIyLjcsNDMuNyAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDIiIHBvaW50cz0iMzMuMiwyNS42IDkyLjYsNzAuMSA4Miw0My43IAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0MiIgcG9pbnRzPSIxNTAsMTI3LjkgMTM0LDE1Mi4xIDE2OC4yLDE2MS41IDE3OCwxMjguNCAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDIiIHBvaW50cz0iMjYuOSwxMjguNCAzNi42LDE2MS41IDcwLjcsMTUyLjEgNTQuOCwxMjcuOSAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDIiIHBvaW50cz0iNjguOSw4Ni45IDU5LjQsMTAxLjIgOTMuMiwxMDIuNyA5Mi4xLDY2LjUgCQkiLz4KCQk8cG9seWdvbiBjbGFzcz0ic3QyIiBwb2ludHM9IjEzNS45LDg2LjkgMTEyLjMsNjYuMSAxMTEuNiwxMDIuNyAxNDUuNCwxMDEuMiAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDIiIHBvaW50cz0iNzAuNywxNTIuMSA5MS4yLDE0Mi4zIDczLjUsMTI4LjcgCQkiLz4KCQk8cG9seWdvbiBjbGFzcz0ic3QyIiBwb2ludHM9IjExMy42LDE0Mi4zIDEzNCwxNTIuMSAxMzEuMiwxMjguNyAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDMiIHBvaW50cz0iMTM0LDE1Mi4xIDExMy42LDE0Mi4zIDExNS4zLDE1NS41IDExNS4xLDE2MS4xIAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0MyIgcG9pbnRzPSI3MC43LDE1Mi4xIDg5LjcsMTYxLjEgODkuNiwxNTUuNSA5MS4yLDE0Mi4zIAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0NCIgcG9pbnRzPSI5MCwxMTkuOSA3My4xLDExNSA4NS4xLDEwOS41IAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0NCIgcG9pbnRzPSIxMTQuNywxMTkuOSAxMTkuNywxMDkuNSAxMzEuNywxMTUgCQkiLz4KCQk8cG9seWdvbiBjbGFzcz0ic3Q1IiBwb2ludHM9IjcwLjcsMTUyLjEgNzMuNywxMjcuOSA1NC44LDEyOC40IAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0NSIgcG9pbnRzPSIxMzEuMSwxMjcuOSAxMzQsMTUyLjEgMTUwLDEyOC40IAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0NSIgcG9pbnRzPSIxNDUuNCwxMDEuMiAxMTEuNiwxMDIuNyAxMTQuNywxMTkuOSAxMTkuNywxMDkuNSAxMzEuNywxMTUgCQkiLz4KCQk8cG9seWdvbiBjbGFzcz0ic3Q1IiBwb2ludHM9IjczLjEsMTE1IDg1LjEsMTA5LjUgOTAsMTE5LjkgOTMuMiwxMDIuNyA1OS40LDEwMS4yIAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0MiIgcG9pbnRzPSI1OS40LDEwMS4yIDczLjUsMTI4LjcgNzMuMSwxMTUgCQkiLz4KCQk8cG9seWdvbiBjbGFzcz0ic3QyIiBwb2ludHM9IjEzMS43LDExNSAxMzEuMiwxMjguNyAxNDUuNCwxMDEuMiAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDIiIHBvaW50cz0iOTMuMiwxMDIuNyA5MCwxMTkuOSA5NCwxNDAuMyA5NC45LDExMy41IAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0MiIgcG9pbnRzPSIxMTEuNiwxMDIuNyAxMDkuOSwxMTMuNCAxMTAuNywxNDAuMyAxMTQuNywxMTkuOSAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDEiIHBvaW50cz0iMTE0LjcsMTE5LjkgMTEwLjcsMTQwLjMgMTEzLjYsMTQyLjMgMTMxLjIsMTI4LjcgMTMxLjcsMTE1IAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSI3My4xLDExNSA3My41LDEyOC43IDkxLjIsMTQyLjMgOTQsMTQwLjMgOTAsMTE5LjkgCQkiLz4KCQk8cG9seWdvbiBjbGFzcz0ic3Q2IiBwb2ludHM9IjExNS4xLDE2MS4xIDExNS4zLDE1NS41IDExMy43LDE1NC4yIDkxLDE1NC4yIDg5LjYsMTU1LjUgODkuNywxNjEuMSA3MC43LDE1Mi4xIDc3LjMsMTU3LjUgCgkJCTkwLjgsMTY2LjggMTEzLjksMTY2LjggMTI3LjQsMTU3LjUgMTM0LDE1Mi4xIAkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0NCIgcG9pbnRzPSIxMTMuNiwxNDIuMyAxMTAuNywxNDAuMyA5NCwxNDAuMyA5MS4yLDE0Mi4zIDg5LjYsMTU1LjUgOTEsMTU0LjIgMTEzLjcsMTU0LjIgMTE1LjMsMTU1LjUgCQkiLz4KCQk8cG9seWdvbiBjbGFzcz0ic3Q3IiBwb2ludHM9IjE3NC4xLDcyLjYgMTc5LjEsNDguMiAxNzEuNSwyNS42IDExMy42LDY4LjIgMTM1LjksODYuOSAxNjcuNCw5Ni4xIDE3NC4zLDg4IDE3MS4zLDg1LjggMTc2LjEsODEuNSAKCQkJMTcyLjQsNzguNiAxNzcuMiw3NSAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDciIHBvaW50cz0iMjUuNiw0OC4yIDMwLjcsNzIuNiAyNy41LDc1IDMyLjMsNzguNyAyOC42LDgxLjUgMzMuNCw4NS44IDMwLjQsODggMzcuNCw5Ni4xIDY4LjksODYuOSA5MS4yLDY4LjIgCgkJCTMzLjIsMjUuNiAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDEiIHBvaW50cz0iMTY3LjQsOTYuMSAxMzUuOSw4Ni45IDE0NS40LDEwMS4yIDEzMS4yLDEyOC43IDE1MCwxMjguNCAxNzgsMTI4LjQgCQkiLz4KCQk8cG9seWdvbiBjbGFzcz0ic3QxIiBwb2ludHM9IjY4LjksODYuOSAzNy40LDk2LjEgMjYuOSwxMjguNCA1NC44LDEyOC40IDczLjUsMTI4LjcgNTkuNCwxMDEuMiAJCSIvPgoJCTxwb2x5Z29uIGNsYXNzPSJzdDEiIHBvaW50cz0iMTExLjYsMTAyLjcgMTEzLjYsNjguMiAxMjIuNyw0My43IDgyLDQzLjcgOTEuMiw2OC4yIDkzLjIsMTAyLjcgOTQsMTEzLjUgOTQsMTQwLjMgMTEwLjcsMTQwLjMgCgkJCTExMC44LDExMy41IAkJIi8+Cgk8L2c+CjwvZz4KPC9zdmc+Cg=='
16 changes: 11 additions & 5 deletions wallets/leap-metamask-cosmos-snap/src/extension/client.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AminoSignResponse, OfflineAminoSigner, StdSignature, StdSignDoc } from '@cosmjs/amino';
import { Algo, DirectSignResponse } from '@cosmjs/proto-signing';
import { SignType } from '@cosmos-kit/core';
import { ChainRecord, SignType } from '@cosmos-kit/core';
import { SignOptions, WalletClient } from '@cosmos-kit/core';

import { ChainInfo, CosmjsOfflineSigner, experimentalSuggestChain, signArbitrary } from '@leapwallet/cosmos-snap-provider';
Expand Down Expand Up @@ -82,11 +82,11 @@ export class CosmosSnapClient implements WalletClient {
authInfoBytes?: Uint8Array | null;
chainId?: string | null;
accountNumber?: ProviderLong | null;
}) {
}): Promise<DirectSignResponse> {
const signature = (requestSignature(
chainId,
signer,
signDoc // @ts-nocheck
signDoc
) as unknown) as DirectSignResponse;

const accountNumber = signDoc.accountNumber;
Expand All @@ -100,7 +100,7 @@ export class CosmosSnapClient implements WalletClient {
signature: signature.signature,
signed: {
...signature.signed,
accountNumber: `${modifiedAccountNumber.toString()}`,
accountNumber: modifiedAccountNumber,
authInfoBytes: new Uint8Array(
Object.values(signature.signed.authInfoBytes)
),
Expand All @@ -121,7 +121,13 @@ export class CosmosSnapClient implements WalletClient {
)) as unknown as StdSignature;
}

async addChain(chainInfo: ChainInfo) {
async addChain(chainRecord: ChainRecord): Promise<void> {
const chainInfo: ChainInfo = {
chainId: chainRecord?.chain?.chain_id,
chainName: chainRecord?.chain?.chain_name,
bip44: { coinType: chainRecord?.chain?.slip44 },
bech32Config: { bech32PrefixAccAddr: chainRecord?.chain?.bech32_prefix },
}
await experimentalSuggestChain(chainInfo);
}
}
6 changes: 3 additions & 3 deletions wallets/leap-metamask-cosmos-snap/src/extension/registry.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Wallet } from '@cosmos-kit/core';

import { ICON } from '../constant';
import { LEAP_LOGO, METAMASK_LOGO } from '../constant';

export const metamaskCosmosSnapInfo: Wallet = {
name: 'leap-metamask-cosmos-snap',
description:
'The Leap Cosmos MetaMask Snap allows signing of Cosmos transactions using MetaMask.',
prettyName: 'Leap Cosmos MetaMask Snap',
logo: ICON,
prettyName: 'Leap Cosmos MetaMask',
logo: { major: METAMASK_LOGO, minor: LEAP_LOGO },
mode: 'extension',
extends: 'MetaMask',
mobileDisabled: () => !('ethereum' in window),
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3039,10 +3039,10 @@
big-integer "^1.6.48"
utility-types "^3.10.0"

"@leapwallet/[email protected].20":
version "0.1.20"
resolved "https://registry.yarnpkg.com/@leapwallet/cosmos-snap-provider/-/cosmos-snap-provider-0.1.20.tgz#b0c36f3b0e2cfa441769c6ed93bd4238f62a66d4"
integrity sha512-VUoxun5prJdLTjkCRU3EBLwx2CNnvYnP9deSiffwCx4lQQzcN38gSIHs3rfXpdyLdPv1jIi6nVVsqIVKFzvB1w==
"@leapwallet/[email protected].22":
version "0.1.22"
resolved "https://registry.yarnpkg.com/@leapwallet/cosmos-snap-provider/-/cosmos-snap-provider-0.1.22.tgz#684bf04c23721268803ae9fea7a88c6d3bbbea27"
integrity sha512-4shW8JU6bRMwY1HGey7dQeFnL7yL1bU9V8wJ1Y6LcFv2XDxQx3pNpaXsmUNAcf3G/EViZkdrFm++KmmDmLAyIA==
dependencies:
"@cosmjs/amino" "^0.31.0"
"@cosmjs/proto-signing" "^0.31.0"
Expand Down

0 comments on commit ed60791

Please sign in to comment.