Skip to content

Commit

Permalink
Fix gnosis wallet and update dependencies (#3801)
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcinciarka
marcinciarka authored Apr 18, 2024
1 parent 2f4bcc4 commit 51c8717
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 55 deletions.
5 changes: 3 additions & 2 deletions features/shared/jwt.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import SafeAppsSDK from '@gnosis.pm/safe-apps-sdk'
import type { SendTransactionsResponse } from '@safe-global/safe-apps-sdk'
import SafeAppsSDK from '@safe-global/safe-apps-sdk'
import { decode } from 'jsonwebtoken'
import type { Observable } from 'rxjs'
import { of } from 'rxjs'
Expand Down Expand Up @@ -71,7 +72,7 @@ async function getGnosisSafeDetails(
}

const dataToSign = getDataToSignFromChallenge(newChallenge)
const { safeTxHash } = await sdk.txs.signMessage(dataToSign)
const { safeTxHash } = (await sdk.txs.signMessage(dataToSign)) as SendTransactionsResponse
localStorage.setItem(
key,
JSON.stringify({
Expand Down
3 changes: 1 addition & 2 deletions features/web3OnBoard/init-web3-on-board.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ const getChains = () => {
}

const getWallets = () => {
const wallets: WalletInit[] = [injected, walletConnect]
const wallets: WalletInit[] = [injected, walletConnect, gnosis]
if (!connectionMethods) {
return wallets
}
if (connectionMethods.gnosis) wallets.push(gnosis)
if (connectionMethods.walletLink) wallets.push(walletLink)
if (connectionMethods.ledger) wallets.push(ledger)
if (connectionMethods.trezor) wallets.push(trezor)
Expand Down
2 changes: 1 addition & 1 deletion jest.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const finalConfig = async (): Promise<Config.InitialOptions> => {
return {
...nextConfig,
transformIgnorePatterns: [
'/node_modules/(?!(@web3-onboard|nanoid|ramda|uint8arrays|multiformats|@walletconnect)/)',
'/node_modules/(?!(@web3-onboard|nanoid|ramda|isows|uint8arrays|multiformats|@walletconnect)/)',
],
}
}
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
"@babel/runtime": "^7.21.0",
"@contentful/rich-text-react-renderer": "15.19.4",
"@emotion/react": "^11.11.1",
"@gnosis.pm/safe-apps-sdk": "^7.7.0",
"@gnosis.pm/safe-apps-web3-react": "^1.3.0",
"@lifi/wallet-management": "^2.3.4",
"@lifi/widget": "2.4.6",
"@metamask/eth-sig-util": "^5.0.2",
Expand All @@ -52,11 +50,13 @@
"@oasisdex/transactions": "0.1.4-alpha.0",
"@oasisdex/utils": "^0.0.8",
"@prisma/client": "4.8.0",
"@safe-global/safe-apps-provider": "^0.18.2",
"@safe-global/safe-apps-sdk": "^9.0.0",
"@sentry/nextjs": "^7.81.1",
"@typeform/embed-react": "^1.13.0",
"@web3-onboard/coinbase": "^2.2.5",
"@web3-onboard/core": "^2.21.1",
"@web3-onboard/gnosis": "^2.2.0",
"@web3-onboard/gnosis": "^2.2.2",
"@web3-onboard/injected-wallets": "^2.10.6",
"@web3-onboard/ledger": "^2.5.2",
"@web3-onboard/react": "^2.8.12",
Expand Down
94 changes: 47 additions & 47 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==

"@adraffy/[email protected]":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz#d2a39395c587e092d77cbbc80acf956a54f38bf7"
integrity sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==

"@adraffy/[email protected]":
version "1.9.4"
resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz#aae21cb858bbb0411949d5b7b3051f4209043f62"
Expand Down Expand Up @@ -1536,46 +1541,6 @@
dependencies:
tslib "^2.1.0"

"@gnosis.pm/[email protected]":
version "0.11.3"
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-provider/-/safe-apps-provider-0.11.3.tgz#9e1ec2fb69a7fae8127631330f630662bd07a580"
integrity sha512-vER+vuf44f40KfwqTRjU8rdVMDnGZMmgQcGetlMxq+MTI7VD2Cr3CrCuABFGE/DZK80SxZ+IvQ9yjkemo/ywmQ==
dependencies:
"@gnosis.pm/safe-apps-sdk" "7.5.0"
events "^3.3.0"

"@gnosis.pm/[email protected]":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-7.5.0.tgz#59033c62726abacbf988286ea57250e7581444e8"
integrity sha512-OaF2agv2zfPExzedv1eOGtt3W+rnwGFwtuP37epofhsnDgqS/JMPoqyDLRSvyWYlU22OeKvtghTppvRfaEnUTw==
dependencies:
"@gnosis.pm/safe-react-gateway-sdk" "^3.1.3"
ethers "^5.6.8"

"@gnosis.pm/safe-apps-sdk@^7.7.0":
version "7.7.0"
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-7.7.0.tgz#dc3621634bd42f1d24cbe4342fd85592cd1491cd"
integrity sha512-MuiH09q/5DFfHQLrwNW7JSvGEMGqrS3jNJy9UKZHW77rxzmZssHX1l3+p5whTbtrcvLbxQgcp5egMrdw/sj0qw==
dependencies:
"@gnosis.pm/safe-react-gateway-sdk" "^3.1.3"
ethers "^5.6.8"

"@gnosis.pm/safe-apps-web3-react@^1.3.0":
version "1.4.2"
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-web3-react/-/safe-apps-web3-react-1.4.2.tgz#9241be3f85a47091b082253d93b451143da2e9fd"
integrity sha512-3CIsdHFpZ79nigoRxMqL/iWFUAqMC1ngoQfJ+/YeaBmzVaPkfUFquRiNdIjbLRzogE7TOjn0BqWkxSPXrxhMsg==
dependencies:
"@gnosis.pm/safe-apps-provider" "0.11.3"
"@gnosis.pm/safe-apps-sdk" "7.5.0"
"@web3-react/abstract-connector" "6.0.7"

"@gnosis.pm/safe-react-gateway-sdk@^3.1.3":
version "3.2.1"
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-react-gateway-sdk/-/safe-react-gateway-sdk-3.2.1.tgz#f378febf506b1bb1c77bc3530fdea7cd73e0bb6e"
integrity sha512-5k2DHIhsjvamWo7KL+LNC/YksCI76IWIKWUZ3H22w8TnWtoXTh1BFP5hDNHQL1pur2sF4zcPJuPh2qY+y5YanA==
dependencies:
cross-fetch "^3.1.5"

"@hapi/hoek@^9.0.0":
version "9.3.0"
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
Expand Down Expand Up @@ -2700,6 +2665,14 @@
"@safe-global/safe-apps-sdk" "^8.1.0"
events "^3.3.0"

"@safe-global/safe-apps-provider@^0.18.2":
version "0.18.2"
resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-provider/-/safe-apps-provider-0.18.2.tgz#336f3f4bb6ebbad9354e6551687491efc73991bc"
integrity sha512-yHHAcppwE7aIUWEeZiYAClQzZCdP5l0Kbd0CBlhKAsTcqZnx4Gh3G3G3frY5LlWcGzp9qmQ5jv+J1GBpaZLDgw==
dependencies:
"@safe-global/safe-apps-sdk" "^9.0.0"
events "^3.3.0"

"@safe-global/safe-apps-sdk@^8.1.0":
version "8.1.0"
resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-sdk/-/safe-apps-sdk-8.1.0.tgz#d1d0c69cd2bf4eef8a79c5d677d16971926aa64a"
Expand All @@ -2708,6 +2681,14 @@
"@safe-global/safe-gateway-typescript-sdk" "^3.5.3"
viem "^1.0.0"

"@safe-global/safe-apps-sdk@^9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-sdk/-/safe-apps-sdk-9.0.0.tgz#56635663f5a73773c5929d9c45ffea2b75dab69b"
integrity sha512-fEqmQBU3JqTjORSl3XYrcaxdxkUqeeM39qsQjqCzzTHioN8DEfg3JCLq6EBoXzcKTVOYi8SPzLV7KJccdDw+4w==
dependencies:
"@safe-global/safe-gateway-typescript-sdk" "^3.5.3"
viem "^1.6.0"

"@safe-global/safe-gateway-typescript-sdk@^3.5.3":
version "3.12.0"
resolved "https://registry.yarnpkg.com/@safe-global/safe-gateway-typescript-sdk/-/safe-gateway-typescript-sdk-3.12.0.tgz#aa767a32f4d10f4ec9a47ad7e32d547d3b51e94c"
Expand Down Expand Up @@ -5297,10 +5278,10 @@
svelte "^3.49.0"
svelte-i18n "^3.3.13"

"@web3-onboard/gnosis@^2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@web3-onboard/gnosis/-/gnosis-2.2.0.tgz#134dd79d13b651934f4233760f4337752d1c35df"
integrity sha512-+CtvrI30jj3zJdplQfrCU1rSAUN6R0rfBZggl8JXvqsH5CNTFjU3ctVWeqbyGBPfcVhRQ5oLqKcj464LTwy2iw==
"@web3-onboard/gnosis@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@web3-onboard/gnosis/-/gnosis-2.2.2.tgz#2a34a65aeb848bfa59c66a510a982c1975559d52"
integrity sha512-i5RM80+miq2PPvceZzjyygINfnT7BZZRcuKCyXj4NGJW+RAvk3IMSJEuGK9ufDHGYk6Y1bbOPUBie+h1DUn0fw==
dependencies:
"@web3-onboard/common" "^2.3.3"

Expand Down Expand Up @@ -5386,7 +5367,7 @@
"@web3auth/modal" "^5.0.1"
react-dom "^18.2.0"

"@web3-react/abstract-connector@6.0.7", "@web3-react/abstract-connector@^6.0.7":
"@web3-react/abstract-connector@^6.0.7":
version "6.0.7"
resolved "https://registry.yarnpkg.com/@web3-react/abstract-connector/-/abstract-connector-6.0.7.tgz#401b3c045f1e0fab04256311be49d5144e9badc6"
integrity sha512-RhQasA4Ox8CxUC0OENc1AJJm8UTybu/oOCM61Zjg6y0iF7Z0sqv1Ai1VdhC33hrQpA8qSBgoXN9PaP8jKmtdqg==
Expand Down Expand Up @@ -7522,7 +7503,7 @@ create-require@^1.1.0:
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==

[email protected], cross-fetch@^3.1.5:
[email protected]:
version "3.1.5"
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
Expand Down Expand Up @@ -8825,7 +8806,7 @@ [email protected], ethereumjs-util@^7.0.10, ethereumjs-util@^7.1.3, ethereum
ethereum-cryptography "^0.1.3"
rlp "^2.2.4"

[email protected], [email protected], [email protected], [email protected], ethers@^5.6.2, ethers@^5.6.8, ethers@^5.7.0, ethers@^5.7.2:
[email protected], [email protected], [email protected], [email protected], ethers@^5.6.2, ethers@^5.7.0, ethers@^5.7.2:
version "5.7.0"
resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.0.tgz#0055da174b9e076b242b8282638bc94e04b39835"
integrity sha512-5Xhzp2ZQRi0Em+0OkOcRHxPzCfoBfgtOQA+RUylSkuHbhTEaQklnYi2hsWbRgs3ztJsXVXd9VKBcO1ScWL8YfA==
Expand Down Expand Up @@ -10406,6 +10387,11 @@ isomorphic-ws@^4.0.1:
resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==

[email protected]:
version "1.0.3"
resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.3.tgz#93c1cf0575daf56e7120bab5c8c448b0809d0d74"
integrity sha512-2cKei4vlmg2cxEjm3wVSqn8pcoRF/LX/wpifuuNquFO4SQmPwarClT+SUCA2lt+l581tTeZIPIZuIDo2jWN1fg==

isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
Expand Down Expand Up @@ -15747,6 +15733,20 @@ viem@^1.0.0:
isomorphic-ws "5.0.0"
ws "8.13.0"

viem@^1.6.0:
version "1.21.4"
resolved "https://registry.yarnpkg.com/viem/-/viem-1.21.4.tgz#883760e9222540a5a7e0339809202b45fe6a842d"
integrity sha512-BNVYdSaUjeS2zKQgPs+49e5JKocfo60Ib2yiXOWBT6LuVxY1I/6fFX3waEtpXvL1Xn4qu+BVitVtMh9lyThyhQ==
dependencies:
"@adraffy/ens-normalize" "1.10.0"
"@noble/curves" "1.2.0"
"@noble/hashes" "1.3.2"
"@scure/bip32" "1.3.2"
"@scure/bip39" "1.2.1"
abitype "0.9.8"
isows "1.0.3"
ws "8.13.0"

vm-browserify@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
Expand Down

0 comments on commit 51c8717

Please sign in to comment.