Merge branch 'develop' into delivan/fix-starknet-ledger-issue-in-qa

chainapsis · Dec 2, 2024 · 007b3e7 · 007b3e7
2 parents 4d96207 + 9b6701a
commit 007b3e7
Show file tree

Hide file tree

Showing 41 changed files with 376 additions and 351 deletions.
diff --git a/apps/extension/package.json b/apps/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/extension",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "author": "chainapsis",
   "license": "Apache-2.0",
   "private": true,
@@ -26,31 +26,31 @@
     "@ethersproject/transactions": "^5.7.0",
     "@floating-ui/react": "^0.23.0",
     "@floating-ui/react-dom": "^1.3.0",
-    "@keplr-wallet/analytics": "0.12.158-rc.1",
-    "@keplr-wallet/background": "0.12.158-rc.1",
-    "@keplr-wallet/chain-validator": "0.12.158-rc.1",
-    "@keplr-wallet/common": "0.12.158-rc.1",
-    "@keplr-wallet/cosmos": "0.12.158-rc.1",
-    "@keplr-wallet/crypto": "0.12.158-rc.1",
-    "@keplr-wallet/hooks": "0.12.158-rc.1",
-    "@keplr-wallet/hooks-internal": "0.12.158-rc.1",
-    "@keplr-wallet/hooks-starknet": "0.12.158-rc.1",
-    "@keplr-wallet/ledger-cosmos": "0.12.158-rc.1",
-    "@keplr-wallet/popup": "0.12.158-rc.1",
-    "@keplr-wallet/proto-types": "0.12.158-rc.1",
-    "@keplr-wallet/provider": "0.12.158-rc.1",
-    "@keplr-wallet/router": "0.12.158-rc.1",
-    "@keplr-wallet/router-extension": "0.12.158-rc.1",
-    "@keplr-wallet/simple-fetch": "0.12.158-rc.1",
-    "@keplr-wallet/stores": "0.12.158-rc.1",
-    "@keplr-wallet/stores-core": "0.12.158-rc.1",
-    "@keplr-wallet/stores-etc": "0.12.158-rc.1",
-    "@keplr-wallet/stores-eth": "0.12.158-rc.1",
-    "@keplr-wallet/stores-ibc": "0.12.158-rc.1",
-    "@keplr-wallet/stores-internal": "0.12.158-rc.1",
-    "@keplr-wallet/stores-starknet": "0.12.158-rc.1",
-    "@keplr-wallet/types": "0.12.158-rc.1",
-    "@keplr-wallet/unit": "0.12.158-rc.1",
+    "@keplr-wallet/analytics": "0.12.158-rc.2",
+    "@keplr-wallet/background": "0.12.158-rc.2",
+    "@keplr-wallet/chain-validator": "0.12.158-rc.2",
+    "@keplr-wallet/common": "0.12.158-rc.2",
+    "@keplr-wallet/cosmos": "0.12.158-rc.2",
+    "@keplr-wallet/crypto": "0.12.158-rc.2",
+    "@keplr-wallet/hooks": "0.12.158-rc.2",
+    "@keplr-wallet/hooks-internal": "0.12.158-rc.2",
+    "@keplr-wallet/hooks-starknet": "0.12.158-rc.2",
+    "@keplr-wallet/ledger-cosmos": "0.12.158-rc.2",
+    "@keplr-wallet/popup": "0.12.158-rc.2",
+    "@keplr-wallet/proto-types": "0.12.158-rc.2",
+    "@keplr-wallet/provider": "0.12.158-rc.2",
+    "@keplr-wallet/router": "0.12.158-rc.2",
+    "@keplr-wallet/router-extension": "0.12.158-rc.2",
+    "@keplr-wallet/simple-fetch": "0.12.158-rc.2",
+    "@keplr-wallet/stores": "0.12.158-rc.2",
+    "@keplr-wallet/stores-core": "0.12.158-rc.2",
+    "@keplr-wallet/stores-etc": "0.12.158-rc.2",
+    "@keplr-wallet/stores-eth": "0.12.158-rc.2",
+    "@keplr-wallet/stores-ibc": "0.12.158-rc.2",
+    "@keplr-wallet/stores-internal": "0.12.158-rc.2",
+    "@keplr-wallet/stores-starknet": "0.12.158-rc.2",
+    "@keplr-wallet/types": "0.12.158-rc.2",
+    "@keplr-wallet/unit": "0.12.158-rc.2",
     "@keystonehq/animated-qr": "^0.8.6",
     "@keystonehq/hw-app-base": "0.1.1",
     "@keystonehq/hw-transport-webusb": "0.4.0",

