diff --git a/js/packages/common/src/contexts/wallet.tsx b/js/packages/common/src/contexts/wallet.tsx index 1fb76ea..9bd03e3 100644 --- a/js/packages/common/src/contexts/wallet.tsx +++ b/js/packages/common/src/contexts/wallet.tsx @@ -11,6 +11,7 @@ import { useLocation } from "react-router"; import { MetaplexModal } from "../components/MetaplexModal"; import './wallet.css' +import { TorusWalletAdapter } from "../wallet-adapters/torus"; const ASSETS_URL = 'https://raw.githubusercontent.com/solana-labs/oyster/main/assets/wallets/'; @@ -31,12 +32,12 @@ export const WALLET_PROVIDERS = [ url: "https://mathwallet.org", icon: `${ASSETS_URL}mathwallet.svg`, }, - // { - // name: 'Torus', - // url: 'https://tor.us', - // icon: `${ASSETS_URL}torus.svg`, - // adapter: TorusWalletAdapter, - // } + { + name: 'Torus', + url: 'https://tor.us', + icon: `${ASSETS_URL}torus.svg`, + adapter: TorusWalletAdapter, + } ]; const WalletContext = React.createContext<{ diff --git a/js/packages/common/src/wallet-adapters/torus/index.tsx b/js/packages/common/src/wallet-adapters/torus/index.tsx index 93ec631..12088ed 100644 --- a/js/packages/common/src/wallet-adapters/torus/index.tsx +++ b/js/packages/common/src/wallet-adapters/torus/index.tsx @@ -79,7 +79,6 @@ export class TorusWalletAdapter extends EventEmitter implements WalletAdapter { } console.log(this.account?.publicKey.toBase58()); - this.name = this._provider?.state.store.get('name');; this.image = this._provider?.state.store.get('profileImage');; diff --git a/js/packages/web/package.json b/js/packages/web/package.json index 4ddbae6..894fded 100644 --- a/js/packages/web/package.json +++ b/js/packages/web/package.json @@ -9,16 +9,16 @@ "@oyster/common": "0.0.1", "@project-serum/serum": "^0.13.34", "@project-serum/sol-wallet-adapter": "^0.2.0", - "@solana/spl-name-service": "0.1.1", + "@solana/spl-name-service": "0.1.2", "@solana/spl-token": "0.1.4", - "@solana/spl-token-registry": "^0.2.77", + "@solana/spl-token-registry": "^0.2.131", "@solana/spl-token-swap": "0.1.0", "@solana/wallet-base": "0.0.1", "@solana/wallet-ledger": "0.0.1", "@solana/web3.js": "^1.10.0", - "@toruslabs/openlogin": "0.8.5", - "@toruslabs/openlogin-ed25519": "0.8.5", - "@toruslabs/openlogin-utils": "0.8.5", + "@toruslabs/openlogin": "0.9.0", + "@toruslabs/openlogin-ed25519": "0.9.0", + "@toruslabs/openlogin-utils": "0.9.0", "@welldone-software/why-did-you-render": "^6.0.5", "bn.js": "^5.1.3", "borsh": "^0.4.0", diff --git a/js/yarn.lock b/js/yarn.lock index 7b894e5..4b0fcc9 100644 --- a/js/yarn.lock +++ b/js/yarn.lock @@ -2852,16 +2852,15 @@ resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#5405ee8e444ed212db44e79351f0c70a582aae25" integrity sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw== -"@solana/spl-name-service@0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@solana/spl-name-service/-/spl-name-service-0.1.1.tgz#4bcbfa134124849a0198e0ed829326cd6ac070d8" - integrity sha512-fg6t7OeXlZqzrFa3lsINP+Pm4/sm3igczQUaW4sYIvHjSTpZafwaE9xzFLjxncLZOD+AagKLZnAYbzMXB0AySQ== +"@solana/spl-name-service@0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@solana/spl-name-service/-/spl-name-service-0.1.2.tgz#d49240a692bbf05ef56d79db0916b17a4829b99d" + integrity sha512-rmVYzhmZgaYmaANzmuxemoJWMnkuM59zitJpdkJejn/oTPYc+SezhQk52fN4dqjCz1cTBnzDJ+0AUJIwgNWnNQ== dependencies: "@solana/spl-token" "0.1.4" "@solana/web3.js" "^1.11.0" bip32 "^2.0.6" bn.js "^5.1.3" - borsh "^0.4.0" bs58 "4.0.1" buffer-layout "^1.2.0" core-util-is "^1.0.2" @@ -2871,10 +2870,10 @@ tweetnacl "^1.0.3" webpack-dev-server "^3.11.2" -"@solana/spl-token-registry@^0.2.77": - version "0.2.118" - resolved "https://registry.yarnpkg.com/@solana/spl-token-registry/-/spl-token-registry-0.2.118.tgz#f8a1e70ea20afa2e55201bc0ef0890322c85d892" - integrity sha512-orG5q6CXxxpa3sICQ9UCoRcXl8UW0FZvu5jdFaOjO+v93kjLf9SbSLdfx8LN8YVv88djSR5rN/A0OlYKXPNZxw== +"@solana/spl-token-registry@^0.2.131": + version "0.2.131" + resolved "https://registry.yarnpkg.com/@solana/spl-token-registry/-/spl-token-registry-0.2.131.tgz#e28f8b5df05d26654dd8f85a7c6b62bbdb472b5b" + integrity sha512-91gLhSZZH3LkJrFDJ1N7qJWPjHGvKKpE0qphx5LBhs1pNz1v88GqDyZ/n8al6EW+XDn70vX65FXPRnqorrR0Pg== dependencies: cross-fetch "3.0.6" @@ -3187,41 +3186,42 @@ dependencies: deepmerge "^4.2.2" -"@toruslabs/openlogin-ed25519@0.8.5": - version "0.8.5" - resolved "https://registry.yarnpkg.com/@toruslabs/openlogin-ed25519/-/openlogin-ed25519-0.8.5.tgz#f5eb382654c257acb6eea214ecef99e2bd25dd86" - integrity sha512-bexGELe9gzimZNWS5oPIkREctTk4O5Mvas5nAMQXfRN0Uy31yTwv+/6YrzO1YZTMjhE1WUeVFX01ltB+kOU/Aw== +"@toruslabs/openlogin-ed25519@0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@toruslabs/openlogin-ed25519/-/openlogin-ed25519-0.9.0.tgz#919c83b35d50f25d68605b44669741805f5e7817" + integrity sha512-wzD6bCi0Ka1gJ5m39HGRLdAE6Ocuc8j/5eeCkQMvhoHfVZK8lfTubxFev/YKWhOwQRdr8HqcLsRYyCdrqvfueg== dependencies: "@toruslabs/tweetnacl-js" "^1.0.3" -"@toruslabs/openlogin-jrpc@^0.8.5": - version "0.8.5" - resolved "https://registry.yarnpkg.com/@toruslabs/openlogin-jrpc/-/openlogin-jrpc-0.8.5.tgz#05c3bf7fe0215cd463ceb1bea92715292c9aa0bf" - integrity sha512-BS5RMjwx+NVq5mWN3foP1iTnJCWA+YIesTiNkda70ssi/eQe5ej+QfBiAAJRQzLrkorGpda9HiXPO/jqutDXXA== +"@toruslabs/openlogin-jrpc@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@toruslabs/openlogin-jrpc/-/openlogin-jrpc-0.9.0.tgz#56dbfb1675856e8b280049959e884f6c3e5bc521" + integrity sha512-Hkj9oR8ROavWRqptorFv8R4ka0GJY0O5VXuF+9bnGyWxY0kEcRKsDvOZpS4XO31GXThUGyLusHY4prwYGhUQ9Q== dependencies: - "@toruslabs/openlogin-utils" "^0.8.5" + "@toruslabs/openlogin-utils" "^0.9.0" end-of-stream "^1.4.4" fast-safe-stringify "^2.0.7" once "^1.4.0" pump "^3.0.0" -"@toruslabs/openlogin-utils@0.8.5", "@toruslabs/openlogin-utils@^0.8.5": - version "0.8.5" - resolved "https://registry.yarnpkg.com/@toruslabs/openlogin-utils/-/openlogin-utils-0.8.5.tgz#a598b03b87b655a4bbd0a297bdee707b628fd9bc" - integrity sha512-YhFnT/wNkBQqyZnVYrq2SPH0DmbMx23BkQmV+58iJlf3b8+s7AZpib4z12UrCimnamM8dvcx9q4MjQDPckXUMA== +"@toruslabs/openlogin-utils@0.9.0", "@toruslabs/openlogin-utils@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@toruslabs/openlogin-utils/-/openlogin-utils-0.9.0.tgz#817c352284de786577df5ab11ec34152013cdebe" + integrity sha512-OJTjqD/b3eUhkQkTZVywT++qKqejtx/4lNUeLwNjrOVrURLFClnjiqa6QFM+lVBD3OJpEdrNXTyzHcUhDBMwAg== dependencies: base64url "^3.0.1" keccak "^3.0.1" randombytes "^2.1.0" -"@toruslabs/openlogin@0.8.5": - version "0.8.5" - resolved "https://registry.yarnpkg.com/@toruslabs/openlogin/-/openlogin-0.8.5.tgz#36f69b0ddeee46542f0c66134544b0b9e8516a5f" - integrity sha512-F4T1+duVb3DeleUtaNR+vk4zSQbhtVyVwyfymNraMIRCdsBT4rwOhhSia0yJU8rmyHyv/Ezu8F8sNkjSJmHnBw== +"@toruslabs/openlogin@0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@toruslabs/openlogin/-/openlogin-0.9.0.tgz#cef446291ab6ca81b98e148afa90eae8a8124e1a" + integrity sha512-K+VjTOYAIKnxkuEhVL7I6ZRdvMQSCzdIghixlTxNq/Of9ge4/5PDfWDB8PYeb1Tsqm+SU3AwVtgHkfnY4tOhxA== dependencies: "@toruslabs/eccrypto" "^1.1.6" - "@toruslabs/openlogin-jrpc" "^0.8.5" - "@toruslabs/openlogin-utils" "^0.8.5" + "@toruslabs/http-helpers" "^1.3.7" + "@toruslabs/openlogin-jrpc" "^0.9.0" + "@toruslabs/openlogin-utils" "^0.9.0" lodash.merge "^4.6.2" pump "^3.0.0"