From c7dd4d67dbff37fd3b9cf2eaac6a24860314aa23 Mon Sep 17 00:00:00 2001 From: Sebastian Ruiz Date: Tue, 25 Jul 2023 10:11:42 -0300 Subject: [PATCH] referencing flipside's near-bos-vm --- package.json | 2 +- src/App.js | 2 +- src/components/Editor/FileTab.js | 2 +- .../navigation/NotificationWidget.js | 2 +- src/components/navigation/PretendModal.js | 2 +- .../navigation/desktop/DevActionsDropdown.js | 2 +- .../navigation/desktop/UserDropdown.js | 2 +- src/components/navigation/mobile/Menu.js | 2 +- src/pages/EditorPage.js | 2 +- src/pages/EmbedPage.js | 2 +- src/pages/ViewPage.js | 2 +- yarn.lock | 82 +++++++++++++------ 12 files changed, 69 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index aa4f52b..74f6edf 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "error-polyfill": "^0.1.2", "local-storage": "^2.0.0", "near-api-js": "^2.1.3", - "near-social-vm": "git+https://github.com/NearSocial/VM.git#2.2.3", + "near-flipside-vm": "git+https://github.com/FlipsideCrypto/near-bos-vm", "prettier": "^2.7.1", "react": "^18.2.0", "react-bootstrap": "^2.5.0", diff --git a/src/App.js b/src/App.js index 3345c49..c738918 100644 --- a/src/App.js +++ b/src/App.js @@ -25,7 +25,7 @@ import { useNear, utils, EthersProviderContext, -} from "near-social-vm"; +} from "near-flipside-vm"; import Big from "big.js"; import { NavigationWrapper } from "./components/navigation/NavigationWrapper"; import { NetworkId, Widgets } from "./data/widgets"; diff --git a/src/components/Editor/FileTab.js b/src/components/Editor/FileTab.js index 44a02f4..e9d9dbd 100644 --- a/src/components/Editor/FileTab.js +++ b/src/components/Editor/FileTab.js @@ -1,6 +1,6 @@ import { Nav } from "react-bootstrap"; import React, { useEffect, useState } from "react"; -import { useAccountId, useCache, useNear } from "near-social-vm"; +import { useAccountId, useCache, useNear } from "near-flipside-vm"; export const Filetype = { Widget: "widget", diff --git a/src/components/navigation/NotificationWidget.js b/src/components/navigation/NotificationWidget.js index 6fee5ae..90687c6 100644 --- a/src/components/navigation/NotificationWidget.js +++ b/src/components/navigation/NotificationWidget.js @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Widget } from "near-social-vm"; +import { Widget } from "near-flipside-vm"; const StyledNotificationWidget = styled.div` margin: 0 15px; diff --git a/src/components/navigation/PretendModal.js b/src/components/navigation/PretendModal.js index 1046853..747d9e3 100644 --- a/src/components/navigation/PretendModal.js +++ b/src/components/navigation/PretendModal.js @@ -1,6 +1,6 @@ import React, { useState } from "react"; import Modal from "react-bootstrap/Modal"; -import { Widget, useAccount } from "near-social-vm"; +import { Widget, useAccount } from "near-flipside-vm"; export default function PretendModal(props) { const account = useAccount(); diff --git a/src/components/navigation/desktop/DevActionsDropdown.js b/src/components/navigation/desktop/DevActionsDropdown.js index 611e1c9..1f397fe 100644 --- a/src/components/navigation/desktop/DevActionsDropdown.js +++ b/src/components/navigation/desktop/DevActionsDropdown.js @@ -3,7 +3,7 @@ import styled from "styled-components"; import { Link } from "react-router-dom"; import { Fork } from "../../icons/Fork"; import { Code } from "../../icons/Code"; -import { useAccount } from "near-social-vm"; +import { useAccount } from "near-flipside-vm"; import { Diff } from "../../icons/Diff"; const StyledDropdown = styled.div` diff --git a/src/components/navigation/desktop/UserDropdown.js b/src/components/navigation/desktop/UserDropdown.js index 4154320..1cd4965 100644 --- a/src/components/navigation/desktop/UserDropdown.js +++ b/src/components/navigation/desktop/UserDropdown.js @@ -1,5 +1,5 @@ import React, { useCallback } from "react"; -import { Widget, useNear, useAccount } from "near-social-vm"; +import { Widget, useNear, useAccount } from "near-flipside-vm"; import styled from "styled-components"; import { User } from "../../icons/User"; import { LogOut } from "../../icons/LogOut"; diff --git a/src/components/navigation/mobile/Menu.js b/src/components/navigation/mobile/Menu.js index d2915e9..0e372ed 100644 --- a/src/components/navigation/mobile/Menu.js +++ b/src/components/navigation/mobile/Menu.js @@ -7,7 +7,7 @@ import { Code } from "../../icons/Code"; import { LogOut } from "../../icons/LogOut"; import { Fork } from "../../icons/Fork"; import { UserCircle } from "../../icons/UserCircle"; -import { Widget } from "near-social-vm"; +import { Widget } from "near-flipside-vm"; import { NavigationButton } from "../NavigationButton"; import { SignInButton } from "../SignInButton"; import { Link } from "react-router-dom"; diff --git a/src/pages/EditorPage.js b/src/pages/EditorPage.js index 73afd13..7d3b09a 100644 --- a/src/pages/EditorPage.js +++ b/src/pages/EditorPage.js @@ -10,7 +10,7 @@ import { useNear, CommitButton, useAccountId, -} from "near-social-vm"; +} from "near-flipside-vm"; import { Nav, OverlayTrigger, Tooltip } from "react-bootstrap"; import RenameModal from "../components/Editor/RenameModal"; import OpenModal from "../components/Editor/OpenModal"; diff --git a/src/pages/EmbedPage.js b/src/pages/EmbedPage.js index 6200f04..1e9bc7b 100644 --- a/src/pages/EmbedPage.js +++ b/src/pages/EmbedPage.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { Widget } from "near-social-vm"; +import { Widget } from "near-flipside-vm"; import { useParams } from "react-router-dom"; import { useQuery } from "../hooks/useQuery"; diff --git a/src/pages/ViewPage.js b/src/pages/ViewPage.js index 855ffb4..0bd0499 100644 --- a/src/pages/ViewPage.js +++ b/src/pages/ViewPage.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { Widget } from "near-social-vm"; +import { Widget } from "near-flipside-vm"; import { useParams } from "react-router-dom"; import { useQuery } from "../hooks/useQuery"; diff --git a/yarn.lock b/yarn.lock index a5b6d2d..c335c47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1735,6 +1735,14 @@ "@ethersproject/properties" "^5.7.0" "@ethersproject/strings" "^5.7.0" +"@flipsidecrypto/sdk@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@flipsidecrypto/sdk/-/sdk-2.0.0.tgz#ab816fd94e84309203ecb0aeff6416e4eb5cbb59" + integrity sha512-tqxmAvsFVl9rDgouSDYmITMxILDkb/jnRCvqTisko8edDPC/LcZKN1sfkvhh2QnmiA3bPBtUeLV7Vd6pTxCoww== + dependencies: + "@types/eslint" "^8.4.8" + axios "^0.27.2" + "@floating-ui/core@^0.7.3": version "0.7.3" resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-0.7.3.tgz#d274116678ffae87f6b60e90f88cc4083eefab86" @@ -3212,6 +3220,14 @@ "@types/estree" "*" "@types/json-schema" "*" +"@types/eslint@^8.4.8": + version "8.44.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.1.tgz#d1811559bb6bcd1a76009e3f7883034b78a0415e" + integrity sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + "@types/estree@*": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" @@ -4340,6 +4356,14 @@ axios@^0.21.0: dependencies: follow-redirects "^1.14.0" +axios@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" + integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== + dependencies: + follow-redirects "^1.14.9" + form-data "^4.0.0" + babel-loader@^8.2.2: version "8.3.0" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" @@ -5036,7 +5060,7 @@ colorette@^2.0.10, colorette@^2.0.14: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -6288,7 +6312,7 @@ flat@^5.0.2: resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -follow-redirects@^1.0.0, follow-redirects@^1.14.0: +follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -6305,6 +6329,15 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -8513,30 +8546,12 @@ near-api-js@^2.1.3: node-fetch "^2.6.1" tweetnacl "^1.0.1" -near-hd-key@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/near-hd-key/-/near-hd-key-1.2.1.tgz#f508ff15436cf8a439b543220f3cc72188a46756" - integrity sha512-SIrthcL5Wc0sps+2e1xGj3zceEa68TgNZDLuCx0daxmfTP7sFTB3/mtE2pYhlFsCxWoMn+JfID5E1NlzvvbRJg== - dependencies: - bip39 "3.0.2" - create-hmac "1.1.7" - tweetnacl "1.0.3" - -near-seed-phrase@^0.2.0: - version "0.2.0" - 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" - bs58 "^4.0.1" - near-hd-key "^1.2.1" - tweetnacl "^1.0.2" - -"near-social-vm@git+https://github.com/NearSocial/VM.git#2.2.3": - version "2.2.3" - resolved "git+https://github.com/NearSocial/VM.git#381ddbdc8ef5bde7975bebe8f640c1a5f9d85b94" +"near-flipside-vm@git+https://github.com/FlipsideCrypto/near-bos-vm": + version "2.2.4" + resolved "git+https://github.com/FlipsideCrypto/near-bos-vm#397bd2372d9701f10e22991c5eb9209af19c0adb" dependencies: "@braintree/sanitize-url" "6.0.0" + "@flipsidecrypto/sdk" "^2.0.0" "@radix-ui/react-accordion" "^1.1.1" "@radix-ui/react-alert-dialog" "^1.0.3" "@radix-ui/react-aspect-ratio" "^1.0.2" @@ -8594,6 +8609,25 @@ near-seed-phrase@^0.2.0: styled-components "^5.3.6" tweetnacl "^1.0.3" +near-hd-key@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/near-hd-key/-/near-hd-key-1.2.1.tgz#f508ff15436cf8a439b543220f3cc72188a46756" + integrity sha512-SIrthcL5Wc0sps+2e1xGj3zceEa68TgNZDLuCx0daxmfTP7sFTB3/mtE2pYhlFsCxWoMn+JfID5E1NlzvvbRJg== + dependencies: + bip39 "3.0.2" + create-hmac "1.1.7" + tweetnacl "1.0.3" + +near-seed-phrase@^0.2.0: + version "0.2.0" + 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" + bs58 "^4.0.1" + near-hd-key "^1.2.1" + tweetnacl "^1.0.2" + negotiator@0.6.3, negotiator@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"