Merge pull request #72 from NEARBuilders/keypom-support

Working keypom support
NEARBuilders · Jan 19, 2024 · 4681ba4 · 4681ba4
2 parents d8ccc35 + 7343cff
commit 4681ba4
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "private": true,
   "dependencies": {
     "@monaco-editor/react": "^4.4.6",
+    "@keypom/selector": "1.2.3",
     "@near-wallet-selector/core": "^8.5.0",
     "@near-wallet-selector/here-wallet": "^8.5.0",
     "@near-wallet-selector/meteor-wallet": "^8.5.0",

diff --git a/src/App.js b/src/App.js
@@ -8,6 +8,8 @@ import { setupNearWallet } from "@near-wallet-selector/near-wallet";
 import { setupNeth } from "@near-wallet-selector/neth";
 import { setupNightly } from "@near-wallet-selector/nightly";
 import { setupSender } from "@near-wallet-selector/sender";
+import { setupKeypom } from "@keypom/selector";
+import { KEYPOM_OPTIONS } from "./utils/keypom-options";
 import "App.scss";
 import Big from "big.js";
 import "bootstrap-icons/font/bootstrap-icons.css";
@@ -78,6 +80,17 @@ function App() {
               bundle: false,
             }),
             setupNightly(),
+            setupKeypom({ 
+              networkId: NetworkId,
+              signInContractId: NetworkId == "testnet" ? "v1.social08.testnet" : "social.near",
+              trialAccountSpecs: {
+                url: NetworkId == "testnet" ? "https://test.nearbuilders.org/#trial-url/ACCOUNT_ID/SECRET_KEY" : "https://nearbuilders.org/#trial-url/ACCOUNT_ID/SECRET_KEY",
+                modalOptions: KEYPOM_OPTIONS(NetworkId)
+              },
+              instantSignInSpecs: {
+                url: NetworkId == 'testnet' ? 'https://test.nearbuilders.org/#instant-url/ACCOUNT_ID/SECRET_KEY/MODULE_ID' : 'https://nearbuilders.org/#instant-url/ACCOUNT_ID/SECRET_KEY/MODULE_ID',
+              },
+            }), 
           ],
         }),
         customElements: {
@@ -218,4 +231,4 @@ function App() {
   );
 }
 
-export default App;
+export default App;
diff --git a/src/pages/EditorPage.js b/src/pages/EditorPage.js
@@ -21,7 +21,6 @@ import {
   StorageType,
   toPath,
 } from "../components/Editor/FileTab";
-import { useHashRouterLegacy } from "../hooks/useHashRouterLegacy";
 import vmTypesDeclaration from "raw-loader!near-social-vm-types";
 import styled from "styled-components";
 import { useBosLoaderStore } from "../stores/bos-loader";
