Skip to content

Commit 9998b76

Browse files
authored
Merge branch 'master' into resolve-minor-confilicts
2 parents 4fe4a0e + 9b4219f commit 9998b76

File tree

22 files changed

+62
-62
lines changed

22 files changed

+62
-62
lines changed

.github/workflows/pr-any.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
step: ['lint', 'test', 'build']
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-node@v3
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-node@v4
1414
with:
1515
node-version: 'lts/*'
1616
- name: ${{ matrix.step }}

.github/workflows/push-master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
step: ['build:release']
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818
token: ${{ secrets.GH_PAT_BOT }}
19-
- uses: actions/setup-node@v3
19+
- uses: actions/setup-node@v4
2020
with:
2121
node-version: 'lts/*'
2222
- name: ${{ matrix.step }}

CONTRIBUTORS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
634 Jaco 2024 (#1302)
2-
90 Thibaut Sardan add search by address (#1198)
3-
13 Tarik Gul Update readme with notice (#1341)
2+
91 Thibaut Sardan fix typos (#1343)
3+
14 Tarik Gul Update ci checkout and setup_node to v4 (#1344)
44
7 Ivan Rukhavets Mention derivation in FAQ (#334)
55
4 Amaury Martiny PostMessageProvider with on('connected' | 'disconnected') (#279)
66
3 Antoine Estienne Add eth test for extension signature (#909)

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
},
1515
"sideEffects": false,
1616
"type": "module",
17-
"version": "0.46.10-3-x",
17+
"version": "0.46.10-5-x",
1818
"versions": {
19-
"git": "0.46.10-3-x",
19+
"git": "0.46.10-5-x",
2020
"npm": "0.46.9"
2121
},
2222
"workspaces": [

packages/extension-base/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"./packageDetect.cjs"
1919
],
2020
"type": "module",
21-
"version": "0.46.10-3-x",
21+
"version": "0.46.10-5-x",
2222
"main": "index.js",
2323
"dependencies": {
2424
"@polkadot/api": "^10.12.4",
25-
"@polkadot/extension-chains": "0.46.10-3-x",
26-
"@polkadot/extension-dapp": "0.46.10-3-x",
27-
"@polkadot/extension-inject": "0.46.10-3-x",
25+
"@polkadot/extension-chains": "0.46.10-5-x",
26+
"@polkadot/extension-dapp": "0.46.10-5-x",
27+
"@polkadot/extension-inject": "0.46.10-5-x",
2828
"@polkadot/keyring": "^12.6.2",
2929
"@polkadot/networks": "^12.6.2",
3030
"@polkadot/phishing": "^0.22.4",
@@ -39,6 +39,6 @@
3939
"tslib": "^2.6.2"
4040
},
4141
"devDependencies": {
42-
"@polkadot/extension-mocks": "0.46.10-3-x"
42+
"@polkadot/extension-mocks": "0.46.10-5-x"
4343
}
4444
}

packages/extension-base/src/background/handlers/Extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export default class Extension {
130130

131131
this.#state.updateAuthorizedAccounts(authorizedAccountsDiff);
132132

133-
// cycle through default account selection for auth and remove any occurence of the account
133+
// cycle through default account selection for auth and remove any occurrence of the account
134134
const newDefaultAuthAccounts = this.#state.defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
135135

136136
this.#state.updateDefaultAuthAccounts(newDefaultAuthAccounts);

packages/extension-base/src/packageInfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
// Do not edit, auto-generated by @polkadot/dev
55

6-
export const packageInfo = { name: '@polkadot/extension-base', path: 'auto', type: 'auto', version: '0.46.10-3-x' };
6+
export const packageInfo = { name: '@polkadot/extension-base', path: 'auto', type: 'auto', version: '0.46.10-5-x' };

packages/extension-base/src/page/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Injected from './Injected.js';
1212
// when sending a message from the injector to the extension, we
1313
// - create an event - this we send to the loader
1414
// - the loader takes this event and uses port.postMessage to background
15-
// - on response, the loader creates a reponse event
15+
// - on response, the loader creates a response event
1616
// - this injector, listens on the events, maps it to the original
1717
// - resolves/rejects the promise with the result (or sub data)
1818

packages/extension-chains/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"./packageDetect.cjs"
1919
],
2020
"type": "module",
21-
"version": "0.46.10-3-x",
21+
"version": "0.46.10-5-x",
2222
"main": "index.js",
2323
"dependencies": {
24-
"@polkadot/extension-inject": "0.46.10-3-x",
24+
"@polkadot/extension-inject": "0.46.10-5-x",
2525
"@polkadot/networks": "^12.6.2",
2626
"@polkadot/util": "^12.6.2",
2727
"@polkadot/util-crypto": "^12.6.2",

packages/extension-chains/src/packageInfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
// Do not edit, auto-generated by @polkadot/dev
55

6-
export const packageInfo = { name: '@polkadot/extension-chains', path: 'auto', type: 'auto', version: '0.46.10-3-x' };
6+
export const packageInfo = { name: '@polkadot/extension-chains', path: 'auto', type: 'auto', version: '0.46.10-5-x' };

0 commit comments

Comments
 (0)