Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade solana web3.js #25

Merged
merged 4 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/css/bootstrap.css">
<script src="https://cdn.ethers.io/lib/ethers-5.6.umd.min.js" type="application/javascript"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@uiw/copy-to-clipboard/dist/copy-to-clipboard.umd.js"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/solana-web3.js@1"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/solana-web3.js@1.26.0"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/web3-blockchains@9"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected]"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/walletconnect-v1@1"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected]"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/coinbase-wallet-sdk@3.6.4"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/coinbase-wallet-sdk@3.8.2"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/web3-tokens@10"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/qr-code-styling@1"></script>
<script src="tmp/index.dev.js"></script>
Expand Down Expand Up @@ -824,7 +824,7 @@ <h5 class="px-4">Sign message</h5>
</div>
</div>
<div class="px-4 pt-3">
<button class='btn btn-primary' onClick='window.wallet.sign("This is a test message\n\n And a new line").then((signature)=>{console.log(signature)})'>Try it</button>
<button class='btn btn-primary' onClick='window.wallet.sign("This is a test message\n\n And a new line").then((signature)=>{console.log(signature);alert(signature)})'>Try it</button>
</div>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions dist/esm/index.evm.js
Original file line number Diff line number Diff line change
Expand Up @@ -1927,9 +1927,10 @@ class WalletLink {

await connect({ uri: this.connector.qrUrl });

_optionalChain([document, 'access', _ => _.querySelector, 'call', _2 => _2('.-cbwsdk-extension-dialog-container'), 'optionalAccess', _3 => _3.setAttribute, 'call', _4 => _4('style', 'display: none;')]);
_optionalChain([document, 'access', _ => _.querySelector, 'call', _2 => _2('.-cbwsdk-css-reset'), 'optionalAccess', _3 => _3.setAttribute, 'call', _4 => _4('style', 'display: none;')]);
_optionalChain([document, 'access', _5 => _5.querySelector, 'call', _6 => _6('.-cbwsdk-extension-dialog-container'), 'optionalAccess', _7 => _7.setAttribute, 'call', _8 => _8('style', 'display: none;')]);
setTimeout(()=>{
if(_optionalChain([this, 'optionalAccess', _5 => _5.connector, 'optionalAccess', _6 => _6._relay, 'optionalAccess', _7 => _7.ui, 'optionalAccess', _8 => _8.linkFlow, 'optionalAccess', _9 => _9.isOpen])){
if(_optionalChain([this, 'optionalAccess', _9 => _9.connector, 'optionalAccess', _10 => _10._relay, 'optionalAccess', _11 => _11.ui, 'optionalAccess', _12 => _12.linkFlow, 'optionalAccess', _13 => _13.isOpen])){
this.connector._relay.ui.linkFlow.isOpen = false;
}
}, 10);
Expand Down
5 changes: 3 additions & 2 deletions dist/esm/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions dist/umd/index.evm.js
Original file line number Diff line number Diff line change
Expand Up @@ -1930,9 +1930,10 @@

await connect({ uri: this.connector.qrUrl });

_optionalChain([document, 'access', _ => _.querySelector, 'call', _2 => _2('.-cbwsdk-extension-dialog-container'), 'optionalAccess', _3 => _3.setAttribute, 'call', _4 => _4('style', 'display: none;')]);
_optionalChain([document, 'access', _ => _.querySelector, 'call', _2 => _2('.-cbwsdk-css-reset'), 'optionalAccess', _3 => _3.setAttribute, 'call', _4 => _4('style', 'display: none;')]);
_optionalChain([document, 'access', _5 => _5.querySelector, 'call', _6 => _6('.-cbwsdk-extension-dialog-container'), 'optionalAccess', _7 => _7.setAttribute, 'call', _8 => _8('style', 'display: none;')]);
setTimeout(()=>{
if(_optionalChain([this, 'optionalAccess', _5 => _5.connector, 'optionalAccess', _6 => _6._relay, 'optionalAccess', _7 => _7.ui, 'optionalAccess', _8 => _8.linkFlow, 'optionalAccess', _9 => _9.isOpen])){
if(_optionalChain([this, 'optionalAccess', _9 => _9.connector, 'optionalAccess', _10 => _10._relay, 'optionalAccess', _11 => _11.ui, 'optionalAccess', _12 => _12.linkFlow, 'optionalAccess', _13 => _13.isOpen])){
this.connector._relay.ui.linkFlow.isOpen = false;
}
}, 10);
Expand Down
5 changes: 3 additions & 2 deletions dist/umd/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.evm.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@depay/web3-wallets-evm",
"moduleName": "Web3Wallets",
"version": "16.3.6",
"version": "16.3.7",
"description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.",
"main": "dist/umd/index.evm.js",
"module": "dist/esm/index.evm.js",
Expand All @@ -24,7 +24,7 @@
"private": false,
"dependencies": {},
"peerDependencies": {
"@depay/coinbase-wallet-sdk": "3.6.4",
"@depay/coinbase-wallet-sdk": "3.8.2",
"@depay/walletconnect-v1": "^1.8.0",
"@depay/walletconnect-v2": "^2.9.2",
"@depay/web3-blockchains": "^9.1.4",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@depay/web3-wallets",
"moduleName": "Web3Wallets",
"version": "16.3.6",
"version": "16.3.7",
"description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.",
"main": "dist/umd/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -32,8 +32,8 @@
"homepage": "https://depay.com",
"private": false,
"peerDependencies": {
"@depay/coinbase-wallet-sdk": "3.6.4",
"@depay/solana-web3.js": "^1.25.1",
"@depay/coinbase-wallet-sdk": "3.8.2",
"@depay/solana-web3.js": "^1.26.0",
"@depay/walletconnect-v1": "^1.8.0",
"@depay/walletconnect-v2": "^2.9.2",
"@depay/web3-blockchains": "^9.2.5",
Expand All @@ -46,8 +46,8 @@
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-env": "^7.12.7",
"@depay/coinbase-wallet-sdk": "3.6.4",
"@depay/solana-web3.js": "^1.25.1",
"@depay/coinbase-wallet-sdk": "3.8.2",
"@depay/solana-web3.js": "^1.26.0",
"@depay/walletconnect-v1": "^1.8.0",
"@depay/walletconnect-v2": "^2.9.2",
"@depay/web3-blockchains": "^9.2.5",
Expand Down
6 changes: 3 additions & 3 deletions package.solana.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@depay/web3-wallets-solana",
"moduleName": "Web3Wallets",
"version": "16.3.6",
"version": "16.3.7",
"description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.",
"main": "dist/umd/index.solana.js",
"module": "dist/esm/index.solana.js",
Expand All @@ -24,8 +24,8 @@
"private": false,
"dependencies": {},
"peerDependencies": {
"@depay/coinbase-wallet-sdk": "3.6.4",
"@depay/solana-web3.js": "^1.25.1",
"@depay/coinbase-wallet-sdk": "3.8.2",
"@depay/solana-web3.js": "^1.26.0",
"@depay/walletconnect-v1": "^1.8.0",
"@depay/walletconnect-v2": "^2.9.2",
"@depay/web3-blockchains": "^9.1.4",
Expand Down
1 change: 1 addition & 0 deletions src/wallets/WalletLink.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class WalletLink {

await connect({ uri: this.connector.qrUrl })

document.querySelector('.-cbwsdk-css-reset')?.setAttribute('style', 'display: none;')
document.querySelector('.-cbwsdk-extension-dialog-container')?.setAttribute('style', 'display: none;')
setTimeout(()=>{
if(this?.connector?._relay?.ui?.linkFlow?.isOpen){
Expand Down
25 changes: 16 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -903,10 +903,10 @@
"@babel/helper-validator-identifier" "^7.14.9"
to-fast-properties "^2.0.0"

"@coinbase/wallet-sdk@^3.6.4":
version "3.7.1"
resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.7.1.tgz#44b3b7a925ff5cc974e4cbf7a44199ffdcf03541"
integrity sha512-LjyoDCB+7p0waQXfK+fUgcAs3Ezk6S6e+LYaoFjpJ6c9VTop3NyZF40Pi7df4z7QJohCwzuIDjz0Rhtig6Y7Pg==
"@coinbase/wallet-sdk@3.7.2":
version "3.7.2"
resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.7.2.tgz#7a89bd9e3a06a1f26d4480d8642af33fb0c7e3aa"
integrity sha512-lIGvXMsgpsQWci/XOMQIJ2nIZ8JUy/L+bvC0wkRaYarr0YylwpXrJ2gRM3hCXPS477pkyO7N/kSiAoRgEXUdJQ==
dependencies:
"@metamask/safe-event-emitter" "2.0.0"
"@solana/web3.js" "^1.70.1"
Expand All @@ -926,12 +926,12 @@
stream-browserify "^3.0.0"
util "^0.12.4"

"@depay/coinbase-wallet-sdk@3.6.4":
version "3.6.4"
resolved "https://registry.yarnpkg.com/@depay/coinbase-wallet-sdk/-/coinbase-wallet-sdk-3.6.4.tgz#2adb0275d11cf43566bbaabc9eaa667c76d8477f"
integrity sha512-/+iN4K5AignOiGaahsgxKUWnlx2GnjG4fwgeht4y73o7h+/D4w3x1ZTMqTTBH1O0aiWm9fl83jJF10Aso1b0GQ==
"@depay/coinbase-wallet-sdk@3.8.2":
version "3.8.2"
resolved "https://registry.yarnpkg.com/@depay/coinbase-wallet-sdk/-/coinbase-wallet-sdk-3.8.2.tgz#f27ab1bde4042bcb233c7d57c19feffb2d9f1e84"
integrity sha512-x3vJifXaae6gA+YS+6tAv7nRyHW2yYSLlD/F1GPK4cC2q70sbZ90wJ9DzyHADn2Fwh0iMA8/c4p7TdVk3WwgNQ==
dependencies:
"@coinbase/wallet-sdk" "^3.6.4"
"@coinbase/wallet-sdk" "3.7.2"

"@depay/solana-web3.js@^1.25.1":
version "1.25.1"
Expand All @@ -940,6 +940,13 @@
dependencies:
bs58 "^5.0.0"

"@depay/solana-web3.js@^1.26.0":
version "1.26.0"
resolved "https://registry.yarnpkg.com/@depay/solana-web3.js/-/solana-web3.js-1.26.0.tgz#6234cd46779924a930d6b6021b66a25c18b38365"
integrity sha512-aAhDxfNGraE8VBwM5g/BhHnNCENlLSKDJ3yIh2EZd4mfmKM/4utv0cNUhTEytUAvvFoaMcOXXQ5U5sE1IMXFrQ==
dependencies:
bs58 "^5.0.0"

"@depay/walletconnect-v1@^1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@depay/walletconnect-v1/-/walletconnect-v1-1.8.0.tgz#b3f3ca13ca4db148c54886f8b921ea185c1bda17"
Expand Down
Loading