@@ -105,7 +104,6 @@ const Layout = {
 };
 
 export default function EditorPage(props) {
-  useHashRouterLegacy();
   const { widgetSrc } = useParams();
   const history = useHistory();
   const redirectMapStore = useBosLoaderStore();

diff --git a/src/pages/FeedPage.js b/src/pages/FeedPage.js
@@ -1,11 +1,9 @@
 import { Widget } from "near-social-vm";
 import React, { useEffect, useState } from "react";
 import { useQuery } from "../hooks/useQuery";
-import { useHashRouterLegacy } from "../hooks/useHashRouterLegacy";
 import { useBosLoaderStore } from "../stores/bos-loader";
 
 export default function FeedPage(props) {
-  useHashRouterLegacy();
   const redirectMapStore = useBosLoaderStore();
 
   const src = props.widgets.feed;

diff --git a/src/pages/ResourcesPage.js b/src/pages/ResourcesPage.js
@@ -1,10 +1,8 @@
 import { Widget } from "near-social-vm";
 import React from "react";
-import { useHashRouterLegacy } from "../hooks/useHashRouterLegacy";
 import { useBosLoaderStore } from "../stores/bos-loader";
 
 export default function ResourcesPage(props) {
-    useHashRouterLegacy();
     const redirectMapStore = useBosLoaderStore();
 
     const src = props.widgets.resources;

diff --git a/src/pages/ViewPage.js b/src/pages/ViewPage.js
@@ -2,11 +2,9 @@ import React, { useEffect, useState } from "react";
 import { Widget } from "near-social-vm";
 import { useParams } from "react-router-dom";
 import { useQuery } from "../hooks/useQuery";
-import { useHashRouterLegacy } from "../hooks/useHashRouterLegacy";
 import { useBosLoaderStore } from "../stores/bos-loader";
 
 export default function ViewPage(props) {
-  useHashRouterLegacy();
 
   const { widgetSrc } = useParams();
   const query = useQuery();

diff --git a/src/utils/keypom-options.js b/src/utils/keypom-options.js
diff --git a/yarn.lock b/yarn.lock
@@ -1947,6 +1947,26 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@keypom/[email protected]":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@keypom/core/-/core-1.0.2.tgz#65bffdeb753baea14deb9a204582377abe90793b"
+  integrity sha512-FFmOwbZCj3g8IHEdnhbTMHIp53rKjcorOlyoIKk0HaoC8rB/+Cl/BP6It1HP6DxGHorccs7yB4RXBnJei60hAg==
+  dependencies:
+    "@near-wallet-selector/core" "^8.0.3"
+    bn.js "^5.2.1"
+    borsh "^0.7.0"
+    near-seed-phrase "^0.2.0"
+    util "^0.12.5"
+
+"@keypom/[email protected]":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@keypom/selector/-/selector-1.2.3.tgz#93a53129714fb69ef13dd2cfc2621888107e7e36"
+  integrity sha512-Z/VlZwhSt3NJ+Dv5AkgXNZ2rcFbbrd4F2sC5oTDm/TH6ocoyx5MR6ltxCWEP5/D/8Zi1MghtCtZpxrh1sHub5A==
+  dependencies:
+    "@keypom/core" "1.0.2"
+    bn.js "^5.2.1"
+    borsh "^0.7.0"
+
 "@ledgerhq/connect-kit-loader@^1.1.0":
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/@ledgerhq/connect-kit-loader/-/connect-kit-loader-1.1.8.tgz#6cc32191660dd9d6e8f89047af09b0f201e30190"
@@ -2196,6 +2216,16 @@
     js-sha256 "0.9.0"
     rxjs "7.8.1"
 
+"@near-wallet-selector/core@^8.0.3":
+  version "8.9.2"
+  resolved "https://registry.yarnpkg.com/@near-wallet-selector/core/-/core-8.9.2.tgz#738583255f2a7a57a9731de503e187f6a651abfb"
+  integrity sha512-vCUoVOezCn5+5etHT0ejzgJ7DpnkUjLasYLYjjUh+E2BlUzrI63qMWfvdL8eoUoELXY7vtJVMEy/Td1kgrt10w==
+  dependencies:
+    borsh "0.7.0"
+    events "3.3.0"
+    js-sha256 "0.9.0"
+    rxjs "7.8.1"
+
 "@near-wallet-selector/here-wallet@^8.5.0":
   version "8.5.0"
   resolved "https://registry.npmjs.org/@near-wallet-selector/here-wallet/-/here-wallet-8.5.0.tgz"
@@ -8812,9 +8842,9 @@ near-hd-key@^1.2.1:
     create-hmac "1.1.7"
     tweetnacl "1.0.3"
 
-[email protected]:
+[email protected], near-seed-phrase@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/near-seed-phrase/-/near-seed-phrase-0.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/near-seed-phrase/-/near-seed-phrase-0.2.0.tgz#fb7cf89682112b1160ab68abb50dc821f49be18a"
   integrity sha512-NpmrnejpY1AdlRpDZ0schJQJtfBaoUheRfiYtQpcq9TkwPgqKZCRULV5L3hHmLc0ep7KRtikbPQ9R2ztN/3cyQ==
   dependencies:
     bip39-light "^1.0.7"
@@ -11551,9 +11581,9 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util@^0.12.0:
+util@^0.12.0, util@^0.12.5:
   version "0.12.5"
-  resolved "https://registry.npmjs.org/util/-/util-0.12.5.tgz"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
   integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
   dependencies:
     inherits "^2.0.3"