diff --git a/apps/extension/src/pages/sign/components/ledger-guide-box.tsx b/apps/extension/src/pages/sign/components/ledger-guide-box.tsx
@@ -16,7 +16,7 @@ import { PlainObject } from "@keplr-wallet/background";
 import { FormattedMessage, useIntl } from "react-intl";
 
 export const LedgerGuideBox: FunctionComponent<{
-  data?: {
+  data: {
     keyInsensitive: PlainObject;
     isEthereum: boolean;
   };

diff --git a/apps/extension/src/pages/starknet/components/account-activation-modal/index.tsx b/apps/extension/src/pages/starknet/components/account-activation-modal/index.tsx
@@ -21,6 +21,7 @@ import { Column, Columns } from "../../../../components/column";
 import {
   SubmitStarknetTxHashMsg,
   GetStarknetKeyParamsSelectedMsg,
+  PlainObject,
 } from "@keplr-wallet/background";
 import { InExtensionMessageRequester } from "@keplr-wallet/router-extension";
 import { BACKGROUND_PORT, KeplrError } from "@keplr-wallet/router";
@@ -56,12 +57,18 @@ export const AccountActivationModal: FunctionComponent<{
   chainId: string;
 
   onAccountDeployed?: () => void;
-}> = observer(({ close, goBack, chainId, onAccountDeployed }) => {
+
+  data?: {
+    keyInsensitive: PlainObject;
+    isEthereum: boolean;
+  };
+}> = observer(({ close, goBack, chainId, onAccountDeployed, data }) => {
   const {
     chainStore,
     accountStore,
     starknetQueriesStore,
     starknetAccountStore,
+    keyRingStore,
   } = useStore();
 
   const theme = useTheme();
@@ -320,6 +327,12 @@ export const AccountActivationModal: FunctionComponent<{
           disableClick
         />
         <LedgerGuideBox
+          data={
+            data || {
+              keyInsensitive: keyRingStore.selectedKeyInfo!.insensitive,
+              isEthereum: false,
+            }
+          }
           isLedgerInteracting={isLedgerInteracting}
           ledgerInteractingError={ledgerInteractingError}
           isInternal={true}

diff --git a/apps/extension/src/pages/starknet/sign/message/view.tsx b/apps/extension/src/pages/starknet/sign/message/view.tsx
@@ -289,6 +289,10 @@ export const SignStarknetMessageView: FunctionComponent<{
         <div style={{ marginTop: "0.75rem", flex: 1 }} />
 
         <LedgerGuideBox
+          data={{
+            keyInsensitive: interactionData.data.keyInsensitive,
+            isEthereum: false,
+          }}
           isLedgerInteracting={isLedgerInteracting}
           ledgerInteractingError={ledgerInteractingError}
           isInternal={interactionData.isInternal}

diff --git a/apps/extension/src/pages/starknet/sign/tx/view.tsx b/apps/extension/src/pages/starknet/sign/tx/view.tsx
@@ -601,6 +601,10 @@ export const SignStarknetTxView: FunctionComponent<{
         />
 
         <LedgerGuideBox
+          data={{
+            keyInsensitive: interactionData.data.keyInsensitive,
+            isEthereum: false,
+          }}
           isLedgerInteracting={isLedgerInteracting}
           ledgerInteractingError={ledgerInteractingError}
           isInternal={interactionData.isInternal}
@@ -616,6 +620,10 @@ export const SignStarknetTxView: FunctionComponent<{
         }}
       >
         <AccountActivationModal
+          data={{
+            keyInsensitive: interactionData.data.keyInsensitive,
+            isEthereum: false,
+          }}
           close={() => setIsAccountActivationModalOpen(false)}
           onAccountDeployed={() => {
             // account가 deploy 되었을때 gas simulator를 refresh한다.

diff --git a/apps/hooks-internal/package.json b/apps/hooks-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/hooks-internal",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -14,11 +14,11 @@
     "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
   },
   "dependencies": {
-    "@keplr-wallet/hooks": "0.12.158-rc.1",
-    "@keplr-wallet/stores": "0.12.158-rc.1",
-    "@keplr-wallet/stores-internal": "0.12.158-rc.1",
-    "@keplr-wallet/types": "0.12.158-rc.1",
-    "@keplr-wallet/unit": "0.12.158-rc.1"
+    "@keplr-wallet/hooks": "0.12.158-rc.2",
+    "@keplr-wallet/stores": "0.12.158-rc.2",
+    "@keplr-wallet/stores-internal": "0.12.158-rc.2",
+    "@keplr-wallet/types": "0.12.158-rc.2",
+    "@keplr-wallet/unit": "0.12.158-rc.2"
   },
   "peerDependencies": {
     "mobx": "^6",

diff --git a/apps/mobile/package.json b/apps/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/mobile",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "private": true,
   "installConfig": {
     "hoistingLimits": "workspaces"

diff --git a/apps/stores-internal/package.json b/apps/stores-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/stores-internal",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -14,12 +14,12 @@
     "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
   },
   "dependencies": {
-    "@keplr-wallet/common": "0.12.158-rc.1",
-    "@keplr-wallet/cosmos": "0.12.158-rc.1",
-    "@keplr-wallet/simple-fetch": "0.12.158-rc.1",
-    "@keplr-wallet/stores": "0.12.158-rc.1",
-    "@keplr-wallet/types": "0.12.158-rc.1",
-    "@keplr-wallet/unit": "0.12.158-rc.1",
+    "@keplr-wallet/common": "0.12.158-rc.2",
+    "@keplr-wallet/cosmos": "0.12.158-rc.2",
+    "@keplr-wallet/simple-fetch": "0.12.158-rc.2",
+    "@keplr-wallet/stores": "0.12.158-rc.2",
+    "@keplr-wallet/types": "0.12.158-rc.2",
+    "@keplr-wallet/unit": "0.12.158-rc.2",
     "joi": "^17.5.0",
     "utility-types": "^3.10.0"
   },

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "useWorkspaces": true,
   "npmClient": "yarn",
   "command": {

diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/analytics",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",

diff --git a/packages/background/package.json b/packages/background/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/background",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -28,17 +28,17 @@
     "@ethersproject/hash": "^5.7.0",
     "@ethersproject/transactions": "^5.7.0",
     "@ethersproject/wallet": "^5.7.0",
-    "@keplr-wallet/chain-validator": "0.12.158-rc.1",
-    "@keplr-wallet/common": "0.12.158-rc.1",
-    "@keplr-wallet/cosmos": "0.12.158-rc.1",
-    "@keplr-wallet/crypto": "0.12.158-rc.1",
-    "@keplr-wallet/ledger-cosmos": "0.12.158-rc.1",
-    "@keplr-wallet/popup": "0.12.158-rc.1",
-    "@keplr-wallet/proto-types": "0.12.158-rc.1",
-    "@keplr-wallet/router": "0.12.158-rc.1",
-    "@keplr-wallet/simple-fetch": "0.12.158-rc.1",
-    "@keplr-wallet/types": "0.12.158-rc.1",
-    "@keplr-wallet/unit": "0.12.158-rc.1",
+    "@keplr-wallet/chain-validator": "0.12.158-rc.2",
+    "@keplr-wallet/common": "0.12.158-rc.2",
+    "@keplr-wallet/cosmos": "0.12.158-rc.2",
+    "@keplr-wallet/crypto": "0.12.158-rc.2",
+    "@keplr-wallet/ledger-cosmos": "0.12.158-rc.2",
+    "@keplr-wallet/popup": "0.12.158-rc.2",
+    "@keplr-wallet/proto-types": "0.12.158-rc.2",
+    "@keplr-wallet/router": "0.12.158-rc.2",
+    "@keplr-wallet/simple-fetch": "0.12.158-rc.2",
+    "@keplr-wallet/types": "0.12.158-rc.2",
+    "@keplr-wallet/unit": "0.12.158-rc.2",
     "@ledgerhq/hw-app-eth": "^6.40.3",
     "@ledgerhq/hw-app-starknet": "^2.4.0",
     "@ledgerhq/hw-transport": "^6.31.4",

diff --git a/packages/chain-validator/package.json b/packages/chain-validator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/chain-validator",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.7.0",
-    "@keplr-wallet/cosmos": "0.12.158-rc.1",
-    "@keplr-wallet/simple-fetch": "0.12.158-rc.1",
-    "@keplr-wallet/types": "0.12.158-rc.1",
+    "@keplr-wallet/cosmos": "0.12.158-rc.2",
+    "@keplr-wallet/simple-fetch": "0.12.158-rc.2",
+    "@keplr-wallet/types": "0.12.158-rc.2",
     "joi": "^17.5.0",
     "utility-types": "^3.10.0"
   }

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/common",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -16,8 +16,8 @@
     "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
   },
   "dependencies": {
-    "@keplr-wallet/crypto": "0.12.158-rc.1",
-    "@keplr-wallet/types": "0.12.158-rc.1",
+    "@keplr-wallet/crypto": "0.12.158-rc.2",
+    "@keplr-wallet/types": "0.12.158-rc.2",
     "buffer": "^6.0.3",
     "delay": "^4.4.0"
   }

diff --git a/packages/cosmjs-test/package.json b/packages/cosmjs-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmjs-test",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "author": "chainapsis",
   "license": "Apache-2.0",
   "private": true,
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@cosmjs/stargate": "^0.29.3",
-    "@keplr-wallet/provider-mock": "0.12.158-rc.1",
+    "@keplr-wallet/provider-mock": "0.12.158-rc.2",
     "secretjs": "^1.6.0"
   }
 }
diff --git a/packages/cosmos/package.json b/packages/cosmos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/cosmos",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@ethersproject/address": "^5.6.0",
-    "@keplr-wallet/common": "0.12.158-rc.1",
-    "@keplr-wallet/crypto": "0.12.158-rc.1",
-    "@keplr-wallet/proto-types": "0.12.158-rc.1",
-    "@keplr-wallet/simple-fetch": "0.12.158-rc.1",
-    "@keplr-wallet/types": "0.12.158-rc.1",
-    "@keplr-wallet/unit": "0.12.158-rc.1",
+    "@keplr-wallet/common": "0.12.158-rc.2",
+    "@keplr-wallet/crypto": "0.12.158-rc.2",
+    "@keplr-wallet/proto-types": "0.12.158-rc.2",
+    "@keplr-wallet/simple-fetch": "0.12.158-rc.2",
+    "@keplr-wallet/types": "0.12.158-rc.2",
+    "@keplr-wallet/unit": "0.12.158-rc.2",
     "bech32": "^1.1.4",
     "buffer": "^6.0.3",
     "long": "^4.0.0",

diff --git a/packages/crypto/package.json b/packages/crypto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/crypto",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",

diff --git a/packages/hooks-starknet/package.json b/packages/hooks-starknet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/hooks-starknet",
-  "version": "0.12.158-rc.1",
+  "version": "0.12.158-rc.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -18,18 +18,18 @@
   "dependencies": {
     "@ethersproject/address": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
-    "@keplr-wallet/background": "0.12.158-rc.1",
-    "@keplr-wallet/common": "0.12.158-rc.1",
-    "@keplr-wallet/cosmos": "0.12.158-rc.1",
-    "@keplr-wallet/crypto": "0.12.158-rc.1",
-    "@keplr-wallet/proto-types": "0.12.158-rc.1",
-    "@keplr-wallet/simple-fetch": "0.12.158-rc.1",
-    "@keplr-wallet/stores": "0.12.158-rc.1",
-    "@keplr-wallet/stores-etc": "0.12.158-rc.1",
-    "@keplr-wallet/stores-eth": "0.12.158-rc.1",
-    "@keplr-wallet/stores-starknet": "0.12.158-rc.1",
-    "@keplr-wallet/types": "0.12.158-rc.1",
-    "@keplr-wallet/unit": "0.12.158-rc.1",
+    "@keplr-wallet/background": "0.12.158-rc.2",
+    "@keplr-wallet/common": "0.12.158-rc.2",
+    "@keplr-wallet/cosmos": "0.12.158-rc.2",
+    "@keplr-wallet/crypto": "0.12.158-rc.2",
+    "@keplr-wallet/proto-types": "0.12.158-rc.2",
+    "@keplr-wallet/simple-fetch": "0.12.158-rc.2",
+    "@keplr-wallet/stores": "0.12.158-rc.2",
+    "@keplr-wallet/stores-etc": "0.12.158-rc.2",
+    "@keplr-wallet/stores-eth": "0.12.158-rc.2",
+    "@keplr-wallet/stores-starknet": "0.12.158-rc.2",
+    "@keplr-wallet/types": "0.12.158-rc.2",
+    "@keplr-wallet/unit": "0.12.158-rc.2",
     "buffer": "^6.0.3",
     "long": "^4.0.0",
     "utility-types": "^3.10.0"