Merge pull request #22 from cosmos/merge-main

Merge main
cosmos · Sep 27, 2023 · f8f1b62 · f8f1b62
2 parents 5f893ff + 7e1a67a
commit f8f1b62
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 93 deletions.
diff --git a/packages/snap/package.json b/packages/snap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmsnap/snap",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "The Cosmos extension for your Metamask wallet.",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@cosmjs/proto-signing": "^0.30.1",
-    "@cosmjs/stargate": "^0.30.1",
+    "@cosmjs/stargate": "^0.31.1",
     "@metamask/snaps-types": "^0.32.2",
     "@metamask/snaps-ui": "^0.32.2",
     "buffer": "^6.0.3",

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -1,13 +1,13 @@
 {
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Cosmos Extension that adds Cosmos support to Metamask.",
   "proposedName": "Cosmos Extension",
   "repository": {
     "type": "git",
     "url": "https://github.com/cosmos/snap.git"
   },
   "source": {
-    "shasum": "G6BNnjUBiC+8a0LSrhRyG/mffBn3hYTTO2Uk1mk49I4=",
+    "shasum": "O3k1mxMGVbP98FqhLnd57TJxwMWUsG+W0YwDNMrJpnY=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/snap/src/index.ts b/packages/snap/src/index.ts
@@ -417,9 +417,9 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
       ]
 
       signDocAmino.msgs.map(item => {
-        ui.push(heading(item.type)),
-        ui.push(text(JSON.stringify(bigintReplacer(item.value), null, 2))),
-        ui.push(divider())
+        uiAmino.push(heading(item.type)),
+        uiAmino.push(text(JSON.stringify(bigintReplacer(item.value), null, 2))),
+        uiAmino.push(divider())
       });
 
       // Ensure user confirms transaction

diff --git a/packages/snapper/package.json b/packages/snapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmsnap/snapper",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "A helper package with utilities to interact with the Cosmos Extension for MetaMask.",
   "repository": {
     "type": "git",

diff --git a/packages/snapper/src/provider.ts b/packages/snapper/src/provider.ts
@@ -43,7 +43,7 @@ export interface SnapProvider {
     chainId: string,
     tx: Uint8Array,
   ): Promise<DeliverTxResponse>;
-  getOfflineSigner(chainId: string): OfflineAminoSigner & OfflineDirectSigner;
+  getOfflineSigner(chainId: string, mode: string): OfflineAminoSigner & OfflineDirectSigner;
   getKey(chainId: string): Promise<Key>
   enable(): Promise<boolean>;
   getChains(): Promise<Chain[]>;
@@ -169,7 +169,15 @@ export class CosmosSnap implements SnapProvider {
         let res = await sendTx(chainId, tx, this.snap_id);
         return res
     }
-    getOfflineSigner(chainId: string): OfflineAminoSigner & OfflineDirectSigner {
-        return new CosmJSOfflineSigner(chainId, this.snap_id);
+    getOfflineSigner(chainId: string, mode = 'direct'): OfflineAminoSigner & OfflineDirectSigner {
+        if (mode == 'amino') {
+            let signer = new CosmJSOfflineSigner(chainId, this.snap_id);
+            signer.signDirect = undefined;
+            return signer
+        } else {
+            let signer = new CosmJSOfflineSigner(chainId, this.snap_id);
+            signer.signAmino = undefined;
+            return signer
+        }
     }
 }
diff --git a/packages/snapper/src/signer.ts b/packages/snapper/src/signer.ts
@@ -3,8 +3,9 @@ import { AccountData, AminoSignResponse, StdSignDoc } from '@cosmjs/amino';
 import { OfflineDirectSigner } from '@cosmjs/proto-signing';
 import { getAccountInfo, signAmino, signDirect, DEFAULT_SNAP_ID } from './snap.js';
 import Long from 'long';
+import { OfflineAminoSigner } from '@cosmjs/amino';
 
-export class CosmJSOfflineSigner implements OfflineDirectSigner {
+export class CosmJSOfflineSigner implements OfflineDirectSigner, OfflineAminoSigner {
   readonly chainId: string;
   readonly snapId: string;
 

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -37,7 +37,7 @@
 	"dependencies": {
 		"@cosmjs/crypto": "^0.31.1",
 		"@cosmjs/stargate": "^0.31.1",
-		"@cosmsnap/snapper": "^0.1.25",
+		"@cosmsnap/snapper": "^0.1.26",
 		"@keplr-wallet/types": "0.12.12",
 		"@metamask/detect-provider": "^2.0.0",
 		"@sveltejs/adapter-node": "^1.3.1",

diff --git a/packages/ui/src/components/Transfer.svelte b/packages/ui/src/components/Transfer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { chains } from "../store/chains";
 	import Info from "./Info.svelte";
-	import { balances } from "../store/balances";
+	import { balances, forceUpdate } from "../store/balances";
   import { getSkipRecommendation, getMsgs, type CoinIBC } from '../utils/ibc';
 	import { state } from "../store/state";
 	import type { Chain, Msg } from "@cosmsnap/snapper";
@@ -12,6 +12,7 @@
 	import ChainSelector from "./ChainSelector.svelte";
   import { sendTxAlert } from "@cosmsnap/snapper";
   import Select from "./Select.svelte";
+	import { snapId } from "../utils/snap";
   
   let loading = false;
   let source = "cosmoshub-4";
@@ -114,7 +115,8 @@
             
             if (tx.code == 0) {
               await addTransaction({address: fromAddress, chain: source, when: new Date().toLocaleString(), tx_hash: tx.transactionHash});
-              await sendTxAlert(source, tx.transactionHash);
+              await sendTxAlert(source, tx.transactionHash, snapId);
+              forceUpdate();
             } else {
               if (tx.rawLog) {
                 $state.alertText = tx.rawLog
@@ -160,11 +162,12 @@
                   typeUrl: item.msg_type_url
               };
           });
-          const tx = await window.cosmos.signAndBroadcast(source, messages, fees);
+          const tx = await client.signAndBroadcast(fromAddress, messages, fees);
 
           if (tx.code == 0) {
             await addTransaction({address: fromAddress, chain: source, when: new Date().toDateString(), tx_hash: tx.transactionHash});
-            //await sendTxAlert(source, tx.transactionHash);
+            await sendTxAlert(source, tx.transactionHash, snapId);
+            forceUpdate();
           } else {
             if (tx.rawLog) {
               $state.alertText = tx.rawLog

diff --git a/packages/ui/src/store/balances.ts b/packages/ui/src/store/balances.ts
@@ -15,16 +15,21 @@ export interface ChainBalances extends Chain {
 // Store to hold a loading state
 export const isLoading: Writable<boolean> = writable(false);
 
+export let forceUpdate: () => void;
+
 // The derived balances store
 export const balances: Readable<ChainBalances[]> = derived(
     chains,
     ($chains, set: (value: ChainBalances[]) => void) => {
+        forceUpdate = () => {
+            updateBalances($chains, set);
+        }
         updateBalances($chains, set);
     },
     [] as ChainBalances[]
 );
 
-const updateBalances = async ($chains: Chain[], set: (value: ChainBalances[]) => void): Promise<void> => {
+export const updateBalances = async ($chains: Chain[], set: (value: ChainBalances[]) => void): Promise<void> => {
     isLoading.set(true);
     try {
         const res = await fetch(`${denoUrl}/balances`, {

diff --git a/packages/ui/yarn.lock b/packages/ui/yarn.lock
@@ -263,14 +263,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cosmsnap/snapper@npm:^0.1.25":
-  version: 0.1.25
-  resolution: "@cosmsnap/snapper@npm:0.1.25"
+"@cosmsnap/snapper@npm:^0.1.26":
+  version: 0.1.26
+  resolution: "@cosmsnap/snapper@npm:0.1.26"
   dependencies:
     "@keplr-wallet/proto-types": 0.12.12
     "@keplr-wallet/types": 0.12.12
     ses: ^0.18.4
-  checksum: 65f23e43e880c1d8f2fff7f3716a7b178f5e0e1c963eb8753e93a0cbb5ba92b581417dd92c530c746132a44dc4fb34aab2fc9e49602d7280ba3c331f353ece4e
+  checksum: f549a790ea3867cdf973d691e2628f452c2bbf49a2a2997a6032be1ac74bed42d6c22929aa066bf2b73f191dc91fda309ba6a40716988e30056216a3ba9f530a
   languageName: node
   linkType: hard
 
@@ -280,7 +280,7 @@ __metadata:
   dependencies:
     "@cosmjs/crypto": ^0.31.1
     "@cosmjs/stargate": ^0.31.1
-    "@cosmsnap/snapper": ^0.1.25
+    "@cosmsnap/snapper": ^0.1.26
     "@fullhuman/postcss-purgecss": ^5.0.0
     "@keplr-wallet/types": 0.12.12
     "@metamask/detect-provider": ^2.0.0

diff --git a/yarn.lock b/yarn.lock
@@ -1679,16 +1679,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cosmjs/json-rpc@npm:^0.30.1":
-  version: 0.30.1
-  resolution: "@cosmjs/json-rpc@npm:0.30.1"
-  dependencies:
-    "@cosmjs/stream": ^0.30.1
-    xstream: ^11.14.0
-  checksum: 750686d53cd4ee239fd24a41d556ab08307f099c9f7bb633a566af417b0baad0ff954498272b6bdb02d4cad596c7ac8f24e38f0cf25c7fbe6200b539c2f56266
-  languageName: node
-  linkType: hard
-
 "@cosmjs/json-rpc@npm:^0.31.1":
   version: 0.31.1
   resolution: "@cosmjs/json-rpc@npm:0.31.1"
@@ -1798,18 +1788,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cosmjs/socket@npm:^0.30.1":
-  version: 0.30.1
-  resolution: "@cosmjs/socket@npm:0.30.1"
-  dependencies:
-    "@cosmjs/stream": ^0.30.1
-    isomorphic-ws: ^4.0.1
-    ws: ^7
-    xstream: ^11.14.0
-  checksum: ef5e5d7bbcd89b5bfbd6fa4039133e15e5db848e6b0bc812b89872d28d9ced73d8a12fbf6581e6b0b08de28f2c1a9c7b05825804be65eb07d2f3d3532babea91
-  languageName: node
-  linkType: hard
-
 "@cosmjs/socket@npm:^0.31.1":
   version: 0.31.1
   resolution: "@cosmjs/socket@npm:0.31.1"
@@ -1842,26 +1820,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cosmjs/stargate@npm:^0.30.1":
-  version: 0.30.1
-  resolution: "@cosmjs/stargate@npm:0.30.1"
-  dependencies:
-    "@confio/ics23": ^0.6.8
-    "@cosmjs/amino": ^0.30.1
-    "@cosmjs/encoding": ^0.30.1
-    "@cosmjs/math": ^0.30.1
-    "@cosmjs/proto-signing": ^0.30.1
-    "@cosmjs/stream": ^0.30.1
-    "@cosmjs/tendermint-rpc": ^0.30.1
-    "@cosmjs/utils": ^0.30.1
-    cosmjs-types: ^0.7.1
-    long: ^4.0.0
-    protobufjs: ~6.11.3
-    xstream: ^11.14.0
-  checksum: 2eb089c4a7f995b787702d52f22e1c808704cd02c29ec4feee57897d350d9dbde645785e89bf34181da7acd67547dc2b0f17f9f49cfbb0272d70cb7f553a8644
-  languageName: node
-  linkType: hard
-
 "@cosmjs/stargate@npm:^0.31.1":
   version: 0.31.1
   resolution: "@cosmjs/stargate@npm:0.31.1"
@@ -1891,15 +1849,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cosmjs/stream@npm:^0.30.1":
-  version: 0.30.1
-  resolution: "@cosmjs/stream@npm:0.30.1"
-  dependencies:
-    xstream: ^11.14.0
-  checksum: f9e48a8377c2d3cfbf288fcf4fad745905c042dabc442d2cbb93d4280033e3c8e493a3328f58c0b645b60f9c2188d14603b2bb37a174bc0619686c5e70b13dca
-  languageName: node
-  linkType: hard
-
 "@cosmjs/stream@npm:^0.31.1":
   version: 0.31.1
   resolution: "@cosmjs/stream@npm:0.31.1"
@@ -1927,24 +1876,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cosmjs/tendermint-rpc@npm:^0.30.1":
-  version: 0.30.1
-  resolution: "@cosmjs/tendermint-rpc@npm:0.30.1"
-  dependencies:
-    "@cosmjs/crypto": ^0.30.1
-    "@cosmjs/encoding": ^0.30.1
-    "@cosmjs/json-rpc": ^0.30.1
-    "@cosmjs/math": ^0.30.1
-    "@cosmjs/socket": ^0.30.1
-    "@cosmjs/stream": ^0.30.1
-    "@cosmjs/utils": ^0.30.1
-    axios: ^0.21.2
-    readonly-date: ^1.0.0
-    xstream: ^11.14.0
-  checksum: 6900711886d2d9b02dd9ec17d341a174d7d2a20c432618e96d7f33fa6732dcb77fe21f37c67d452c09095f099260a679a4ac5de0caeec376cd683d3d12790ed8
-  languageName: node
-  linkType: hard
-
 "@cosmjs/tendermint-rpc@npm:^0.31.1":
   version: 0.31.1
   resolution: "@cosmjs/tendermint-rpc@npm:0.31.1"
@@ -2023,7 +1954,7 @@ __metadata:
   resolution: "@cosmsnap/snap@workspace:packages/snap"
   dependencies:
     "@cosmjs/proto-signing": ^0.30.1
-    "@cosmjs/stargate": ^0.30.1
+    "@cosmjs/stargate": ^0.31.1
     "@keplr-wallet/proto-types": 0.12.12
     "@lavamoat/allow-scripts": ^2.0.3
     "@metamask/auto-changelog": ^2.6.0