Skip to content

Commit 51c8717

Browse files
marcinciarkamarcinciarka
authored
Fix gnosis wallet and update dependencies (#3801)
1 parent 2f4bcc4 commit 51c8717

File tree

5 files changed

+55
-55
lines changed

5 files changed

+55
-55
lines changed

‎features/shared/jwt.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import SafeAppsSDK from '@gnosis.pm/safe-apps-sdk'
1+
import type { SendTransactionsResponse } from '@safe-global/safe-apps-sdk'
2+
import SafeAppsSDK from '@safe-global/safe-apps-sdk'
23
import { decode } from 'jsonwebtoken'
34
import type { Observable } from 'rxjs'
45
import { of } from 'rxjs'
@@ -71,7 +72,7 @@ async function getGnosisSafeDetails(
7172
}
7273

7374
const dataToSign = getDataToSignFromChallenge(newChallenge)
74-
const { safeTxHash } = await sdk.txs.signMessage(dataToSign)
75+
const { safeTxHash } = (await sdk.txs.signMessage(dataToSign)) as SendTransactionsResponse
7576
localStorage.setItem(
7677
key,
7778
JSON.stringify({

‎features/web3OnBoard/init-web3-on-board.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,10 @@ const getChains = () => {
6262
}
6363

6464
const getWallets = () => {
65-
const wallets: WalletInit[] = [injected, walletConnect]
65+
const wallets: WalletInit[] = [injected, walletConnect, gnosis]
6666
if (!connectionMethods) {
6767
return wallets
6868
}
69-
if (connectionMethods.gnosis) wallets.push(gnosis)
7069
if (connectionMethods.walletLink) wallets.push(walletLink)
7170
if (connectionMethods.ledger) wallets.push(ledger)
7271
if (connectionMethods.trezor) wallets.push(trezor)

‎jest.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const finalConfig = async (): Promise<Config.InitialOptions> => {
2525
return {
2626
...nextConfig,
2727
transformIgnorePatterns: [
28-
'/node_modules/(?!(@web3-onboard|nanoid|ramda|uint8arrays|multiformats|@walletconnect)/)',
28+
'/node_modules/(?!(@web3-onboard|nanoid|ramda|isows|uint8arrays|multiformats|@walletconnect)/)',
2929
],
3030
}
3131
}

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
"@babel/runtime": "^7.21.0",
4141
"@contentful/rich-text-react-renderer": "15.19.4",
4242
"@emotion/react": "^11.11.1",
43-
"@gnosis.pm/safe-apps-sdk": "^7.7.0",
44-
"@gnosis.pm/safe-apps-web3-react": "^1.3.0",
4543
"@lifi/wallet-management": "^2.3.4",
4644
"@lifi/widget": "2.4.6",
4745
"@metamask/eth-sig-util": "^5.0.2",
@@ -52,11 +50,13 @@
5250
"@oasisdex/transactions": "0.1.4-alpha.0",
5351
"@oasisdex/utils": "^0.0.8",
5452
"@prisma/client": "4.8.0",
53+
"@safe-global/safe-apps-provider": "^0.18.2",
54+
"@safe-global/safe-apps-sdk": "^9.0.0",
5555
"@sentry/nextjs": "^7.81.1",
5656
"@typeform/embed-react": "^1.13.0",
5757
"@web3-onboard/coinbase": "^2.2.5",
5858
"@web3-onboard/core": "^2.21.1",
59-
"@web3-onboard/gnosis": "^2.2.0",
59+
"@web3-onboard/gnosis": "^2.2.2",
6060
"@web3-onboard/injected-wallets": "^2.10.6",
6161
"@web3-onboard/ledger": "^2.5.2",
6262
"@web3-onboard/react": "^2.8.12",

‎yarn.lock

+47-47
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
1313
integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==
1414

15+
"@adraffy/ens-normalize@1.10.0":
16+
version "1.10.0"
17+
resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz#d2a39395c587e092d77cbbc80acf956a54f38bf7"
18+
integrity sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==
19+
1520
"@adraffy/ens-normalize@1.9.4":
1621
version "1.9.4"
1722
resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz#aae21cb858bbb0411949d5b7b3051f4209043f62"
@@ -1536,46 +1541,6 @@
15361541
dependencies:
15371542
tslib "^2.1.0"
15381543

1539-
"@gnosis.pm/safe-apps-provider@0.11.3":
1540-
version "0.11.3"
1541-
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-provider/-/safe-apps-provider-0.11.3.tgz#9e1ec2fb69a7fae8127631330f630662bd07a580"
1542-
integrity sha512-vER+vuf44f40KfwqTRjU8rdVMDnGZMmgQcGetlMxq+MTI7VD2Cr3CrCuABFGE/DZK80SxZ+IvQ9yjkemo/ywmQ==
1543-
dependencies:
1544-
"@gnosis.pm/safe-apps-sdk" "7.5.0"
1545-
events "^3.3.0"
1546-
1547-
"@gnosis.pm/safe-apps-sdk@7.5.0":
1548-
version "7.5.0"
1549-
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-7.5.0.tgz#59033c62726abacbf988286ea57250e7581444e8"
1550-
integrity sha512-OaF2agv2zfPExzedv1eOGtt3W+rnwGFwtuP37epofhsnDgqS/JMPoqyDLRSvyWYlU22OeKvtghTppvRfaEnUTw==
1551-
dependencies:
1552-
"@gnosis.pm/safe-react-gateway-sdk" "^3.1.3"
1553-
ethers "^5.6.8"
1554-
1555-
"@gnosis.pm/safe-apps-sdk@^7.7.0":
1556-
version "7.7.0"
1557-
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-7.7.0.tgz#dc3621634bd42f1d24cbe4342fd85592cd1491cd"
1558-
integrity sha512-MuiH09q/5DFfHQLrwNW7JSvGEMGqrS3jNJy9UKZHW77rxzmZssHX1l3+p5whTbtrcvLbxQgcp5egMrdw/sj0qw==
1559-
dependencies:
1560-
"@gnosis.pm/safe-react-gateway-sdk" "^3.1.3"
1561-
ethers "^5.6.8"
1562-
1563-
"@gnosis.pm/safe-apps-web3-react@^1.3.0":
1564-
version "1.4.2"
1565-
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-web3-react/-/safe-apps-web3-react-1.4.2.tgz#9241be3f85a47091b082253d93b451143da2e9fd"
1566-
integrity sha512-3CIsdHFpZ79nigoRxMqL/iWFUAqMC1ngoQfJ+/YeaBmzVaPkfUFquRiNdIjbLRzogE7TOjn0BqWkxSPXrxhMsg==
1567-
dependencies:
1568-
"@gnosis.pm/safe-apps-provider" "0.11.3"
1569-
"@gnosis.pm/safe-apps-sdk" "7.5.0"
1570-
"@web3-react/abstract-connector" "6.0.7"
1571-
1572-
"@gnosis.pm/safe-react-gateway-sdk@^3.1.3":
1573-
version "3.2.1"
1574-
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-react-gateway-sdk/-/safe-react-gateway-sdk-3.2.1.tgz#f378febf506b1bb1c77bc3530fdea7cd73e0bb6e"
1575-
integrity sha512-5k2DHIhsjvamWo7KL+LNC/YksCI76IWIKWUZ3H22w8TnWtoXTh1BFP5hDNHQL1pur2sF4zcPJuPh2qY+y5YanA==
1576-
dependencies:
1577-
cross-fetch "^3.1.5"
1578-
15791544
"@hapi/hoek@^9.0.0":
15801545
version "9.3.0"
15811546
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
@@ -2700,6 +2665,14 @@
27002665
"@safe-global/safe-apps-sdk" "^8.1.0"
27012666
events "^3.3.0"
27022667

2668+
"@safe-global/safe-apps-provider@^0.18.2":
2669+
version "0.18.2"
2670+
resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-provider/-/safe-apps-provider-0.18.2.tgz#336f3f4bb6ebbad9354e6551687491efc73991bc"
2671+
integrity sha512-yHHAcppwE7aIUWEeZiYAClQzZCdP5l0Kbd0CBlhKAsTcqZnx4Gh3G3G3frY5LlWcGzp9qmQ5jv+J1GBpaZLDgw==
2672+
dependencies:
2673+
"@safe-global/safe-apps-sdk" "^9.0.0"
2674+
events "^3.3.0"
2675+
27032676
"@safe-global/safe-apps-sdk@^8.1.0":
27042677
version "8.1.0"
27052678
resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-sdk/-/safe-apps-sdk-8.1.0.tgz#d1d0c69cd2bf4eef8a79c5d677d16971926aa64a"
@@ -2708,6 +2681,14 @@
27082681
"@safe-global/safe-gateway-typescript-sdk" "^3.5.3"
27092682
viem "^1.0.0"
27102683

2684+
"@safe-global/safe-apps-sdk@^9.0.0":
2685+
version "9.0.0"
2686+
resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-sdk/-/safe-apps-sdk-9.0.0.tgz#56635663f5a73773c5929d9c45ffea2b75dab69b"
2687+
integrity sha512-fEqmQBU3JqTjORSl3XYrcaxdxkUqeeM39qsQjqCzzTHioN8DEfg3JCLq6EBoXzcKTVOYi8SPzLV7KJccdDw+4w==
2688+
dependencies:
2689+
"@safe-global/safe-gateway-typescript-sdk" "^3.5.3"
2690+
viem "^1.6.0"
2691+
27112692
"@safe-global/safe-gateway-typescript-sdk@^3.5.3":
27122693
version "3.12.0"
27132694
resolved "https://registry.yarnpkg.com/@safe-global/safe-gateway-typescript-sdk/-/safe-gateway-typescript-sdk-3.12.0.tgz#aa767a32f4d10f4ec9a47ad7e32d547d3b51e94c"
@@ -5297,10 +5278,10 @@
52975278
svelte "^3.49.0"
52985279
svelte-i18n "^3.3.13"
52995280

5300-
"@web3-onboard/gnosis@^2.2.0":
5301-
version "2.2.0"
5302-
resolved "https://registry.yarnpkg.com/@web3-onboard/gnosis/-/gnosis-2.2.0.tgz#134dd79d13b651934f4233760f4337752d1c35df"
5303-
integrity sha512-+CtvrI30jj3zJdplQfrCU1rSAUN6R0rfBZggl8JXvqsH5CNTFjU3ctVWeqbyGBPfcVhRQ5oLqKcj464LTwy2iw==
5281+
"@web3-onboard/gnosis@^2.2.2":
5282+
version "2.2.2"
5283+
resolved "https://registry.yarnpkg.com/@web3-onboard/gnosis/-/gnosis-2.2.2.tgz#2a34a65aeb848bfa59c66a510a982c1975559d52"
5284+
integrity sha512-i5RM80+miq2PPvceZzjyygINfnT7BZZRcuKCyXj4NGJW+RAvk3IMSJEuGK9ufDHGYk6Y1bbOPUBie+h1DUn0fw==
53045285
dependencies:
53055286
"@web3-onboard/common" "^2.3.3"
53065287

@@ -5386,7 +5367,7 @@
53865367
"@web3auth/modal" "^5.0.1"
53875368
react-dom "^18.2.0"
53885369

5389-
"@web3-react/abstract-connector@6.0.7", "@web3-react/abstract-connector@^6.0.7":
5370+
"@web3-react/abstract-connector@^6.0.7":
53905371
version "6.0.7"
53915372
resolved "https://registry.yarnpkg.com/@web3-react/abstract-connector/-/abstract-connector-6.0.7.tgz#401b3c045f1e0fab04256311be49d5144e9badc6"
53925373
integrity sha512-RhQasA4Ox8CxUC0OENc1AJJm8UTybu/oOCM61Zjg6y0iF7Z0sqv1Ai1VdhC33hrQpA8qSBgoXN9PaP8jKmtdqg==
@@ -7522,7 +7503,7 @@ create-require@^1.1.0:
75227503
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
75237504
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
75247505

7525-
cross-fetch@3.1.5, cross-fetch@^3.1.5:
7506+
cross-fetch@3.1.5:
75267507
version "3.1.5"
75277508
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
75287509
integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
@@ -8825,7 +8806,7 @@ ethereumjs-util@7.1.5, ethereumjs-util@^7.0.10, ethereumjs-util@^7.1.3, ethereum
88258806
ethereum-cryptography "^0.1.3"
88268807
rlp "^2.2.4"
88278808

8828-
ethers@5.5.3, ethers@5.5.4, ethers@5.7.0, ethers@5.7.2, ethers@^5.6.2, ethers@^5.6.8, ethers@^5.7.0, ethers@^5.7.2:
8809+
ethers@5.5.3, ethers@5.5.4, ethers@5.7.0, ethers@5.7.2, ethers@^5.6.2, ethers@^5.7.0, ethers@^5.7.2:
88298810
version "5.7.0"
88308811
resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.0.tgz#0055da174b9e076b242b8282638bc94e04b39835"
88318812
integrity sha512-5Xhzp2ZQRi0Em+0OkOcRHxPzCfoBfgtOQA+RUylSkuHbhTEaQklnYi2hsWbRgs3ztJsXVXd9VKBcO1ScWL8YfA==
@@ -10406,6 +10387,11 @@ isomorphic-ws@^4.0.1:
1040610387
resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
1040710388
integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
1040810389

10390+
isows@1.0.3:
10391+
version "1.0.3"
10392+
resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.3.tgz#93c1cf0575daf56e7120bab5c8c448b0809d0d74"
10393+
integrity sha512-2cKei4vlmg2cxEjm3wVSqn8pcoRF/LX/wpifuuNquFO4SQmPwarClT+SUCA2lt+l581tTeZIPIZuIDo2jWN1fg==
10394+
1040910395
isstream@~0.1.2:
1041010396
version "0.1.2"
1041110397
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -15747,6 +15733,20 @@ viem@^1.0.0:
1574715733
isomorphic-ws "5.0.0"
1574815734
ws "8.13.0"
1574915735

15736+
viem@^1.6.0:
15737+
version "1.21.4"
15738+
resolved "https://registry.yarnpkg.com/viem/-/viem-1.21.4.tgz#883760e9222540a5a7e0339809202b45fe6a842d"
15739+
integrity sha512-BNVYdSaUjeS2zKQgPs+49e5JKocfo60Ib2yiXOWBT6LuVxY1I/6fFX3waEtpXvL1Xn4qu+BVitVtMh9lyThyhQ==
15740+
dependencies:
15741+
"@adraffy/ens-normalize" "1.10.0"
15742+
"@noble/curves" "1.2.0"
15743+
"@noble/hashes" "1.3.2"
15744+
"@scure/bip32" "1.3.2"
15745+
"@scure/bip39" "1.2.1"
15746+
abitype "0.9.8"
15747+
isows "1.0.3"
15748+
ws "8.13.0"
15749+
1575015750
vm-browserify@^1.1.2:
1575115751
version "1.1.2"
1575215752
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"

0 commit comments

Comments
 (0)