+
{accounts?.map((item) => (
- {contacts?.map((item) => (
-
+ {contacts?.map((item) => (
+
| null;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
From 8204c9fb579b22cdc1f1c7418a23b0e98814be76 Mon Sep 17 00:00:00 2001
From: vzxh <93637628+vzxh@users.noreply.github.com>
Date: Fri, 28 Jan 2022 11:59:25 +0800
Subject: [PATCH 02/51] fix: fix callData args parse error (#124)
Co-authored-by: amigo
---
src/components/Args.tsx | 2 +-
src/components/ExtrinsicRecords.tsx | 6 +++---
src/hooks/multisig.ts | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/components/Args.tsx b/src/components/Args.tsx
index 350ddf6f..cb6c49df 100644
--- a/src/components/Args.tsx
+++ b/src/components/Args.tsx
@@ -111,7 +111,7 @@ export function Args({ args, className }: ArgsProps) {
}
if (isBalanceType(type || name) || isCrabValue(name)) {
- return formatBalance(value, +chain.tokens[0].decimal, { noDecimal: false }); // FIXME: decimal issue;
+ return formatBalance(value, +chain.tokens[0].decimal, { noDecimal: true, withThousandSplit: true }); // FIXME: decimal issue;
}
if (isDownloadType(value)) {
diff --git a/src/components/ExtrinsicRecords.tsx b/src/components/ExtrinsicRecords.tsx
index 795770c4..625f13a8 100644
--- a/src/components/ExtrinsicRecords.tsx
+++ b/src/components/ExtrinsicRecords.tsx
@@ -73,9 +73,9 @@ function Confirmed({ data, account, loading }: ConfirmedProps) {
let meta;
try {
if (typeof argsHash === 'string') {
- callDataJson = api?.registry.createType('Call', argsHash).toHuman();
- // eslint-disable-next-line no-console
- console.log('callDataJson', callDataJson);
+ const callData = api.registry.createType('Call', argsHash);
+ const { section, method } = api.registry.findMetaCall(callData.callIndex);
+ callDataJson = { ...callData.toJSON(), section, method };
} else {
callDataJson = argsHash;
}
diff --git a/src/hooks/multisig.ts b/src/hooks/multisig.ts
index 944365c2..7ea45114 100644
--- a/src/hooks/multisig.ts
+++ b/src/hooks/multisig.ts
@@ -50,11 +50,12 @@ export function useMultisig(acc?: string) {
try {
const callData = api.registry.createType('Call', call[0]);
- const callDataJson = callData.toHuman();
+ const { section, method } = api.registry.findMetaCall(callData.callIndex);
+ const callDataJson = { ...callData.toJSON(), section, method };
const hexCallData = u8aToHex(callData.toU8a());
const meta = api?.tx[callData?.section][callData.method].meta.toJSON();
- return { ...result[index], callDataJson, meta, hash: result[index].callHash, hexCallData };
+ return { ...result[index], callDataJson, callData, meta, hash: result[index].callHash, hexCallData };
} catch (_) {
return { ...result[index], callDataJson: {}, meta: {}, hash: result[index].callHash };
}
From a7017a088d46a85ef147ebbce438b239337b1c15 Mon Sep 17 00:00:00 2001
From: vzxh <93637628+vzxh@users.noreply.github.com>
Date: Wed, 9 Feb 2022 10:49:10 +0800
Subject: [PATCH 03/51] chore: update subql endpoints (#125)
---
src/config/network.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/config/network.ts b/src/config/network.ts
index ef74c103..f66f63aa 100644
--- a/src/config/network.ts
+++ b/src/config/network.ts
@@ -16,7 +16,7 @@ export const NETWORK_CONFIG: NetworkConfig = {
// rpc: 'wss://pub.elara.patract.io/polkadot',
rpc: 'wss://rpc.polkadot.io',
api: {
- subql: 'https://api.subquery.network/sq/itering/multisig-polkadot',
+ subql: 'https://api.subquery.network/sq/itering/multisig_polkadot',
// subql: 'http://localhost:3000',
},
donate: {
@@ -40,7 +40,7 @@ export const NETWORK_CONFIG: NetworkConfig = {
// rpc: 'wss://kusama.elara.patract.io',
// rpc: 'wss://kusama-rpc.polkadot.io',
api: {
- subql: 'https://api.subquery.network/sq/itering/multisig-ksm',
+ subql: 'https://api.subquery.network/sq/itering/multisig_ksm',
},
donate: {
address: 'Fzs6WWFcAuJhxAVyZa4EN2suxggjidJjV3AzJxKbRHjh2Jc',
@@ -61,7 +61,7 @@ export const NETWORK_CONFIG: NetworkConfig = {
},
rpc: 'wss://rpc.darwinia.network',
api: {
- subql: 'https://api.subquery.network/sq/itering/multisig-darwinia__aXRlc',
+ subql: 'https://api.subquery.network/sq/itering/multisig_darwinia',
},
donate: {
address: '2rbREPAhkptwCtdvU5eSGnHgFiyPcehdkXuGqFF916oYCJ7s',
@@ -81,7 +81,7 @@ export const NETWORK_CONFIG: NetworkConfig = {
},
rpc: 'wss://pangolin-rpc.darwinia.network/',
api: {
- subql: 'https://api.subquery.network/sq/itering/multisig-pangolin',
+ subql: 'https://api.subquery.network/sq/itering/multisig_pangolin',
},
donate: {
address: '2rbREPAhkptwCtdvU5eSGnHgFiyPcehdkXuGqFF916oYCJ7s',
@@ -101,7 +101,7 @@ export const NETWORK_CONFIG: NetworkConfig = {
},
rpc: 'wss://crab-rpc.darwinia.network',
api: {
- subql: 'https://api.subquery.network/sq/itering/multisig-crab__aXRlc',
+ subql: 'https://api.subquery.network/sq/itering/multisig_crab',
},
donate: {
address: '5FVFSCANyotNxJM4Crm1LQfsmNQSw3p8H7CRbegN7d5Ex91y',
From 55565b82c48e206fc45554a8e784c3970aa8f290 Mon Sep 17 00:00:00 2001
From: fewensa <37804932+fewensa@users.noreply.github.com>
Date: Mon, 14 Feb 2022 13:04:42 +0800
Subject: [PATCH 04/51] Vercel action (#126)
* Vercel action
* Change slack channel
* chore: update package-lock.json
* fix: add node_version in vercel config
* fix: use npm in vercel
* fix: change slack channel to subscan-general
Co-authored-by: vzxh
---
.github/workflows/deploy-dev.yml | 45 ++++++++++++++++++++++++++++++++
.github/workflows/deploy-prd.yml | 43 ++++++++++++++++++++++++++++++
.github/workflows/deploy-stg.yml | 41 +++++++++++++++++++++++++++++
package-lock.json | 16 ++++++------
4 files changed, 137 insertions(+), 8 deletions(-)
create mode 100644 .github/workflows/deploy-dev.yml
create mode 100644 .github/workflows/deploy-prd.yml
create mode 100644 .github/workflows/deploy-stg.yml
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
new file mode 100644
index 00000000..40874f69
--- /dev/null
+++ b/.github/workflows/deploy-dev.yml
@@ -0,0 +1,45 @@
+name: Deploy develop
+
+on:
+ pull_request:
+
+jobs:
+ deploy:
+ name: Deploy
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: actions/checkout@v2
+ with:
+ repository: itering/actions
+ path: .github/actions
+ persist-credentials: false
+ ssh-key: '${{ secrets.ITERING_ACTIONS_DEPLOY_KEY }}'
+
+ - uses: ./.github/actions/smart-vercel
+ name: Deploy to Vercel
+ id: smart-vercel
+ with:
+ node_version: 14
+ vercel_token: ${{ secrets.VERCEL_TOKEN }}
+ vercel_group: itering
+ preview_output: true
+ script_install: npm i
+ script_build: npm run build
+
+ - uses: marocchino/sticky-pull-request-comment@v2
+ with:
+ append: true
+ message: ${{ steps.smart-vercel.outputs.PREVIEW_OUTPUT }}
+
+ - name: Slack Notification
+ uses: rtCamp/action-slack-notify@v2
+ env:
+ SLACK_CHANNEL: subscan-general
+ SLACK_COLOR: ${{ job.status }}
+ SLACK_ICON: https://avatars.githubusercontent.com/u/14985020?s=48&v=4
+ SLACK_MESSAGE: '${{ steps.smart-vercel.outputs.PREVIEW_LINK }}'
+ SLACK_TITLE: Preview
+ SLACK_USERNAME: Vercel
+ SLACK_WEBHOOK: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/.github/workflows/deploy-prd.yml b/.github/workflows/deploy-prd.yml
new file mode 100644
index 00000000..109f7b7d
--- /dev/null
+++ b/.github/workflows/deploy-prd.yml
@@ -0,0 +1,43 @@
+name: Deploy production
+
+on:
+ push:
+ tags:
+ - 'v*'
+
+jobs:
+ deploy:
+ name: Deploy
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: actions/checkout@v2
+ with:
+ repository: itering/actions
+ path: .github/actions
+ persist-credentials: false
+ ssh-key: '${{ secrets.ITERING_ACTIONS_DEPLOY_KEY }}'
+
+ - uses: ./.github/actions/smart-vercel
+ name: Deploy to Vercel
+ id: smart-vercel
+ with:
+ node_version: 14
+ vercel_token: ${{ secrets.VERCEL_TOKEN }}
+ vercel_group: itering
+ preview_output: true
+ prod_mode: true
+ script_install: npm i
+ script_build: npm run build
+
+ - name: Slack Notification
+ uses: rtCamp/action-slack-notify@v2
+ env:
+ SLACK_CHANNEL: subscan-general
+ SLACK_COLOR: ${{ job.status }}
+ SLACK_ICON: https://avatars.githubusercontent.com/u/14985020?s=48&v=4
+ SLACK_MESSAGE: '${{ steps.smart-vercel.outputs.PREVIEW_LINK }}'
+ SLACK_TITLE: Preview
+ SLACK_USERNAME: Vercel
+ SLACK_WEBHOOK: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/.github/workflows/deploy-stg.yml b/.github/workflows/deploy-stg.yml
new file mode 100644
index 00000000..8644eab7
--- /dev/null
+++ b/.github/workflows/deploy-stg.yml
@@ -0,0 +1,41 @@
+name: Deploy staging
+
+on:
+ push:
+ branches: [master]
+
+jobs:
+ deploy:
+ name: Deploy
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: actions/checkout@v2
+ with:
+ repository: itering/actions
+ path: .github/actions
+ persist-credentials: false
+ ssh-key: '${{ secrets.ITERING_ACTIONS_DEPLOY_KEY }}'
+
+ - uses: ./.github/actions/smart-vercel
+ name: Deploy to Vercel
+ id: smart-vercel
+ with:
+ node_version: 14
+ vercel_token: ${{ secrets.VERCEL_TOKEN }}
+ vercel_group: itering
+ preview_output: true
+ script_install: npm i
+ script_build: npm run build
+
+ - name: Slack Notification
+ uses: rtCamp/action-slack-notify@v2
+ env:
+ SLACK_CHANNEL: subscan-general
+ SLACK_COLOR: ${{ job.status }}
+ SLACK_ICON: https://avatars.githubusercontent.com/u/14985020?s=48&v=4
+ SLACK_MESSAGE: '${{ steps.smart-vercel.outputs.PREVIEW_LINK }}'
+ SLACK_TITLE: Preview
+ SLACK_USERNAME: Vercel
+ SLACK_WEBHOOK: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/package-lock.json b/package-lock.json
index bffd2ef5..f4df1116 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27190,9 +27190,9 @@
"dev": true
},
"postcss-load-config": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz",
- "integrity": "sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.2.tgz",
+ "integrity": "sha512-X1NVP1itP6VE5dDA4wR6NK1g9lNlkBx9A+tgDKb/8Mnx4HrvX6k+DcTXGelZvfp6p4zCBZjh4Gwyp4aptOUI9Q==",
"dev": true,
"requires": {
"lilconfig": "^2.0.4",
@@ -27212,14 +27212,14 @@
},
"dependencies": {
"postcss": {
- "version": "8.4.5",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
- "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
+ "version": "8.4.6",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
+ "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
"dev": true,
"requires": {
- "nanoid": "^3.1.30",
+ "nanoid": "^3.2.0",
"picocolors": "^1.0.0",
- "source-map-js": "^1.0.1"
+ "source-map-js": "^1.0.2"
}
}
}
From bb00ed77ba10429e37ea9cb3dfefec00a103d696 Mon Sep 17 00:00:00 2001
From: vzxh <93637628+vzxh@users.noreply.github.com>
Date: Tue, 15 Feb 2022 16:56:59 +0800
Subject: [PATCH 05/51] Add cancel record (#128)
* feat: add cancelled record tab
* chore: unused commit
* chore: comment out slack notification
* feat: add json export/import for multisig account
* chore: change slack channel to multisig-notification
* chore: change slack channel to subscan-multisig-notification
---
.github/CODEOWNERS | 2 +-
.github/workflows/deploy-dev.yml | 20 ++---
.github/workflows/deploy-prd.yml | 2 +-
.github/workflows/deploy-stg.yml | 2 +-
craco.config.js | 1 +
package-lock.json | 42 ++++++++-
package.json | 2 +
public/locales/en/translation.json | 3 +
public/locales/zh/translation.json | 3 +
src/components/Entries.tsx | 14 +--
src/components/ExtrinsicRecords.tsx | 129 ++++++++++++++++++++--------
src/components/WalletForm.tsx | 56 +++++++++++-
src/components/Wallets.tsx | 25 +++++-
src/config/network.ts | 16 ++--
src/config/query.ts | 30 +++++--
src/model/account.ts | 9 ++
src/providers/multisig-provider.tsx | 30 +++++--
src/utils/helper/multisig.ts | 6 ++
18 files changed, 316 insertions(+), 76 deletions(-)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 17f71fd5..bf87bb7f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @sxlwar @carlhong
+* @sxlwar @carlhong @vzxh
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
index 40874f69..7bdd21d8 100644
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -33,13 +33,13 @@ jobs:
append: true
message: ${{ steps.smart-vercel.outputs.PREVIEW_OUTPUT }}
- - name: Slack Notification
- uses: rtCamp/action-slack-notify@v2
- env:
- SLACK_CHANNEL: subscan-general
- SLACK_COLOR: ${{ job.status }}
- SLACK_ICON: https://avatars.githubusercontent.com/u/14985020?s=48&v=4
- SLACK_MESSAGE: '${{ steps.smart-vercel.outputs.PREVIEW_LINK }}'
- SLACK_TITLE: Preview
- SLACK_USERNAME: Vercel
- SLACK_WEBHOOK: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
+ # - name: Slack Notification
+ # uses: rtCamp/action-slack-notify@v2
+ # env:
+ # SLACK_CHANNEL: subscan-general
+ # SLACK_COLOR: ${{ job.status }}
+ # SLACK_ICON: https://avatars.githubusercontent.com/u/14985020?s=48&v=4
+ # SLACK_MESSAGE: '${{ steps.smart-vercel.outputs.PREVIEW_LINK }}'
+ # SLACK_TITLE: Preview
+ # SLACK_USERNAME: Vercel
+ # SLACK_WEBHOOK: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/.github/workflows/deploy-prd.yml b/.github/workflows/deploy-prd.yml
index 109f7b7d..385da42b 100644
--- a/.github/workflows/deploy-prd.yml
+++ b/.github/workflows/deploy-prd.yml
@@ -34,7 +34,7 @@ jobs:
- name: Slack Notification
uses: rtCamp/action-slack-notify@v2
env:
- SLACK_CHANNEL: subscan-general
+ SLACK_CHANNEL: subscan-multisig-notification
SLACK_COLOR: ${{ job.status }}
SLACK_ICON: https://avatars.githubusercontent.com/u/14985020?s=48&v=4
SLACK_MESSAGE: '${{ steps.smart-vercel.outputs.PREVIEW_LINK }}'
diff --git a/.github/workflows/deploy-stg.yml b/.github/workflows/deploy-stg.yml
index 8644eab7..02fc73d2 100644
--- a/.github/workflows/deploy-stg.yml
+++ b/.github/workflows/deploy-stg.yml
@@ -32,7 +32,7 @@ jobs:
- name: Slack Notification
uses: rtCamp/action-slack-notify@v2
env:
- SLACK_CHANNEL: subscan-general
+ SLACK_CHANNEL: subscan-multisig-notification
SLACK_COLOR: ${{ job.status }}
SLACK_ICON: https://avatars.githubusercontent.com/u/14985020?s=48&v=4
SLACK_MESSAGE: '${{ steps.smart-vercel.outputs.PREVIEW_LINK }}'
diff --git a/craco.config.js b/craco.config.js
index 453cbd90..bef63600 100644
--- a/craco.config.js
+++ b/craco.config.js
@@ -82,6 +82,7 @@ module.exports = {
plugins: {
add: [themePlugin],
},
+ // .
// add mjs compatibility configuration
configure: (webpackConfig) => {
webpackConfig.module.rules.push({
diff --git a/package-lock.json b/package-lock.json
index f4df1116..688080e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7364,6 +7364,12 @@
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
},
+ "@types/file-saver": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.5.tgz",
+ "integrity": "sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==",
+ "dev": true
+ },
"@types/glob": {
"version": "7.1.4",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
@@ -11312,8 +11318,16 @@
"integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
"requires": {
"inherits": "^2.0.3",
+ "source-map": "^0.6.1",
"source-map-resolve": "^0.5.2",
"urix": "^0.1.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ }
}
},
"css-blank-pseudo": {
@@ -13931,6 +13945,12 @@
}
}
},
+ "file-saver": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==",
+ "dev": true
+ },
"file-selector": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.2.4.tgz",
@@ -18335,7 +18355,8 @@
"integrity": "sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=",
"dev": true,
"requires": {
- "promise": "~7.0.1"
+ "promise": "~7.0.1",
+ "resolve": "~1.1.6"
},
"dependencies": {
"promise": {
@@ -18346,6 +18367,12 @@
"requires": {
"asap": "~2.0.3"
}
+ },
+ "resolve": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+ "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+ "dev": true
}
}
},
@@ -26363,7 +26390,18 @@
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-4.1.0.tgz",
"integrity": "sha512-azjRwrqk7nK21LU7QuL7DpDyPjvRROQvqPrNyyz6emdzbOh6fsNTvkSvUiThBLzC6+MN90rFu296VbPb/KV+3A==",
- "dev": true
+ "dev": true,
+ "requires": {
+ "is-regexp": "^2.1.0"
+ },
+ "dependencies": {
+ "is-regexp": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
+ "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+ "dev": true
+ }
+ }
},
"strip-eof": {
"version": "1.0.0",
diff --git a/package.json b/package.json
index 6ae22696..78db02ba 100644
--- a/package.json
+++ b/package.json
@@ -89,6 +89,7 @@
"@open-wc/webpack-import-meta-loader": "^0.4.7",
"@tailwindcss/postcss7-compat": "^2.0.4",
"@types/codeflask": "^1.4.2",
+ "@types/file-saver": "^2.0.5",
"@types/less": "^3.0.3",
"@types/lodash": "^4.14.168",
"@types/owasp-password-strength-test": "^1.3.0",
@@ -111,6 +112,7 @@
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
+ "file-saver": "^2.0.5",
"husky": "^4.2.3",
"i18next-scanner": "^3.0.0",
"i18next-scanner-typescript": "^1.0.6",
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index 4392778c..3c9b1eaf 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -21,6 +21,8 @@
"Transaction information": "Transaction information",
"There is an account configured by the same member and threshold. Confirm to replace it with a new account?": "There is an account configured by the same member and threshold. Confirm to replace it with a new account?",
"View in Subscan explorer": "View in Subscan explorer",
+ "Export account config": "Export account config",
+ "import from config": "Import from config",
"about": "About",
"account": "Account",
"accounts": "Accounts",
@@ -83,6 +85,7 @@
"multisig": {
"Confirmed Extrinsic": "Confirmed Extrinsic",
"In Progress": "In Progress",
+ "Cancelled Extrinsic": "Cancelled Extrinsic",
"Members": "Members",
"Threshold": "Threshold",
"approval": "Multi-sig approval",
diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
index 7f97043c..91a18722 100644
--- a/public/locales/zh/translation.json
+++ b/public/locales/zh/translation.json
@@ -21,6 +21,8 @@
"Transaction information": "交易信息",
"There is an account configured by the same member and threshold. Confirm to replace it with a new account?": "已存在一个有相同成员及阈值的多签账号，确定使用新账号替换吗？",
"View in Subscan explorer": "至 Subscan 浏览器查看",
+ "Export account config": "导出多签账户配置",
+ "import account": "从配置中导入",
"about": "关于",
"account": "账户",
"accounts": "账户",
@@ -82,6 +84,7 @@
"multisig": {
"Confirmed Extrinsic": "已确认",
"In Progress": "待确认",
+ "Cancelled Extrinsic": "已取消",
"Members": "成员数",
"Threshold": "阈值",
"approval": "批准多签交易",
diff --git a/src/components/Entries.tsx b/src/components/Entries.tsx
index 9e810128..da00004a 100644
--- a/src/components/Entries.tsx
+++ b/src/components/Entries.tsx
@@ -19,6 +19,7 @@ export interface EntriesProps {
source: Entry[];
account: KeyringAddress;
isConfirmed?: boolean;
+ isCancelled?: boolean;
loading?: boolean;
}
@@ -29,7 +30,7 @@ const CALL_DATA_LENGTH = 25;
const renderMethod = (data: any | undefined | null) => {
// const call = data && data?.toHuman ? data?.toHuman() : data;
- if (data) {
+ if (data && data.section && data.method) {
return data.section + '(' + data.method + ')';
} else {
return '-';
@@ -56,7 +57,8 @@ const renderMemberStatus = (entry: Entry, pair: KeyringJson, _network: Network)
);
};
-export function Entries({ source, isConfirmed, account, loading }: EntriesProps) {
+// eslint-disable-next-line complexity
+export function Entries({ source, isConfirmed, isCancelled, account, loading }: EntriesProps) {
const { t } = useTranslation();
const isInjected = useIsInjected();
const { network } = useApi();
@@ -116,20 +118,20 @@ export function Entries({ source, isConfirmed, account, loading }: EntriesProps)
const columns: ColumnsType = [
{
- title: t(!isConfirmed ? 'call_data' : 'extrinsic_index'),
- dataIndex: !isConfirmed ? 'hexCallData' : 'extrinsicIdx',
+ title: t(isConfirmed || isCancelled ? 'extrinsic_index' : 'call_data'),
+ dataIndex: isConfirmed || isCancelled ? 'extrinsicIdx' : 'hexCallData',
width: 300,
align: 'center',
// eslint-disable-next-line complexity
render(data: string) {
let extrinsicHeight = '';
let extrinsicIndex = '';
- if (isConfirmed && data.split('-').length > 1) {
+ if ((isConfirmed || isCancelled) && data.split('-').length > 1) {
extrinsicHeight = data.split('-')[0];
extrinsicIndex = data.split('-')[1];
}
- return !isConfirmed ? (
+ return !(isConfirmed || isCancelled) ? (
<>
{!isEmpty(data)
diff --git a/src/components/ExtrinsicRecords.tsx b/src/components/ExtrinsicRecords.tsx
index 625f13a8..6ad87209 100644
--- a/src/components/ExtrinsicRecords.tsx
+++ b/src/components/ExtrinsicRecords.tsx
@@ -6,20 +6,22 @@ import { isNumber } from 'lodash';
import { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
-import { EXECUTED_MULTISIGS_QUERY } from '../config';
+import { MULTISIG_RECORD_QUERY } from '../config';
import { useApi } from '../hooks';
import { useMultisigContext } from '../hooks/multisigContext';
import { IExtrinsic, parseArgs } from '../utils';
import { Entries } from './Entries';
-interface ExecutedMultisigsQueryRes {
- executedMultisigs: { totalCount: number; nodes: ExecutedMultisig[] };
+interface MultisigRecordsQueryRes {
+ multisigRecords: { totalCount: number; nodes: MultisigRecord[] };
}
-interface ExecutedMultisig {
+interface MultisigRecord {
multisigAccountId: string;
timestamp: string;
- extrinsicIdx: string;
+ createExtrinsicIdx: string;
+ confirmExtrinsicIdx: string;
+ cancelExtrinsicIdx: string;
approvals: string[];
block: {
id: string;
@@ -27,45 +29,54 @@ interface ExecutedMultisig {
nodes: IExtrinsic[];
};
};
+ confirmBlock: {
+ id: string;
+ extrinsics: {
+ nodes: IExtrinsic[];
+ };
+ };
}
const { TabPane } = Tabs;
/* -----------------------------------Confirmed extrinsic------------------------------------ */
-interface ConfirmedProps {
+interface ConfirmedOrCancelledProps {
multiAddress: string;
account: KeyringAddress | null;
- data: ExecutedMultisigsQueryRes | undefined;
+ nodes: MultisigRecord[];
+ isConfirmed: boolean;
loading: boolean;
}
-function Confirmed({ data, account, loading }: ConfirmedProps) {
+function ConfirmedOrCancelled({ nodes, account, loading, isConfirmed }: ConfirmedOrCancelledProps) {
const { api } = useApi();
const extrinsic = useMemo(() => {
- if (!data?.executedMultisigs || !api) {
+ if (!api) {
return [];
}
- const { nodes } = data?.executedMultisigs;
-
// eslint-disable-next-line complexity
return nodes.map((node) => {
const {
multisigAccountId,
timestamp,
- extrinsicIdx,
+ createExtrinsicIdx,
+ confirmExtrinsicIdx,
+ cancelExtrinsicIdx,
approvals,
block: {
- id: blockHash,
- extrinsics: { nodes: exNodes },
+ id: createBlockHash,
+ extrinsics: { nodes: createExNodes },
},
} = node;
- const target = exNodes.find((item) => item.section === 'multisig');
+ const target = isConfirmed
+ ? node.confirmBlock.extrinsics.nodes.find((item) => item.section === 'multisig')
+ : createExNodes.find((item) => item.section === 'multisig');
// const { signerId, isSuccess } = target ?? {};
- const { isSuccess } = target ?? {};
+ // const { isSuccess } = target ?? {};
const multisigArgs = parseArgs(api, target);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const argsHash = multisigArgs.find((item: any) => item.name === 'call')?.value;
@@ -82,24 +93,25 @@ function Confirmed({ data, account, loading }: ConfirmedProps) {
meta = api?.tx[callDataJson?.section][callDataJson?.method].meta.toJSON();
} catch (err) {
// eslint-disable-next-line no-console
- console.log('err', err);
+ // console.log('err', err);
callDataJson = {};
meta = null;
}
- const maybeTimepointArg = multisigArgs.find(
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (item: any) => item.name === 'maybeTimepoint' || item.name === 'maybe_timepoint'
- )?.value;
- const { height, index } = maybeTimepointArg || {};
+ // const maybeTimepointArg = multisigArgs.find(
+ // // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ // (item: any) => item.name === 'maybeTimepoint' || item.name === 'maybe_timepoint' || item.name === 'timepoint'
+ // )?.value;
+ // const { height, index } = maybeTimepointArg || {};
+ const [height, index] = createExtrinsicIdx.split('-');
return {
callDataJson,
- blockHash,
+ blockHash: createBlockHash,
meta,
- hash: blockHash,
+ hash: createBlockHash,
callHash: null,
address: multisigAccountId,
- extrinsicIdx,
+ extrinsicIdx: isConfirmed ? confirmExtrinsicIdx : cancelExtrinsicIdx,
approvals,
// approvals: [
// ...multisigArgs
@@ -107,16 +119,22 @@ function Confirmed({ data, account, loading }: ConfirmedProps) {
// .find((item: any) => item.name === 'otherSignatories' || item.name === 'other_signatories')?.value,
// signerId,
// ],
- status: isSuccess ? 'executed' : 'pending',
+ status: isConfirmed ? 'executed' : 'cancelled',
created_at: timestamp,
when: { height: isNumber(height) ? height : +height.replace(/,/g, ''), index: +index },
depositor: '',
};
});
- }, [api, data?.executedMultisigs]);
+ }, [api, nodes, isConfirmed]);
return account ? (
- (EXECUTED_MULTISIGS_QUERY, {
+ } = useQuery(MULTISIG_RECORD_QUERY, {
variables: {
account: multiAddress,
+ status: 'confirmed',
+ offset: 0,
+ limit: 10,
+ },
+ });
+
+ const {
+ data: cancelledData,
+ refetch: refetchCancelled,
+ loading: loadingCancelled,
+ } = useQuery(MULTISIG_RECORD_QUERY, {
+ variables: {
+ account: multiAddress,
+ status: 'cancelled',
offset: 0,
limit: 10,
},
@@ -148,17 +181,22 @@ export function ExtrinsicRecords() {
queryInProgress();
} else if (key === 'confirmed') {
refetchConfimed();
+ } else if (key === 'cancelled') {
+ refetchCancelled();
}
};
const refreshData = () => {
queryInProgress();
refetchConfimed();
+ refetchCancelled();
};
return (
-
+
{networkStatus === 'connecting' ? (
({ name: prop, value: propValue }))} />;
+ // return ({ name: prop, value: propValue }))} />;
+ return JSON.stringify(value);
}
if (isAddr) {
diff --git a/src/components/Entries.tsx b/src/components/Entries.tsx
index da00004a..2fca9c75 100644
--- a/src/components/Entries.tsx
+++ b/src/components/Entries.tsx
@@ -23,7 +23,7 @@ export interface EntriesProps {
loading?: boolean;
}
-const { Title, Paragraph } = Typography;
+const { Paragraph } = Typography;
const { Panel } = Collapse;
const CALL_DATA_LENGTH = 25;
@@ -195,8 +195,9 @@ export function Entries({ source, isConfirmed, isCancelled, account, loading }:
});
return (
- <>
- {t('progress')}
+ = [
- { dataIndex: 'name' },
+ {
+ dataIndex: 'name',
+ render: (name) =>
+
@@ -27,7 +30,12 @@ export const Members = ({ record }: { record: KeyringAddress }) => {
];
return (
- <>
+
{
/>
-
-
+
-
+
+ {t('multisig.Cancelled Extrinsic')}
+ {cancelledAccount}
+
+ }
+ key="cancelled"
+ >
+
diff --git a/src/components/WalletForm.tsx b/src/components/WalletForm.tsx
index 659f4d2c..6cb5248f 100644
--- a/src/components/WalletForm.tsx
+++ b/src/components/WalletForm.tsx
@@ -18,6 +18,7 @@ import {
Tag,
Tooltip,
Checkbox,
+ Upload,
} from 'antd';
import { useForm } from 'antd/lib/form/Form';
import { format } from 'date-fns';
@@ -27,7 +28,7 @@ import { Link, useHistory } from 'react-router-dom';
import { NETWORKS, validateMessages } from '../config';
import i18n from '../config/i18n';
import { useApi, useContacts } from '../hooks';
-import { Network, ShareScope, WalletFormValue } from '../model';
+import { Network, ShareScope, WalletFormValue, MultisigAccountConfig } from '../model';
import { InjectedAccountWithMeta } from '../model/account';
import { convertToSS58, findMultiAccount, getMainColor, updateMultiAccountScope } from '../utils';
@@ -113,6 +114,7 @@ export function WalletForm() {
return composeOptions.filter(({ value }) => !selectedAccounts.includes(value)) || [];
}, [accounts, contacts, selectedAccounts]);
+
const updateSelectedAccounts = (namePath?: (string | number)[]) => {
const selected: {
name: string;
@@ -129,6 +131,48 @@ export function WalletForm() {
setSelectedAccounts(result);
};
+ const uploadProps = {
+ name: 'file',
+ headers: {
+ authorization: 'authorization-text',
+ },
+ onChange(info: any) {
+ if (info.file.status !== 'uploading') {
+ // console.log(info.file, info.fileList);
+ }
+ if (info.file.status === 'done') {
+ message.success(`${info.file.name} file uploaded successfully`);
+ } else if (info.file.status === 'error') {
+ message.error(`${info.file.name} file upload failed.`);
+ }
+ },
+ customRequest(info: any) {
+ try {
+ const reader = new FileReader();
+
+ reader.onload = (e: any) => {
+ // eslint-disable-next-line no-console
+ console.log(e.target.result);
+
+ const config = JSON.parse(e.target.result) as MultisigAccountConfig;
+ const encodeMembers = config.members.map((member) => {
+ return {
+ name: member.name,
+ address: encodeAddress(member.address, networkConfig.ss58Prefix),
+ };
+ });
+ form.setFieldsValue({ threshold: config.threshold, name: config.name, members: encodeMembers });
+ };
+ reader.readAsText(info.file);
+ } catch (err: unknown) {
+ if (err instanceof Error) {
+ // eslint-disable-next-line no-console
+ console.log('err:', err);
+ }
+ }
+ },
+ };
+
return (
+
+
- {t('parameters')}
+
);
};
@@ -223,7 +225,8 @@ export function Entries({ source, isConfirmed, isCancelled, account, loading }:
pagination={false}
expandable={{
expandedRowRender,
- expandIcon: genExpandIcon(network),
+ expandIcon: genExpandIcon(),
+ expandIconColumnIndex: 4,
}}
className="lg:block hidden"
>
diff --git a/src/components/Members.tsx b/src/components/Members.tsx
index 4e2ffc4c..5162c2ae 100644
--- a/src/components/Members.tsx
+++ b/src/components/Members.tsx
@@ -10,11 +10,14 @@ export const Members = ({ record }: { record: KeyringAddress }) => {
const { t } = useTranslation();
const isExtensionAccount = useIsInjected();
const columnsNested: ColumnsType{t('progress')}
+
{t('parameters')}
+
{name}
,
+ },
{
dataIndex: 'address',
render: (address) => (
-