Skip to content

Commit

Permalink
Merge changes from 0.145.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ayushmishra2005 committed Nov 26, 2024
2 parents f731656 + b5412fa commit 96b63ed
Show file tree
Hide file tree
Showing 515 changed files with 57,433 additions and 56,142 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/chain-endpoints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
if: github.repository == 'polkadot-js/apps'
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: check
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-any.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
step: ['lint', 'test', 'build:code', 'build:i18n', 'build:electron']
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 }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
step: ['build:release:www']
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 }}
Expand All @@ -40,8 +40,8 @@ jobs:
if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable')"
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: docker
Expand All @@ -58,10 +58,10 @@ jobs:
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GH_PAT_BOT }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
- name: Prepare for app notarization (macOS)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
name: ${{ matrix.step }}
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 }}
Expand Down
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.1.0.cjs

This file was deleted.

925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.4.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ logFilters:

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.1.0.cjs
yarnPath: .yarn/releases/yarn-4.4.1.cjs
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
## vNext
...

## 0.29.0
- Update to Polkadot-JS Apps 0.145.1

## 0.28.2
- Use original inflation parameters

Expand Down
201 changes: 125 additions & 76 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 @@ -8,18 +8,18 @@
"homepage": "https://github.com/polkadot-js/apps#readme",
"license": "Apache-2.0",
"name": "polkadot-apps",
"packageManager": "yarn@4.1.0",
"packageManager": "yarn@4.4.1",
"private": true,
"repository": {
"type": "git",
"url": "https://github.com/polkadot-js/apps.git"
},
"sideEffects": false,
"type": "module",
"version": "0.28.2-cere",
"version": "0.29.0-cere",
"versions": {
"git": "0.28.2-cere",
"npm": "0.28.2-cere"
"git": "0.29.0-cere",
"npm": "0.29.0-cere"
},
"workspaces": [
"packages/*"
Expand Down Expand Up @@ -69,7 +69,7 @@
"devDependencies": {
"@crustio/crust-pin": "^1.0.0",
"@pinata/sdk": "^1.2.1",
"@polkadot/dev": "^0.78.4",
"@polkadot/dev": "^0.78.13",
"@types/chart.js": "^2.9.41",
"@types/file-saver": "^2.0.7",
"@types/react-beautiful-dnd": "^13.1.7",
Expand All @@ -91,34 +91,34 @@
"source-map-explorer": "^2.5.3"
},
"resolutions": {
"@polkadot/api": "^10.12.2",
"@polkadot/api-augment": "^10.12.2",
"@polkadot/api-base": "^10.12.2",
"@polkadot/api-contract": "^10.12.2",
"@polkadot/api-derive": "^10.12.2",
"@polkadot/hw-ledger": "^12.6.2",
"@polkadot/keyring": "^12.6.2",
"@polkadot/networks": "^12.6.2",
"@polkadot/phishing": "^0.22.3",
"@polkadot/rpc-augment": "^10.12.2",
"@polkadot/rpc-core": "^10.12.2",
"@polkadot/rpc-provider": "^10.12.2",
"@polkadot/types": "^10.12.2",
"@polkadot/types-augment": "^10.12.2",
"@polkadot/types-codec": "^10.12.2",
"@polkadot/types-create": "^10.12.2",
"@polkadot/types-known": "^10.12.2",
"@polkadot/types-support": "^10.12.2",
"@polkadot/util": "^12.6.2",
"@polkadot/util-crypto": "^12.6.2",
"@polkadot/api": "^14.0.1",
"@polkadot/api-augment": "^14.0.1",
"@polkadot/api-base": "^14.0.1",
"@polkadot/api-contract": "^14.0.1",
"@polkadot/api-derive": "^14.0.1",
"@polkadot/hw-ledger": "^13.1.1",
"@polkadot/keyring": "^13.1.1",
"@polkadot/networks": "^13.1.1",
"@polkadot/phishing": "^0.23.6",
"@polkadot/rpc-augment": "^14.0.1",
"@polkadot/rpc-core": "^14.0.1",
"@polkadot/rpc-provider": "^14.0.1",
"@polkadot/types": "^14.0.1",
"@polkadot/types-augment": "^14.0.1",
"@polkadot/types-codec": "^14.0.1",
"@polkadot/types-create": "^14.0.1",
"@polkadot/types-known": "^14.0.1",
"@polkadot/types-support": "^14.0.1",
"@polkadot/util": "^13.1.1",
"@polkadot/util-crypto": "^13.1.1",
"@polkadot/wasm-crypto": "^7.3.2",
"@polkadot/x-bigint": "^12.6.2",
"@polkadot/x-fetch": "^12.6.2",
"@polkadot/x-global": "^12.6.2",
"@polkadot/x-randomvalues": "^12.6.2",
"@polkadot/x-textdecoder": "^12.6.2",
"@polkadot/x-textencoder": "^12.6.2",
"@polkadot/x-ws": "^12.6.2",
"@polkadot/x-bigint": "^13.1.1",
"@polkadot/x-fetch": "^13.1.1",
"@polkadot/x-global": "^13.1.1",
"@polkadot/x-randomvalues": "^13.1.1",
"@polkadot/x-textdecoder": "^13.1.1",
"@polkadot/x-textencoder": "^13.1.1",
"@polkadot/x-ws": "^13.1.1",
"typescript": "^5.3.3"
}
}
25 changes: 13 additions & 12 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.134.1",
"version": "0.145.1",
"main": "index.js",
"dependencies": {
"@acala-network/type-definitions": "5.1.2",
Expand All @@ -26,9 +26,9 @@
"@edgeware/node-types": "3.6.2-wako",
"@equilab/definitions": "1.4.18",
"@fragnova/api-augment": "0.1.0-spec-1.0.4-mainnet",
"@frequency-chain/api-augment": "1.9.0",
"@frequency-chain/api-augment": "1.11.1",
"@interlay/interbtc-types": "1.13.0",
"@kiltprotocol/type-definitions": "0.34.0",
"@kiltprotocol/type-definitions": "^1.11401.0",
"@laminar/type-definitions": "0.3.1",
"@logion/node-api": "0.27.0-4",
"@mangata-finance/type-definitions": "^2.1.2",
Expand All @@ -37,16 +37,17 @@
"@peaqnetwork/type-definitions": "0.0.4",
"@pendulum-chain/type-definitions": "0.3.8",
"@phala/typedefs": "0.2.33",
"@polkadot/api": "^10.12.2",
"@polkadot/api-derive": "^10.12.2",
"@polkadot/networks": "^12.6.2",
"@polkadot/react-identicon": "^3.6.5",
"@polkadot/types": "^10.12.2",
"@polkadot/types-codec": "^10.12.2",
"@polkadot/util": "^12.6.2",
"@polkadot/api": "^14.0.1",
"@polkadot/api-derive": "^14.0.1",
"@polkadot/networks": "^13.1.1",
"@polkadot/react-identicon": "^3.10.1",
"@polkadot/types": "^14.0.1",
"@polkadot/types-codec": "^13.2.1",
"@polkadot/util": "^13.1.1",
"@polkadot/util-crypto": "^13.1.1",
"@polkadot/wasm-util": "^7.3.2",
"@polkadot/x-fetch": "^12.6.2",
"@polkadot/x-ws": "^12.6.2",
"@polkadot/x-fetch": "^13.1.1",
"@polkadot/x-ws": "^13.1.1",
"@polymeshassociation/polymesh-types": "5.7.0",
"@snowfork/snowbridge-types": "0.2.7",
"@sora-substrate/type-definitions": "1.27.7",
Expand Down
12 changes: 1 addition & 11 deletions packages/apps-config/src/api/chain/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,10 @@
import type { OverrideBundleDefinition } from '@polkadot/types/types';

import cere from './cere.js';
import kilt from './kilt.js';

if (!kilt) {
throw new Error('Unable to retrieve kilt');
}

// NOTE: The mapping is done from chain name in system.chain
const chain: Record<string, OverrideBundleDefinition> = {
'Cere Mainnet Beta': cere,
'KILT Mashnet': kilt['KILT Mashnet'],
'KILT Peregrine': kilt['KILT Peregrine'],
'KILT Peregrine Stagenet': kilt['KILT Peregrine Stagenet'],
'KILT Spiritnet': kilt['KILT Spiritnet'],
'KILT Spiritnet Develop': kilt['KILT Spiritnet Develop']
'Cere Mainnet Beta': cere
};

export default chain;
4 changes: 1 addition & 3 deletions packages/apps-config/src/api/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ export const KUSAMA_GENESIS = getGenesis('kusama');
export const POLKADOT_GENESIS = getGenesis('polkadot');
export const POLKADOT_DENOM_BLOCK = new BN(1248328);

export const ROCOCO_GENESIS = getGenesis('rococo');

export const PASEO_GENESIS = '0x74300973617e2936e22d46e94fee5016a1a514747ae108277b770d02b47d37d9';
export const PASEO_GENESIS = '0x77afd6190f1554ad45fd0d31aee62aacc33c6db0ea801129acb813f913e0764f';

export const WESTEND_GENESIS = getGenesis('westend');

Expand Down
13 changes: 13 additions & 0 deletions packages/apps-config/src/api/derives.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { OverrideBundleDefinition, OverrideBundleType } from '@polkadot/typ

import equilibrium from './spec/equilibrium.js';
import genshiro from './spec/genshiro.js';
import hyperbridge from './spec/hyperbridge.js';
import interbtc from './spec/interbtc.js';
import mangata from './spec/mangata.js';
import subspace from './spec/subspace.js';
Expand All @@ -17,6 +18,10 @@ const mapping: [OverrideBundleDefinition, string[]][] = [
[mangata, ['mangata', 'mangata-parachain']]
];

const specMappings: [OverrideBundleDefinition, string[]][] = [
[hyperbridge, ['nexus', 'messier', 'gargantua']]
];

export function applyDerives (typesBundle: OverrideBundleType): OverrideBundleType {
mapping.forEach(([{ derives }, chains]): void => {
chains.forEach((chain): void => {
Expand All @@ -26,5 +31,13 @@ export function applyDerives (typesBundle: OverrideBundleType): OverrideBundleTy
});
});

specMappings.forEach(([spec, chains]): void => {
chains.forEach((chain): void => {
if (typesBundle.spec?.[chain]) {
typesBundle.spec[chain] = spec;
}
});
});

return typesBundle;
}
60 changes: 60 additions & 0 deletions packages/apps-config/src/api/spec/argon.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Copyright 2017-2024 @polkadot/apps-config authors & contributors
// SPDX-License-Identifier: Apache-2.0

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

/* eslint-disable sort-keys */
const definitions: OverrideBundleDefinition = {
types: [
{
// on all versions
minmax: [0, undefined],
types: {
Satoshis: 'u64'
}
}
],
runtime: {
MiningSlotApi: [
{
methods: {
next_slot_era: {
description: 'Get the next slot block start and end',
params: [],
type: '(BlockNumber, BlockNumber)'
}
},
version: 1
}
],
BitcoinApis: [
{
methods: {
redemption_rate: {
description: 'Get the current redemption rate for a given number of satoshis',
params: [
{
name: 'satoshis',
type: 'Satoshis'
}
],
type: 'Balance'
},
market_rate: {
description: 'Get the current market rate for a given number of satoshis',
params: [
{
name: 'satoshis',
type: 'Satoshis'
}
],
type: 'Balance'
}
},
version: 1
}
]
}
};

export default definitions;
Loading

0 comments on commit 96b63ed

Please sign in to comment.