Skip to content

Commit

Permalink
Merge pull request #85 from alephium/update-web3
Browse files Browse the repository at this point in the history
Update web3 SDK version
  • Loading branch information
polarker authored May 4, 2023
2 parents 3c6bad5 + d92a043 commit 1dd908d
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
6 changes: 3 additions & 3 deletions packages/dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"lint": "next lint"
},
"dependencies": {
"@alephium/get-extension-wallet": "^0.10.0",
"@alephium/web3": "^0.10.0",
"@alephium/get-extension-wallet": "^0.11.0",
"@alephium/web3": "^0.11.0",
"ethers": "^5.5.1",
"next": "^13.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
"devDependencies": {
"@alephium/cli": "^0.10.0",
"@alephium/cli": "^0.11.0",
"@types/node": "18.11.18",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"main": "index.js",
"license": "MIT",
"devDependencies": {
"@alephium/get-extension-wallet": "^0.10.0",
"@alephium/get-extension-wallet": "^0.11.0",
"@alephium/ledger-app": "^0.2.0",
"@alephium/token-list": "0.0.7",
"@alephium/web3": "^0.10.0",
"@alephium/web3-test": "^0.10.0",
"@alephium/web3-wallet": "^0.10.0",
"@alephium/web3": "^0.11.0",
"@alephium/web3-test": "^0.11.0",
"@alephium/web3-wallet": "^0.11.0",
"@ledgerhq/hw-transport-webusb": "6.27.10",
"@ledgerhq/hw-transport-webhid": "6.27.10",
"@playwright/test": "^1.23.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/extension/src/inpage/alephiumWindowObject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const alephiumWindowObject: AlephiumWindowObject = new (class extends Ale

sendMessage({
type: "ALPH_CONNECT_DAPP",
data: { host: window.location.host, networkId: options.networkId, group: options.chainGroup, keyType: options.keyType },
data: { host: window.location.host, networkId: options.networkId, group: options.addressGroup, keyType: options.keyType },
})

const walletAccount = await walletAccountP
Expand Down
2 changes: 1 addition & 1 deletion packages/extension/src/inpage/inpage.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export interface NostrObject {
export interface RequestOptions {
host: string
address?: Address
chainGroup?: number
addressGroup?: number
keyType?: KeyType
networkId?: string
}
2 changes: 1 addition & 1 deletion packages/extension/src/shared/preAuthorizations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function matchAuthorizedOptions(account: PreAuthorization, options: RequestOptio
return account.host === options.host &&
(options.networkId === undefined || account.account.networkId === options.networkId) &&
(options.address === undefined || account.account.address === options.address) &&
(options.chainGroup === undefined || groupOfAddress(account.account.address) === options.chainGroup)
(options.addressGroup === undefined || groupOfAddress(account.account.address) === options.addressGroup)
}

export const isPreAuthorized = async (
Expand Down
52 changes: 26 additions & 26 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@
jest "^28.1.3"
prettier "^2.8.7"

"@alephium/cli@^0.10.0":
version "0.10.0"
resolved "https://registry.yarnpkg.com/@alephium/cli/-/cli-0.10.0.tgz#85ef3b8187d4a601f5ebfefa0fb6cf77b8f3c853"
integrity sha512-TlNEcmuk5ffyI9QOMycbqLwd8LXzSk2O293CQ9o7HToHpAyrBHuRi7g73djxI1vsJ7bfs19wnuMNIJYMw4gH6g==
"@alephium/cli@^0.11.0":
version "0.11.0"
resolved "https://registry.yarnpkg.com/@alephium/cli/-/cli-0.11.0.tgz#353f57f8ed2db08479338dfe8e06b9da3132e4d7"
integrity sha512-cJZtT8Sdr6cKdQHwJGNGSQhoOtDLn/LUb4A/eJku7JSo+km+PXu3ASMIiO3bwNJKzxYvrQ7A2PvOI2bsXMyakg==
dependencies:
"@alephium/web3" "^0.10.0"
"@alephium/web3-wallet" "^0.10.0"
"@alephium/web3" "^0.11.0"
"@alephium/web3-wallet" "^0.11.0"
commander "^9.5.0"
cross-fetch "^3.1.5"
crypto-js "^4.1.1"
fs-extra "^10.1.0"
jest "^28.1.3"
prettier "^2.8.7"

"@alephium/get-extension-wallet@^0.10.0":
version "0.10.0"
resolved "https://registry.yarnpkg.com/@alephium/get-extension-wallet/-/get-extension-wallet-0.10.0.tgz#36c4b44d8df6ce39612c548dae665aa5b8289777"
integrity sha512-6PexG6Rn7+cFFwG+jPcxmV7aqdLnBh/fRX4WVLQZwRb4dg3/tISyGtoL7bmsm5lZE1eF8eGFSB/KWLLAWJP8lw==
"@alephium/get-extension-wallet@^0.11.0":
version "0.11.0"
resolved "https://registry.yarnpkg.com/@alephium/get-extension-wallet/-/get-extension-wallet-0.11.0.tgz#3f562b775ed8d46904782a1ae42ad0921b3f0761"
integrity sha512-36qdBXpwAs4L0nzfkUAb+VAZiJtNedmZ0sH396P8EE/zKQBLtGdChHxFWo7G9BcCgjyZKC44UUY3YIBKGrXzhA==
dependencies:
"@alephium/web3" "^0.10.0"
"@alephium/web3" "^0.11.0"
bowser "^2.11.0"

"@alephium/ledger-app@^0.2.0":
Expand All @@ -62,13 +62,13 @@
"@alephium/web3" "^0.10.2"
"@alephium/web3-wallet" "^0.10.2"

"@alephium/web3-test@^0.10.0":
version "0.10.0"
resolved "https://registry.yarnpkg.com/@alephium/web3-test/-/web3-test-0.10.0.tgz#346380690f5231cbf0abcfe278f6f0902c14b0f8"
integrity sha512-ceFsxhRaZefz8GwrTWvHYjCaybrinXSzR2mjXoOq9nepmsezHGHS2ywg2y6lEcJfw2NG7DlJuYVFUd7W4KGp1A==
"@alephium/web3-test@^0.11.0":
version "0.11.0"
resolved "https://registry.yarnpkg.com/@alephium/web3-test/-/web3-test-0.11.0.tgz#db2f365671cc9af42c566df88bfc65762904b704"
integrity sha512-1yvr41U/GAFvfhUJ/T8dziVvwseVYbtzJ8loqmGNsLzcs+lpf5vqEHmPMIrKAxkslDgCvZ36JUKY9fZ7S9JFbQ==
dependencies:
"@alephium/web3" "^0.10.0"
"@alephium/web3-wallet" "^0.10.0"
"@alephium/web3" "^0.11.0"
"@alephium/web3-wallet" "^0.11.0"

"@alephium/web3-wallet@0.10.2", "@alephium/web3-wallet@^0.10.2":
version "0.10.2"
Expand All @@ -84,12 +84,12 @@
elliptic "6.5.4"
fs-extra "10.0.1"

"@alephium/web3-wallet@^0.10.0":
version "0.10.0"
resolved "https://registry.yarnpkg.com/@alephium/web3-wallet/-/web3-wallet-0.10.0.tgz#ccbbcf6cd8c4634240e87c884c9fd16009b13c4c"
integrity sha512-2M3/JZfgcYaZyH1c3/7mkUNCTYr0ZvMhKD52z+V7sL4O0Fg2mV+8CHJtdQTtmM8oFXY/EL6TmKEA5l9ZnLjA3Q==
"@alephium/web3-wallet@^0.11.0":
version "0.11.0"
resolved "https://registry.yarnpkg.com/@alephium/web3-wallet/-/web3-wallet-0.11.0.tgz#fd64f9605cbc79121647b1904f33a6eafdee9dac"
integrity sha512-IWRKcXbuI/6al3Mf8M9bPX4fgUIRSN9YjEG3sWZe859TcNWSp5L+r8ZFpdESlPTkCpXaV1glyADxx6kLppuAFg==
dependencies:
"@alephium/web3" "^0.10.0"
"@alephium/web3" "^0.11.0"
"@noble/secp256k1" "1.7.1"
"@types/node" "^16.18.23"
bip32 "3.1.0"
Expand All @@ -114,10 +114,10 @@
elliptic "6.5.4"
eventemitter3 "^4.0.7"

"@alephium/web3@^0.10.0":
version "0.10.0"
resolved "https://registry.yarnpkg.com/@alephium/web3/-/web3-0.10.0.tgz#9a2f83b2cc3b861be9e96377448683524f3be611"
integrity sha512-BqACbz/fLGt672iX9kIXCmg0/nFJ0dvB6NXdBmeg0ZlbEOwpS/i9NZyOhBOyVwCBCudbr4GdjZ2ecHSHKqkCRA==
"@alephium/web3@^0.11.0":
version "0.11.0"
resolved "https://registry.yarnpkg.com/@alephium/web3/-/web3-0.11.0.tgz#44de1d5e6c8f0d0e0e98920237b5230e4a186eb4"
integrity sha512-s5Ro6peGh1MVBG49PpnHiAy/oC9cKrP+DLLbxe2iJ8AOrF1nOpZZLgBOCC843/jIReJOoADHr9WkmEIchGLR0A==
dependencies:
"@noble/secp256k1" "1.7.1"
async-sema "^3.1.1"
Expand Down

0 comments on commit 1dd908d

Please sign in to comment.