Skip to content

Commit

Permalink
Merge upstream from polkadot-js/apps@master (65fc709) (#92)
Browse files Browse the repository at this point in the history
# Merge upstream
## Upstream details

- Repository URL: https://github.com/polkadot-js/apps
- Repository name: polkadot-js/apps
- Branch: master
- Commit SHA: 65fc709

## Target details

- Repository: Cardinal-Cryptography/azero-dev
- Branch: alephzero
- Recent common ancestor with upstream:
7e55a86
  • Loading branch information
Marcin-Radecki authored Nov 13, 2023
2 parents e766e51 + 632a855 commit 8122356
Show file tree
Hide file tree
Showing 86 changed files with 1,385 additions and 2,738 deletions.
56 changes: 33 additions & 23 deletions CONTRIBUTORS

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.132.2-98-x",
"version": "0.132.2-151-x",
"versions": {
"git": "0.132.2-98-x",
"git": "0.132.2-151-x",
"npm": "0.132.1"
},
"workspaces": [
Expand Down Expand Up @@ -74,12 +74,12 @@
"devDependencies": {
"@crustio/crust-pin": "^1.0.0",
"@pinata/sdk": "^1.2.1",
"@polkadot/dev": "^0.76.18",
"@polkadot/dev": "^0.76.32",
"@types/chart.js": "^2.9.37",
"@types/file-saver": "^2.0.5",
"@types/react-beautiful-dnd": "^13.1.4",
"@types/react-copy-to-clipboard": "^5.0.4",
"@types/react-dom": "^18.2.7",
"@types/react-dom": "^18.2.13",
"@types/react-router-dom": "^5.3.3",
"@types/store": "^2.0.2",
"concurrently": "^8.2.1",
Expand All @@ -96,34 +96,34 @@
"source-map-explorer": "^2.5.3"
},
"resolutions": {
"@polkadot/api": "^10.9.1",
"@polkadot/api-augment": "^10.9.1",
"@polkadot/api-base": "^10.9.1",
"@polkadot/api-contract": "^10.9.1",
"@polkadot/api-derive": "^10.9.1",
"@polkadot/hw-ledger": "^12.4.2",
"@polkadot/keyring": "^12.4.2",
"@polkadot/networks": "^12.4.2",
"@polkadot/phishing": "^0.21.5",
"@polkadot/rpc-augment": "^10.9.1",
"@polkadot/rpc-core": "^10.9.1",
"@polkadot/rpc-provider": "^10.9.1",
"@polkadot/types": "^10.9.1",
"@polkadot/types-augment": "^10.9.1",
"@polkadot/types-codec": "^10.9.1",
"@polkadot/types-create": "^10.9.1",
"@polkadot/types-known": "^10.9.1",
"@polkadot/types-support": "^10.9.1",
"@polkadot/util": "^12.4.2",
"@polkadot/util-crypto": "^12.4.2",
"@polkadot/api": "^10.10.1",
"@polkadot/api-augment": "^10.10.1",
"@polkadot/api-base": "^10.10.1",
"@polkadot/api-contract": "^10.10.1",
"@polkadot/api-derive": "^10.10.1",
"@polkadot/hw-ledger": "^12.5.1",
"@polkadot/keyring": "^12.5.1",
"@polkadot/networks": "^12.5.1",
"@polkadot/phishing": "^0.21.6",
"@polkadot/rpc-augment": "^10.10.1",
"@polkadot/rpc-core": "^10.10.1",
"@polkadot/rpc-provider": "^10.10.1",
"@polkadot/types": "^10.10.1",
"@polkadot/types-augment": "^10.10.1",
"@polkadot/types-codec": "^10.10.1",
"@polkadot/types-create": "^10.10.1",
"@polkadot/types-known": "^10.10.1",
"@polkadot/types-support": "^10.10.1",
"@polkadot/util": "^12.5.1",
"@polkadot/util-crypto": "^12.5.1",
"@polkadot/wasm-crypto": "^7.2.2",
"@polkadot/x-bigint": "^12.4.2",
"@polkadot/x-fetch": "^12.4.2",
"@polkadot/x-global": "^12.4.2",
"@polkadot/x-randomvalues": "^12.4.2",
"@polkadot/x-textdecoder": "^12.4.2",
"@polkadot/x-textencoder": "^12.4.2",
"@polkadot/x-ws": "^12.4.2",
"typescript": "^5.1.6"
"@polkadot/x-bigint": "^12.5.1",
"@polkadot/x-fetch": "^12.5.1",
"@polkadot/x-global": "^12.5.1",
"@polkadot/x-randomvalues": "^12.5.1",
"@polkadot/x-textdecoder": "^12.5.1",
"@polkadot/x-textencoder": "^12.5.1",
"@polkadot/x-ws": "^12.5.1",
"typescript": "^5.2.2"
}
}
22 changes: 11 additions & 11 deletions packages/apps-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.132.2-98-x",
"version": "0.132.2-151-x",
"main": "index.js",
"dependencies": {
"@acala-network/type-definitions": "5.1.2",
Expand All @@ -32,22 +32,22 @@
"@kiltprotocol/type-definitions": "0.33.1",
"@laminar/type-definitions": "0.3.1",
"@logion/node-api": "0.19.0-2",
"@mangata-finance/type-definitions": "^1.0.0",
"@mangata-finance/type-definitions": "^2.0.0",
"@metaverse-network-sdk/type-definitions": "0.0.1-16",
"@parallel-finance/type-definitions": "2.0.0",
"@peaqnetwork/type-definitions": "0.0.4",
"@pendulum-chain/type-definitions": "0.3.7",
"@phala/typedefs": "0.2.33",
"@polkadot/api": "^10.9.1",
"@polkadot/api-derive": "^10.9.1",
"@polkadot/networks": "^12.4.2",
"@polkadot/react-identicon": "^3.6.2",
"@polkadot/types": "^10.9.1",
"@polkadot/types-codec": "^10.9.1",
"@polkadot/util": "^12.4.2",
"@polkadot/api": "^10.10.1",
"@polkadot/api-derive": "^10.10.1",
"@polkadot/networks": "^12.5.1",
"@polkadot/react-identicon": "^3.6.3",
"@polkadot/types": "^10.10.1",
"@polkadot/types-codec": "^10.10.1",
"@polkadot/util": "^12.5.1",
"@polkadot/wasm-util": "^7.2.2",
"@polkadot/x-fetch": "^12.4.2",
"@polkadot/x-ws": "^12.4.2",
"@polkadot/x-fetch": "^12.5.1",
"@polkadot/x-ws": "^12.5.1",
"@polymeshassociation/polymesh-types": "5.5.2",
"@snowfork/snowbridge-types": "0.2.7",
"@sora-substrate/type-definitions": "1.20.1",
Expand Down
22 changes: 22 additions & 0 deletions packages/apps-config/src/api/spec/watr.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright 2017-2023 @polkadot/apps-config authors & contributors
// SPDX-License-Identifier: Apache-2.0

import type { OverrideBundleDefinition } from '@polkadot/types/types';

// structs need to be in order
/* eslint-disable sort-keys */

const definitions: OverrideBundleDefinition = {
types: [
{
// on all versions
minmax: [0, undefined],
types: {
Address: 'AccountId',
LookupSource: 'AccountId'
}
}
]
};

export default definitions;
2 changes: 1 addition & 1 deletion packages/apps-config/src/packageInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

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

export const packageInfo = { name: '@polkadot/apps-config', path: 'auto', type: 'auto', version: '0.132.2-98-x' };
export const packageInfo = { name: '@polkadot/apps-config', path: 'auto', type: 'auto', version: '0.132.2-151-x' };
1 change: 1 addition & 0 deletions packages/apps-config/src/settings/ethereumChains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const ethereumChains = [
'moonsama',
'moonshadow',
'altbeacon',
'altbeacon-dev',
'alt-producer',
'flash-layer',
'armonia-eva',
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2017-2023 @polkadot/apps authors & contributors
// SPDX-License-Identifier: Apache-2.0

// Do not edit. Auto-generated via node scripts/imgConvert.mjs

export const chainsKreivoSVG = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjUwIiBoZWlnaHQ9IjI1MCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgMjUwIDI1MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KCTxwYXRoIGQ9Im03LjI1ZS00IDQuM2UtNGMtNy4zZS00IDAtMWUtMyAyNTAtMWUtMyAyNTAgMCA3LjNlLTQgMjUwLTRlLTMgMjUwLTRlLTMgM2UtMyAwIDNlLTMgLTI1MCAzZS0zIC0yNTAtNy4xZS00IC0xZS0zIC0wLjAwMTktMmUtMyAtMC4wMDMzNy0yZS0zeiIgZmlsbD0iI2RlY2ZmMSIvPgoJPHBhdGggZD0ibTE2MS40IDY0LjktMTYuNDMgMjcuNzYgMTguNTQgMzIuMTIgMC4yMzM0LTAuMzYxMiAxNi45NC0yOC44Ny0xNS4yOC0yNi40NmMtMC45OTY1LTEuNzI2LTIuMzg1LTMuMTM1LTMuOTk5LTQuMTg5eiIgZmlsbD0iI2I1ZjFiMSIgLz4KCTxwYXRoIGQ9Im0xODAuOSA5Ni4xM2MtMTEuNzcgMjAuMTMtMjMuNjQgNDAuMjEtMzUuNDMgNjAuMzMgMC4xNjQ0IDAuMTY0IDAuMzU4LTAuMjAzNCAwLjUzMzQtMC4yMjM5IDI2Ljc5LTE2LjQ1IDQ0LjY0LTI3LjQzIDQ5LjY2LTMwLjcgMC4wOTE4LTIuMTA4LTAuMzUxOS00LjIyMy0xLjMyOC02LjE1Ny00LjQ4MS03Ljc0OS04Ljk1MS0xNS41LTEzLjQzLTIzLjI1eiIgZmlsbD0iIzAwYTllMCIgLz4KCTxwYXRoIGQ9Im0xOTUuNiAxMjYuNGMtMTYuOTEgMTAuMi0zMy41NSAyMC44NC01MC40NCAzMS4wNyA1LjMyMiA5LjI2MSAxMC42MSAxOC41NCAxNi4wMSAyNy43NiAxLjM5OS0wLjg4MTMgMi42MTctMi4wNCAzLjU4My0zLjQyOCA0LjczNC04LjEzNCA5LjQ2MS0xNi4yNyAxNC4xOC0yNC40MmwxNS4wOC0yNi4xM2MwLjg3NTUtMS41MTcgMS4zOTQtMy4xNzMgMS41ODItNC44NTd6IiBmaWxsPSIjMDBhOWUwIiAvPgoJPHBhdGggZD0ibTEwNS44IDE1Ny44IDAuMzI2NCAwLjU1NzdjNS41MjcgOS41OTEgMTEuMDIgMTkuMiAxNi41NCAyOC43OSAwLjk5MTkgMC4wMTU3IDEuOTg0IDAuMDI0MyAyLjk3NiAwLjAzNDZoMjQuMjRjMS41NzEtNWUtMyAzLjE0MSAwIDQuNzExIDAgMi4xNzYgMCA0LjI2OC0wLjU3NzUgNi4xMDEtMS42MDgtMS44MTEtMy4xOTMtMTIuMDgtMjEuMDEtMTUuOTUtMjcuNzR6IiBmaWxsPSIjMTM3RDk3IiAvPgoJPGcgZmlsbD0iIzI5NDk0MCI+CgkJPHBhdGggZD0ibTk2LjA3IDE0MS45Yy04LjQ5MyA0Ljg5LTE3LjA4IDkuNzc4LTI1LjUzIDE0Ljc1bDE0LjAzIDI0LjNjMi4yMyAzLjg2MyA2LjM1MiA2LjI0MyAxMC44MSA2LjI0M2gyNi42bC0wLjA3MDgtMC4xMzYyYy04LjYyMS0xNS4wNS0xNy4yLTMwLjExLTI1Ljg0LTQ1LjE0eiIgLz4KCQk8cGF0aCBkPSJtNjkuMDggOTUuOTItMC4wMjg1IDAuMDQ5NzUtMTMuMTYgMjIuNzljLTIuMjMgMy44NjMtMi4yMyA4LjYyMyAwIDEyLjQ5bDE0LjMyIDI0LjgxYzAuMTMxOC0wLjA1NjkgMjUuNTUtMTQuNzEgMjUuNTUtMTQuNzFsLTAuMDE3OTUtMC4wMjk3eiIgLz4KCQk8cGF0aCBkPSJtMTIyLjggNjIuODUtMjcuNTcgMC4wMDk3Yy00LjQwNyAwLjA0OTc1LTguNDY3IDIuNDEtMTAuNjcgNi4yMzJsLTE1LjE2IDI2LjI1IDE3LjEzIDI5LjI5YzAuMDA0OS05ZS0zIDAuMDA2Ni0wLjAxMDMgMC4wMTE2My0wLjAxODlsMTguNjQtMzIuMjloMC4zMjQyYzEwLjI4LTE3LjUxIDE3LjI5LTI5LjQ4IDE3LjI5LTI5LjQ4eiIgLz4KCTwvZz4KCTxwYXRoIGQ9Im0xMjMuNSA2Mi44NS0xNy4yIDI5LjM0LTAuMDg0NSAwLjE0MzZoMzguMDVsMTYuMzMtMjcuOTJjLTEuODE2LTEuMDAyLTMuODc4LTEuNTY1LTYuMDI0LTEuNTY1eiIgZmlsbD0iI2I1ZjFiMSIgLz4KPC9zdmc+Cg==';
1 change: 1 addition & 0 deletions packages/apps-config/src/ui/logos/chains/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export { chainsGmJPEG } from './generated/gmJPEG.js';
export { chainsIdiyanaleLogoWhiteSVG } from './generated/idiyanale_logo_whiteSVG.js';
export { chainsInvarchJPEG } from './generated/invarchJPEG.js';
export { chainsJurPNG } from './generated/jurPNG.js';
export { chainsKreivoSVG } from './generated/kreivoSVG.js';
export { chainsKusamaSVG } from './generated/kusamaSVG.js';
export { chainsMangataxPNG } from './generated/mangataxPNG.js';
export { chainsMyriadPNG } from './generated/myriadPNG.js';
Expand Down
Binary file modified packages/apps-config/src/ui/logos/chains/invarch.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions packages/apps-config/src/ui/logos/chains/kreivo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8122356

Please sign in to comment.