Merge branch 'master' into resolve-minor-confilicts

polkadot-js · Apr 10, 2024 · 9998b76 · 9998b76
2 parents 4fe4a0e + 9b4219f
commit 9998b76
Show file tree

Hide file tree

Showing 22 changed files with 62 additions and 62 deletions.
diff --git a/.github/workflows/pr-any.yml b/.github/workflows/pr-any.yml
@@ -9,8 +9,8 @@ jobs:
         step: ['lint', 'test', 'build']
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
         node-version: 'lts/*'
     - name: ${{ matrix.step }}

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -12,11 +12,11 @@ jobs:
         step: ['build:release']
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         token: ${{ secrets.GH_PAT_BOT }}
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: 'lts/*'
     - name: ${{ matrix.step }}

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,6 +1,6 @@
      634	Jaco                          	2024 (#1302)
-      90	Thibaut Sardan                	add search by address (#1198)
-      13	Tarik Gul                     	Update readme with notice (#1341)
+      91	Thibaut Sardan                	fix typos (#1343)
+      14	Tarik Gul                     	Update ci checkout and setup_node to v4 (#1344)
        7	Ivan Rukhavets                	Mention derivation in FAQ (#334)
        4	Amaury Martiny                	PostMessageProvider with on('connected' | 'disconnected') (#279)
        3	Antoine Estienne              	Add eth test for extension signature (#909)

diff --git a/package.json b/package.json
@@ -14,9 +14,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "versions": {
-    "git": "0.46.10-3-x",
+    "git": "0.46.10-5-x",
     "npm": "0.46.9"
   },
   "workspaces": [

diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json
@@ -18,13 +18,13 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "main": "index.js",
   "dependencies": {
     "@polkadot/api": "^10.12.4",
-    "@polkadot/extension-chains": "0.46.10-3-x",
-    "@polkadot/extension-dapp": "0.46.10-3-x",
-    "@polkadot/extension-inject": "0.46.10-3-x",
+    "@polkadot/extension-chains": "0.46.10-5-x",
+    "@polkadot/extension-dapp": "0.46.10-5-x",
+    "@polkadot/extension-inject": "0.46.10-5-x",
     "@polkadot/keyring": "^12.6.2",
     "@polkadot/networks": "^12.6.2",
     "@polkadot/phishing": "^0.22.4",
@@ -39,6 +39,6 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@polkadot/extension-mocks": "0.46.10-3-x"
+    "@polkadot/extension-mocks": "0.46.10-5-x"
   }
 }
diff --git a/packages/extension-base/src/background/handlers/Extension.ts b/packages/extension-base/src/background/handlers/Extension.ts
@@ -130,7 +130,7 @@ export default class Extension {
 
     this.#state.updateAuthorizedAccounts(authorizedAccountsDiff);
 
-    // cycle through default account selection for auth and remove any occurence of the account
+    // cycle through default account selection for auth and remove any occurrence of the account
     const newDefaultAuthAccounts = this.#state.defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
 
     this.#state.updateDefaultAuthAccounts(newDefaultAuthAccounts);

diff --git a/packages/extension-base/src/packageInfo.ts b/packages/extension-base/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/extension-base', path: 'auto', type: 'auto', version: '0.46.10-3-x' };
+export const packageInfo = { name: '@polkadot/extension-base', path: 'auto', type: 'auto', version: '0.46.10-5-x' };
diff --git a/packages/extension-base/src/page/index.ts b/packages/extension-base/src/page/index.ts
@@ -12,7 +12,7 @@ import Injected from './Injected.js';
 // when sending a message from the injector to the extension, we
 //  - create an event - this we send to the loader
 //  - the loader takes this event and uses port.postMessage to background
-//  - on response, the loader creates a reponse event
+//  - on response, the loader creates a response event
 //  - this injector, listens on the events, maps it to the original
 //  - resolves/rejects the promise with the result (or sub data)
 

diff --git a/packages/extension-chains/package.json b/packages/extension-chains/package.json
@@ -18,10 +18,10 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/extension-inject": "0.46.10-3-x",
+    "@polkadot/extension-inject": "0.46.10-5-x",
     "@polkadot/networks": "^12.6.2",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",

diff --git a/packages/extension-chains/src/packageInfo.ts b/packages/extension-chains/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/extension-chains', path: 'auto', type: 'auto', version: '0.46.10-3-x' };
+export const packageInfo = { name: '@polkadot/extension-chains', path: 'auto', type: 'auto', version: '0.46.10-5-x' };
diff --git a/packages/extension-compat-metamask/package.json b/packages/extension-compat-metamask/package.json
@@ -18,11 +18,11 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "main": "index.js",
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@polkadot/extension-inject": "0.46.10-3-x",
+    "@polkadot/extension-inject": "0.46.10-5-x",
     "@polkadot/types": "^10.12.4",
     "@polkadot/util": "^12.6.2",
     "tslib": "^2.6.2",

diff --git a/packages/extension-compat-metamask/src/packageInfo.ts b/packages/extension-compat-metamask/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/extension-compat-metamask', path: 'auto', type: 'auto', version: '0.46.10-3-x' };
+export const packageInfo = { name: '@polkadot/extension-compat-metamask', path: 'auto', type: 'auto', version: '0.46.10-5-x' };
diff --git a/packages/extension-dapp/package.json b/packages/extension-dapp/package.json
@@ -18,11 +18,11 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/extension-inject": "0.46.10-3-x",
     "@polkadot/types": "^10.11.2",
+    "@polkadot/extension-inject": "0.46.10-5-x",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
     "tslib": "^2.6.2"

diff --git a/packages/extension-dapp/src/bundle.ts b/packages/extension-dapp/src/bundle.ts
@@ -190,8 +190,8 @@ export function web3Enable (originName: string, compatInits: (() => Promise<bool
 /**
  * @summary Retrieves all the accounts across all providers
  * @description
- * This returns the full list of account available (accross all extensions) to
- * the page. Filtereing options are available of a per-extension, per type and
+ * This returns the full list of account available (across all extensions) to
+ * the page. Filtering options are available of a per-extension, per type and
  * per-genesisHash basis. Optionally the accounts can be encoded with the provided
  * ss58Format
  */

diff --git a/packages/extension-dapp/src/packageInfo.ts b/packages/extension-dapp/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/extension-dapp', path: 'auto', type: 'auto', version: '0.46.10-3-x' };
+export const packageInfo = { name: '@polkadot/extension-dapp', path: 'auto', type: 'auto', version: '0.46.10-5-x' };
diff --git a/packages/extension-inject/package.json b/packages/extension-inject/package.json
@@ -15,7 +15,7 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "main": "index.js",
   "dependencies": {
     "@polkadot/api": "^10.12.4",

diff --git a/packages/extension-inject/src/packageInfo.ts b/packages/extension-inject/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/extension-inject', path: 'auto', type: 'auto', version: '0.46.10-3-x' };
+export const packageInfo = { name: '@polkadot/extension-inject', path: 'auto', type: 'auto', version: '0.46.10-5-x' };
diff --git a/packages/extension-mocks/package.json b/packages/extension-mocks/package.json
@@ -15,7 +15,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "main": "index.js",
   "dependencies": {
     "sinon-chrome": "^3.0.1",

diff --git a/packages/extension-ui/package.json b/packages/extension-ui/package.json
@@ -15,18 +15,18 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-brands-svg-icons": "^6.5.1",
     "@fortawesome/free-regular-svg-icons": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@polkadot/api": "^10.12.4",
-    "@polkadot/extension-base": "0.46.10-3-x",
-    "@polkadot/extension-chains": "0.46.10-3-x",
-    "@polkadot/extension-dapp": "0.46.10-3-x",
-    "@polkadot/extension-inject": "0.46.10-3-x",
+    "@polkadot/extension-base": "0.46.10-5-x",
+    "@polkadot/extension-chains": "0.46.10-5-x",
+    "@polkadot/extension-dapp": "0.46.10-5-x",
+    "@polkadot/extension-inject": "0.46.10-5-x",
     "@polkadot/hw-ledger": "^12.6.2",
     "@polkadot/keyring": "^12.6.2",
     "@polkadot/networks": "^12.6.2",
@@ -51,7 +51,7 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@polkadot/extension-mocks": "0.46.10-3-x",
+    "@polkadot/extension-mocks": "0.46.10-5-x",
     "@types/enzyme": "^3.10.18",
     "@types/enzyme-adapter-react-16": "^1.0.9",
     "@types/file-saver": "^2.0.7",

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -15,12 +15,12 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.46.10-3-x",
+  "version": "0.46.10-5-x",
   "dependencies": {
     "@polkadot/api": "^10.12.4",
-    "@polkadot/extension-base": "0.46.10-3-x",
-    "@polkadot/extension-inject": "0.46.10-3-x",
-    "@polkadot/extension-ui": "0.46.10-3-x",
+    "@polkadot/extension-base": "0.46.10-5-x",
+    "@polkadot/extension-inject": "0.46.10-5-x",
+    "@polkadot/extension-ui": "0.46.10-5-x",
     "tslib": "^2.6.2"
   },
   "devDependencies": {

diff --git a/packages/extension/src/packageInfo.ts b/packages/extension/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/extension', path: 'auto', type: 'auto', version: '0.46.10-3-x' };
+export const packageInfo = { name: '@polkadot/extension', path: 'auto', type: 'auto', version: '0.46.10-5-x' };
diff --git a/yarn.lock b/yarn.lock
@@ -1100,15 +1100,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/extension-base@npm:0.46.10-3-x, @polkadot/extension-base@workspace:packages/extension-base":
+"@polkadot/extension-base@npm:0.46.10-5-x, @polkadot/extension-base@workspace:packages/extension-base":
   version: 0.0.0-use.local
   resolution: "@polkadot/extension-base@workspace:packages/extension-base"
   dependencies:
     "@polkadot/api": "npm:^10.12.4"
-    "@polkadot/extension-chains": "npm:0.46.10-3-x"
-    "@polkadot/extension-dapp": "npm:0.46.10-3-x"
-    "@polkadot/extension-inject": "npm:0.46.10-3-x"
-    "@polkadot/extension-mocks": "npm:0.46.10-3-x"
+    "@polkadot/extension-chains": "npm:0.46.10-5-x"
+    "@polkadot/extension-dapp": "npm:0.46.10-5-x"
+    "@polkadot/extension-inject": "npm:0.46.10-5-x"
+    "@polkadot/extension-mocks": "npm:0.46.10-5-x"
     "@polkadot/keyring": "npm:^12.6.2"
     "@polkadot/networks": "npm:^12.6.2"
     "@polkadot/phishing": "npm:^0.22.4"
@@ -1124,11 +1124,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/extension-chains@npm:0.46.10-3-x, @polkadot/extension-chains@workspace:packages/extension-chains":
+"@polkadot/extension-chains@npm:0.46.10-5-x, @polkadot/extension-chains@workspace:packages/extension-chains":
   version: 0.0.0-use.local
   resolution: "@polkadot/extension-chains@workspace:packages/extension-chains"
   dependencies:
-    "@polkadot/extension-inject": "npm:0.46.10-3-x"
+    "@polkadot/extension-inject": "npm:0.46.10-5-x"
     "@polkadot/networks": "npm:^12.6.2"
     "@polkadot/util": "npm:^12.6.2"
     "@polkadot/util-crypto": "npm:^12.6.2"
@@ -1144,7 +1144,7 @@ __metadata:
   resolution: "@polkadot/extension-compat-metamask@workspace:packages/extension-compat-metamask"
   dependencies:
     "@metamask/detect-provider": "npm:^2.0.0"
-    "@polkadot/extension-inject": "npm:0.46.10-3-x"
+    "@polkadot/extension-inject": "npm:0.46.10-5-x"
     "@polkadot/types": "npm:^10.12.4"
     "@polkadot/util": "npm:^12.6.2"
     tslib: "npm:^2.6.2"
@@ -1155,12 +1155,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/extension-dapp@npm:0.46.10-3-x, @polkadot/extension-dapp@workspace:packages/extension-dapp":
+"@polkadot/extension-dapp@npm:0.46.10-5-x, @polkadot/extension-dapp@workspace:packages/extension-dapp":
   version: 0.0.0-use.local
   resolution: "@polkadot/extension-dapp@workspace:packages/extension-dapp"
   dependencies:
-    "@polkadot/extension-inject": "npm:0.46.10-3-x"
     "@polkadot/types": "npm:^10.11.2"
+    "@polkadot/extension-inject": "npm:0.46.10-5-x"
     "@polkadot/util": "npm:^12.6.2"
     "@polkadot/util-crypto": "npm:^12.6.2"
     tslib: "npm:^2.6.2"
@@ -1171,7 +1171,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/extension-inject@npm:0.46.10-3-x, @polkadot/extension-inject@workspace:packages/extension-inject":
+"@polkadot/extension-inject@npm:0.46.10-5-x, @polkadot/extension-inject@workspace:packages/extension-inject":
   version: 0.0.0-use.local
   resolution: "@polkadot/extension-inject@workspace:packages/extension-inject"
   dependencies:
@@ -1190,7 +1190,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/extension-mocks@npm:0.46.10-3-x, @polkadot/extension-mocks@workspace:packages/extension-mocks":
+"@polkadot/extension-mocks@npm:0.46.10-5-x, @polkadot/extension-mocks@workspace:packages/extension-mocks":
   version: 0.0.0-use.local
   resolution: "@polkadot/extension-mocks@workspace:packages/extension-mocks"
   dependencies:
@@ -1199,7 +1199,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/extension-ui@npm:0.46.10-3-x, @polkadot/extension-ui@workspace:packages/extension-ui":
+"@polkadot/extension-ui@npm:0.46.10-5-x, @polkadot/extension-ui@workspace:packages/extension-ui":
   version: 0.0.0-use.local
   resolution: "@polkadot/extension-ui@workspace:packages/extension-ui"
   dependencies:
@@ -1209,11 +1209,11 @@ __metadata:
     "@fortawesome/free-solid-svg-icons": "npm:^6.5.1"
     "@fortawesome/react-fontawesome": "npm:^0.2.0"
     "@polkadot/api": "npm:^10.12.4"
-    "@polkadot/extension-base": "npm:0.46.10-3-x"
-    "@polkadot/extension-chains": "npm:0.46.10-3-x"
-    "@polkadot/extension-dapp": "npm:0.46.10-3-x"
-    "@polkadot/extension-inject": "npm:0.46.10-3-x"
-    "@polkadot/extension-mocks": "npm:0.46.10-3-x"
+    "@polkadot/extension-base": "npm:0.46.10-5-x"
+    "@polkadot/extension-chains": "npm:0.46.10-5-x"
+    "@polkadot/extension-dapp": "npm:0.46.10-5-x"
+    "@polkadot/extension-inject": "npm:0.46.10-5-x"
+    "@polkadot/extension-mocks": "npm:0.46.10-5-x"
     "@polkadot/hw-ledger": "npm:^12.6.2"
     "@polkadot/keyring": "npm:^12.6.2"
     "@polkadot/networks": "npm:^12.6.2"
@@ -1257,9 +1257,9 @@ __metadata:
   dependencies:
     "@polkadot/api": "npm:^10.12.4"
     "@polkadot/dev": "npm:^0.78.3"
-    "@polkadot/extension-base": "npm:0.46.10-3-x"
-    "@polkadot/extension-inject": "npm:0.46.10-3-x"
-    "@polkadot/extension-ui": "npm:0.46.10-3-x"
+    "@polkadot/extension-base": "npm:0.46.10-5-x"
+    "@polkadot/extension-inject": "npm:0.46.10-5-x"
+    "@polkadot/extension-ui": "npm:0.46.10-5-x"
     browser-resolve: "npm:^2.0.0"
     buffer: "npm:^6.0.3"
     copy-webpack-plugin: "npm:^11.0.0"