From ee7bcef06d76900b20c4509c378abad764d7961d Mon Sep 17 00:00:00 2001 From: liangping <18786721@qq.com> Date: Sat, 4 Sep 2021 11:02:12 +0800 Subject: [PATCH] adjust order of data loading --- package.json | 17 +- src/libs/data/data.js | 39 +++- src/libs/fetch.js | 2 +- src/views/Governance.vue | 4 +- src/views/GovernanceProposalView.vue | 10 +- src/views/OperationDelegateComponent.vue | 5 +- src/views/OperationRedelegateComponent.vue | 6 +- src/views/OperationTransferComponent.vue | 13 +- src/views/OperationUnbondComponent.vue | 6 +- src/views/OperationVoteComponent.vue | 20 +- src/views/OperationWithdrawComponent.vue | 11 +- yarn.lock | 215 +++++++++++---------- 12 files changed, 197 insertions(+), 151 deletions(-) diff --git a/package.json b/package.json index 7f81763b..822d9ace 100644 --- a/package.json +++ b/package.json @@ -12,14 +12,14 @@ "dependencies": { "@casl/ability": "4.1.6", "@casl/vue": "1.1.1", - "@cosmjs/amino": "^0.25.6", - "@cosmjs/crypto": "^0.25.6", - "@cosmjs/encoding": "^0.25.6", - "@cosmjs/launchpad": "^0.25.6", - "@cosmjs/ledger-amino": "^0.25.6", - "@cosmjs/math": "^0.25.6", - "@cosmjs/proto-signing": "^0.25.6", - "@cosmjs/stargate": "^0.25.6", + "@cosmjs/amino": "^0.26.0", + "@cosmjs/crypto": "^0.26.0", + "@cosmjs/encoding": "^0.26.0", + "@cosmjs/launchpad": "^0.26.0", + "@cosmjs/ledger-amino": "^0.26.0", + "@cosmjs/math": "^0.26.0", + "@cosmjs/proto-signing": "^0.26.0", + "@cosmjs/stargate": "0.26.0", "@cosmostation/cosmosjs": "^0.10.6", "@intlify/vue-i18n-loader": "^2.1.2", "@ledgerhq/hw-app-cosmos": "^6.3.0", @@ -36,6 +36,7 @@ "chart.js": "2.9.4", "compare-versions": "^3.6.0", "core-js": "3.8.1", + "cosmjs-types": "^0.2.0", "dayjs": "^1.10.6", "echarts": "4.8.0", "leaflet": "1.6.0", diff --git a/src/libs/data/data.js b/src/libs/data/data.js index ba64db8c..1aaa68b9 100644 --- a/src/libs/data/data.js +++ b/src/libs/data/data.js @@ -6,15 +6,15 @@ import { sha256 } from '@cosmjs/crypto' import TransportWebBLE from '@ledgerhq/hw-transport-web-ble' import TransportWebUSB from '@ledgerhq/hw-transport-webusb' import { SigningStargateClient } from '@cosmjs/stargate' +import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' // import Cosmos from '@ledgerhq/hw-app-cosmos' import CosmosApp from 'ledger-cosmos-js' import { LedgerSigner } from '@cosmjs/ledger-amino' import { - makeAuthInfoBytes, makeSignBytes, Registry, + makeAuthInfoBytes, makeSignBytes, Registry, SignMode, } from '@cosmjs/proto-signing' -import { encodeSecp256k1Signature } from '@cosmjs/amino' +import { encodeSecp256k1Pubkey, encodeSecp256k1Signature, encodePubkey } from '@cosmjs/amino' import { Uint53 } from '@cosmjs/math' -import { TxRaw } from '@cosmjs/stargate/build/codec/cosmos/tx/v1beta1/tx' import dayjs from 'dayjs' import duration from 'dayjs/plugin/duration' @@ -81,6 +81,35 @@ export async function signDirect(signer, signerAddress, messages, fee, memo, { a }) } +export async function signAmino(signerAddress, messages, fee, memo, { accountNumber, sequence, chainId }) { + const accountFromSigner = (await this.signer.getAccounts()).find(account => account.address === signerAddress) + if (!accountFromSigner) { + throw new Error('Failed to retrieve account from signer') + } + const pubkey = encodePubkey(encodeSecp256k1Pubkey(accountFromSigner.pubkey)) + const signMode = SignMode.SIGN_MODE_LEGACY_AMINO_JSON + const msgs = messages.map(msg => this.aminoTypes.toAmino(msg)) + const signDoc = makeSignDoc(msgs, fee, chainId, memo, accountNumber, sequence) + const { signature, signed } = await this.signer.signAmino(signerAddress, signDoc) + const signedTxBody = { + messages: signed.msgs.map(msg => this.aminoTypes.fromAmino(msg)), + memo: signed.memo, + } + const signedTxBodyEncodeObject = { + typeUrl: '/cosmos.tx.v1beta1.TxBody', + value: signedTxBody, + } + const signedTxBodyBytes = this.registry.encode(signedTxBodyEncodeObject) + const signedGasLimit = Number(signed.fee.gas) + const signedSequence = Number(signed.sequence) + const signedAuthInfoBytes = makeAuthInfoBytes([pubkey], signed.fee.amount, signedGasLimit, signedSequence, signMode) + return TxRaw.fromPartial({ + bodyBytes: signedTxBodyBytes, + authInfoBytes: signedAuthInfoBytes, + signatures: [fromBase64(signature.signature)], + }) +} + export async function sign(device, chainId, signerAddress, messages, fee, memo, signerData) { let transport let signer @@ -99,11 +128,13 @@ export async function sign(device, chainId, signerAddress, messages, fee, memo, throw new Error('Please install keplr extension') } await window.keplr.enable(chainId) - signer = window.getOfflineSigner(chainId) + // signer = window.getOfflineSigner(chainId) + signer = window.getOfflineSignerOnlyAmino(chainId) } // Ensure the address has some tokens to spend const client = await SigningStargateClient.offline(signer) + console.log('Registry: ', client.registry) return client.sign(signerAddress, messages, fee, memo, signerData) // return signDirect(signer, signerAddress, messages, fee, memo, signerData) } diff --git a/src/libs/fetch.js b/src/libs/fetch.js index d0223c90..2b3c9d34 100644 --- a/src/libs/fetch.js +++ b/src/libs/fetch.js @@ -2,7 +2,7 @@ import fetch from 'node-fetch' // import axios from 'axios' import store from '@/store' import compareVersions from 'compare-versions' -import { TxRaw } from '@cosmjs/stargate/build/codec/cosmos/tx/v1beta1/tx' +import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' import { toBase64 } from '@cosmjs/encoding' import { Proposal, ProposalTally, Proposer, StakingPool, Votes, Deposit, diff --git a/src/views/Governance.vue b/src/views/Governance.vue index 55320b9e..6254b56d 100644 --- a/src/views/Governance.vue +++ b/src/views/Governance.vue @@ -250,7 +250,7 @@ section { .gov-wrapper { display: flex; justify-content:center; - align-items:center; + align-items:flex-end; } .dark-layout .gov-wrapper .gov { background-color: #161d31; @@ -258,7 +258,7 @@ section { .gov-wrapper .gov { padding: .5rem; margin: .3rem; - min-width: 8rem; + min-width: 7.5rem; text-align: center; background-color: #f8f8f8; border-radius: .357rem; diff --git a/src/views/GovernanceProposalView.vue b/src/views/GovernanceProposalView.vue index 2f862ee9..3c1a8d61 100644 --- a/src/views/GovernanceProposalView.vue +++ b/src/views/GovernanceProposalView.vue @@ -99,7 +99,8 @@ @@ -107,7 +108,10 @@ - + @@ -218,6 +222,7 @@ import { import { getCachedValidators, getStakingValidatorByAccount, tokenFormatter } from '@/libs/data/data' import { Proposal, Proposer } from '@/libs/data' import ObjectFieldComponent from './ObjectFieldComponent.vue' +import OperationVoteComponent from './OperationVoteComponent.vue' // import { formatToken } from '@/libs/data/data' export default { @@ -237,6 +242,7 @@ export default { BTooltip, BBadge, ObjectFieldComponent, + OperationVoteComponent, }, data() { return { diff --git a/src/views/OperationDelegateComponent.vue b/src/views/OperationDelegateComponent.vue index b8604e51..f329e00b 100644 --- a/src/views/OperationDelegateComponent.vue +++ b/src/views/OperationDelegateComponent.vue @@ -293,9 +293,6 @@ export default { if (!this.balance) return [] return this.balance.filter(item => !item.denom.startsWith('ibc')) }, - account() { - return this.computeAccount() - }, }, created() { // console.log('address: ', this.address) @@ -330,6 +327,8 @@ export default { return array.reduce(reducer, []) }, loadBalance() { + this.account = this.computeAccount() + if (this.account && this.account.length > 0) this.selectedAddress = this.account[0].addr if (this.selectedAddress) { if (!getCachedValidators(this.selectedChain.chain)) { this.$http.getValidatorList().then(v => { diff --git a/src/views/OperationRedelegateComponent.vue b/src/views/OperationRedelegateComponent.vue index 13668886..01ca70fa 100644 --- a/src/views/OperationRedelegateComponent.vue +++ b/src/views/OperationRedelegateComponent.vue @@ -283,6 +283,7 @@ export default { error: null, sequence: 1, accountNumber: 0, + account: [], required, password, @@ -309,9 +310,6 @@ export default { if (!this.balance) return [] return this.balance.filter(item => !item.denom.startsWith('ibc')) }, - account() { - return this.computeAccount() - }, }, created() { // console.log('address: ', this.address) @@ -346,6 +344,8 @@ export default { return array.reduce(reducer, []) }, loadBalance() { + this.account = this.computeAccount() + if (this.account && this.account.length > 0) this.selectedAddress = this.account[0].addr if (this.selectedAddress) { if (!getCachedValidators(this.selectedChain.chain)) { this.$http.getValidatorList().then(v => { diff --git a/src/views/OperationTransferComponent.vue b/src/views/OperationTransferComponent.vue index 7a7ff2ef..57668fbd 100644 --- a/src/views/OperationTransferComponent.vue +++ b/src/views/OperationTransferComponent.vue @@ -288,6 +288,7 @@ export default { error: null, sequence: 1, accountNumber: 0, + account: [], required, password, @@ -306,14 +307,6 @@ export default { feeDenoms() { return this.balance.filter(item => !item.denom.startsWith('ibc')) }, - account() { - // if (accounts && accounts[this.name]) { - // const config = accounts[this.name] - // const addr = config.address.find(x => x.addr === this.address) - // if (addr) return addr - // } - return this.computeAccount() - }, }, created() { // console.log('address: ', this.address) @@ -333,12 +326,14 @@ export default { return null }, loadBalance() { + this.account = this.computeAccount() + if (this.account && this.account.length > 0) this.address = this.account[0].addr if (this.address) { chainAPI.getBankBalance(this.selectedChain.api, this.address).then(res => { if (res && res.length > 0) { this.balance = res this.token = this.balance[0].denom - this.feeDenom = this.balance[0].denom + this.feeDenom = this.balance.find(x => !x.denom.startsWith('ibc')).denom } }) this.$http.getLatestBlock(this.selectedChain).then(ret => { diff --git a/src/views/OperationUnbondComponent.vue b/src/views/OperationUnbondComponent.vue index ed2d4769..8f5816a1 100644 --- a/src/views/OperationUnbondComponent.vue +++ b/src/views/OperationUnbondComponent.vue @@ -267,6 +267,7 @@ export default { error: null, sequence: 1, accountNumber: 0, + account: [], required, password, @@ -293,9 +294,6 @@ export default { if (!this.balance) return [] return this.balance.filter(item => !item.denom.startsWith('ibc')) }, - account() { - return this.computeAccount() - }, }, created() { // console.log('address: ', this.address) @@ -330,6 +328,8 @@ export default { return array.reduce(reducer, []) }, loadBalance() { + this.account = this.computeAccount() + if (this.account && this.account.length > 0) this.selectedAddress = this.account[0].addr if (this.selectedAddress) { if (!getCachedValidators(this.selectedChain.chain)) { this.$http.getValidatorList().then(v => { diff --git a/src/views/OperationVoteComponent.vue b/src/views/OperationVoteComponent.vue index 61ff934f..f677fd77 100644 --- a/src/views/OperationVoteComponent.vue +++ b/src/views/OperationVoteComponent.vue @@ -7,6 +7,7 @@ title="Vote" hide-header-close scrollable + :ok-disabled="!voter" @hidden="resetModal" @ok="handleOk" @show="loadBalance" @@ -31,12 +32,12 @@ > - {{ errors[0] }} + {{ errors[0] }} Please import an account first! @@ -240,13 +241,14 @@ export default { }, data() { return { + accounts: [], voter: null, option: null, chainId: '', selectedChain: '', balance: [], memo: '', - fee: 800, + fee: null, feeDenom: '', wallet: 'keplr', error: null, @@ -270,14 +272,6 @@ export default { feeDenoms() { return this.balance.filter(item => !item.denom.startsWith('ibc')) }, - account() { - // if (accounts && accounts[this.name]) { - // const config = accounts[this.name] - // const addr = config.address.find(x => x.addr === this.address) - // if (addr) return addr - // } - return this.computeAccount() - }, }, methods: { computeAccount() { @@ -308,6 +302,9 @@ export default { return array.reduce(reducer, []) }, loadBalance() { + this.accounts = this.computeAccount() + // eslint-disable-next-line prefer-destructuring + if (this.accounts && this.accounts.length > 0) this.voter = this.accounts[0].addr if (this.voter) { chainAPI.getBankBalance(this.selectedChain.api, this.voter).then(res => { if (res && res.length > 0) { @@ -401,6 +398,7 @@ export default { this.memo, signerData, ).then(bodyBytes => { + console.log('bodybytes:', bodyBytes) this.$http.broadcastTx(bodyBytes, this.selectedChain).then(res => { setLocalTxHistory({ op: 'vote', hash: res.tx_response.txhash, time: new Date() }) this.$bvModal.hide('vote-window') diff --git a/src/views/OperationWithdrawComponent.vue b/src/views/OperationWithdrawComponent.vue index 9513cdeb..cabebec8 100644 --- a/src/views/OperationWithdrawComponent.vue +++ b/src/views/OperationWithdrawComponent.vue @@ -188,6 +188,7 @@ export default { data() { return { chainId: '', + account: [], selectedChain: '', balance: [], delegations: [], @@ -216,14 +217,6 @@ export default { feeDenoms() { return this.balance.filter(item => !item.denom.startsWith('ibc')) }, - account() { - // if (accounts && accounts[this.name]) { - // const config = accounts[this.name] - // const addr = config.address.find(x => x.addr === this.address) - // if (addr) return addr - // } - return this.computeAccount() - }, }, created() { // console.log('address: ', this.address) @@ -243,6 +236,8 @@ export default { return null }, loadBalance() { + this.account = this.computeAccount() + if (this.account && this.account.length > 0) this.address = this.account[0].addr if (this.address) { chainAPI.getBankBalance(this.selectedChain.api, this.address).then(res => { if (res && res.length > 0) { diff --git a/yarn.lock b/yarn.lock index 00eb27fc..90f0dd4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -932,24 +932,24 @@ ripemd160 "^2.0.2" sha.js "^2.4.11" -"@cosmjs/amino@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.25.6.tgz#cdf9632253bfab7b1d2ef967124953d7bf16351f" - integrity sha512-9dXN2W7LHjDtJUGNsQ9ok0DfxeN3ca/TXnxCR3Ikh/5YqBqxI8Gel1J9PQO9L6EheYyh045Wff4bsMaLjyEeqQ== +"@cosmjs/amino@0.26.0", "@cosmjs/amino@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.26.0.tgz#2999204fe21101ecdfb5f2f5632440d065914b51" + integrity sha512-CDGCdGYsxrJxhiI57e7no25LPuzKQOe4DdsJQyLrOzAnFnGHYJvPh0NAX4eEh3dOfwJCwMNnA1w79JNm0lzhOA== dependencies: - "@cosmjs/crypto" "^0.25.6" - "@cosmjs/encoding" "^0.25.6" - "@cosmjs/math" "^0.25.6" - "@cosmjs/utils" "^0.25.6" + "@cosmjs/crypto" "0.26.0" + "@cosmjs/encoding" "0.26.0" + "@cosmjs/math" "0.26.0" + "@cosmjs/utils" "0.26.0" -"@cosmjs/crypto@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.25.6.tgz#695d2d0d2195bdbdd5825d415385646244900bbb" - integrity sha512-ec+YcQLrg2ibcxtNrh4FqQnG9kG9IE/Aik2NH6+OXQdFU/qFuBTxSFcKDgzzBOChwlkXwydllM9Jjbp+dgIzRw== +"@cosmjs/crypto@0.26.0", "@cosmjs/crypto@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.26.0.tgz#e57effc8c26d1b301a653430570640d5765a4c1d" + integrity sha512-/36R7BzBNag1QRA2tpOrnr7x02B/YuaCgXKmKGLNd1+62Ud6aKkORyZMDvEt65SKoLhbDUzvNpSHAUjMsUbDfg== dependencies: - "@cosmjs/encoding" "^0.25.6" - "@cosmjs/math" "^0.25.6" - "@cosmjs/utils" "^0.25.6" + "@cosmjs/encoding" "0.26.0" + "@cosmjs/math" "0.26.0" + "@cosmjs/utils" "0.26.0" bip39 "^3.0.2" bn.js "^4.11.8" elliptic "^6.5.3" @@ -958,114 +958,122 @@ ripemd160 "^2.0.2" sha.js "^2.4.11" -"@cosmjs/encoding@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.25.6.tgz#da741a33eaf063a6d3611d7d68db5ca3938e0ef5" - integrity sha512-0imUOB8XkUstI216uznPaX1hqgvLQ2Xso3zJj5IV5oJuNlsfDj9nt/iQxXWbJuettc6gvrFfpf+Vw2vBZSZ75g== +"@cosmjs/encoding@0.26.0", "@cosmjs/encoding@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.26.0.tgz#b486331d1f640327df5b21bd88c7d67c265e1dfe" + integrity sha512-ctw6cBDsQSd0OJFWEwU6fJYrAXf63JNhOS3mjawo/hRyEFpVSBSEKEHvfICPc+4dT40v9L3eYEr8LXDYxat4AA== dependencies: base64-js "^1.3.0" bech32 "^1.1.4" readonly-date "^1.0.0" -"@cosmjs/json-rpc@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.25.6.tgz#4f888630e84ee114b164758ec5b48f134068656c" - integrity sha512-Mn9og3/IEzC6jWoYXs0ONqFJc8HxVjXzrZPLgaRRdMZEUBvctxdhynau1wbE4LdkYQHbu4aiRu1q1jMYGFAj4A== +"@cosmjs/json-rpc@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.26.0.tgz#b24c943f7445dcfc5265fbc65f50862353a48d8b" + integrity sha512-Jc+O0fDZjb8bxKSwH8SG9lJxV/y6lN4bYhiUqHNU6AUDUD9wzVr1mPgMudCJQ1DkQrgz8dQg2cDwgFp6eN428g== dependencies: - "@cosmjs/stream" "^0.25.6" + "@cosmjs/stream" "0.26.0" xstream "^11.14.0" -"@cosmjs/launchpad@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/launchpad/-/launchpad-0.25.6.tgz#c75f5d21be57af55fcb892f929520fa97f2d5bcc" - integrity sha512-4Yhn4cX50UE6jZz/hWqKeeCmvrlrz0BBwOdYX/29k25FqP+oLAow1xKm6UxgYuuAq8Pg/bUvswxSqwegZJTb6g== +"@cosmjs/launchpad@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/launchpad/-/launchpad-0.26.0.tgz#f84bad7fe6225e2e25ac592aad7b5465cae9f867" + integrity sha512-tuHTZTZofD5xlwKbm7CXvP8WsyJZEhIIvAiHyDnOYkn2lBBvV0HpOWMznMkdhtD+1Gbg9WwnXbNoBcDJ/1ysiw== dependencies: - "@cosmjs/amino" "^0.25.6" - "@cosmjs/crypto" "^0.25.6" - "@cosmjs/encoding" "^0.25.6" - "@cosmjs/math" "^0.25.6" - "@cosmjs/utils" "^0.25.6" + "@cosmjs/amino" "0.26.0" + "@cosmjs/crypto" "0.26.0" + "@cosmjs/encoding" "0.26.0" + "@cosmjs/math" "0.26.0" + "@cosmjs/utils" "0.26.0" axios "^0.21.1" fast-deep-equal "^3.1.3" -"@cosmjs/ledger-amino@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/ledger-amino/-/ledger-amino-0.25.6.tgz#8ff29c3563b53d8ecfd3a1bcc48512b6ffdd61e9" - integrity sha512-TaoFte6S1yMFGCfPVNHrrR5/Hz67v4+9/rdKelgNc6k7FYekwzO4dX3tJRUY7XfjaNlW8ojkCWppic1QUe+P2A== +"@cosmjs/ledger-amino@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/ledger-amino/-/ledger-amino-0.26.0.tgz#b8f4a6c3fbcd5134f209633c2a9e96560973ac09" + integrity sha512-j1fN0yvt1RPOJKSNtk5XX903SDNyYFAXGlODc9JwWsgRdo/ozqenRfVhGGZS0UceyYU+LvxAkUYcqFju8Kc2Yw== dependencies: - "@cosmjs/amino" "^0.25.6" - "@cosmjs/utils" "^0.25.6" + "@cosmjs/amino" "0.26.0" + "@cosmjs/crypto" "0.26.0" + "@cosmjs/encoding" "0.26.0" + "@cosmjs/math" "0.26.0" + "@cosmjs/utils" "0.26.0" ledger-cosmos-js "^2.1.8" semver "^7.3.2" -"@cosmjs/math@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.25.6.tgz#25c7b106aaded889a5b80784693caa9e654b0c28" - integrity sha512-Fmyc9FJ8KMU34n7rdapMJrT/8rx5WhMw2F7WLBu7AVLcBh0yWsXIcMSJCoPHTOnMIiABjXsnrrwEaLrOOBfu6A== +"@cosmjs/math@0.26.0", "@cosmjs/math@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.26.0.tgz#7b027732965e7a408c4be6bbf1d415cd04fd6031" + integrity sha512-wfzdK/PnEnIA+CXM6VCyUr2daiEMvaF/iBaK3YCpkbXLfHUXQB+7bNh1HAHgJmp+PaYn3MhgBTnQbsmMsE3cKw== dependencies: bn.js "^4.11.8" -"@cosmjs/proto-signing@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.25.6.tgz#d9fc57b8e0a46cda97e192bd0435157b24949ff8" - integrity sha512-JpQ+Vnv9s6i3x8f3Jo0lJZ3VMnj3R5sMgX+8ti1LtB7qEYRR85qbDrEG9hDGIKqJJabvrAuCHnO6hYi0vJEJHA== +"@cosmjs/proto-signing@0.26.0", "@cosmjs/proto-signing@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.26.0.tgz#987f4a2437f7115dcdfb850fb90ba92f662f621c" + integrity sha512-hNiebrGiDCf3tq6SMHtrf4Qhd8Fn4Z868mWJrbIxamR3EsGuAPb5fKFWYEmpS8IXDfD6qRkO845oMAfnmh5Oxg== dependencies: - "@cosmjs/amino" "^0.25.6" + "@cosmjs/amino" "0.26.0" + "@cosmjs/crypto" "0.26.0" + "@cosmjs/math" "0.26.0" + cosmjs-types "^0.2.0" long "^4.0.0" protobufjs "~6.10.2" -"@cosmjs/socket@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.25.6.tgz#7876bc24e1f16315fbb9e97bd63dea65ba90647d" - integrity sha512-hu+pW3Fy0IuhstXgxnZ2Iq0RUnGYoTWfqrxbTsgXBJge4MpEQs2YwGXgJZPMJXedBQivG0tU3r/Wvam0EWuRkQ== +"@cosmjs/socket@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.26.0.tgz#3ec1acda91b4b467a290b0850696b120fc4ed903" + integrity sha512-eLGRWDpu7ywHEAvO5B5+75pP8xT5yta4OP/nvMYa4zMtwQgLxZQsGlzQhfeIclB/G57zrupgHECtQFGIttbZPg== dependencies: - "@cosmjs/stream" "^0.25.6" + "@cosmjs/stream" "0.26.0" isomorphic-ws "^4.0.1" ws "^7" xstream "^11.14.0" -"@cosmjs/stargate@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.25.6.tgz#ed7428aafd8fe1c12dc4b86f7967deb88117f61a" - integrity sha512-+LM1sK6vGuotJF9fBCBlaDL/yJhfzCV6KbsaWt3teHAKZhKYOd/9mKGiB4H9bfg4h3r+e+FZGiNkH/mdXkcgEw== +"@cosmjs/stargate@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.26.0.tgz#35ba2628696522f07f81b2db13b6b75d1b00baa4" + integrity sha512-+60Mbu5Y3x+vDRGfs9DgyQYx7QqKXQ7t4dH8Y0JIs+4Gn38WbrcAHaqcT58K/sQHSZPueRsBGkZTZdQkJII2zw== dependencies: "@confio/ics23" "^0.6.3" - "@cosmjs/amino" "^0.25.6" - "@cosmjs/encoding" "^0.25.6" - "@cosmjs/math" "^0.25.6" - "@cosmjs/proto-signing" "^0.25.6" - "@cosmjs/stream" "^0.25.6" - "@cosmjs/tendermint-rpc" "^0.25.6" - "@cosmjs/utils" "^0.25.6" + "@cosmjs/amino" "0.26.0" + "@cosmjs/encoding" "0.26.0" + "@cosmjs/math" "0.26.0" + "@cosmjs/proto-signing" "0.26.0" + "@cosmjs/stream" "0.26.0" + "@cosmjs/tendermint-rpc" "0.26.0" + "@cosmjs/utils" "0.26.0" + cosmjs-types "^0.2.0" long "^4.0.0" protobufjs "~6.10.2" + xstream "^11.14.0" -"@cosmjs/stream@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.25.6.tgz#1bf7536ed919be3fd7fbffa477c98ef5a93eac70" - integrity sha512-2mXIzf+WaFd+GSrRaJJETVXeZoC5sosuKChFERxSY8zXQ/f3OaG9J6m+quHpPbU3nAIEtnF1jgBVqJiD+NKwGQ== +"@cosmjs/stream@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.26.0.tgz#63a1bf5835c1dd165f17d1adbd3a86b406d55884" + integrity sha512-TaB8aXj5vskllj39fFTlsJviqm+bZjrV6JzBneJMjV0ltuXEaocKo4x+EOe68ZLjF6+lK4XUu1g2rP1iAPdmAQ== dependencies: xstream "^11.14.0" -"@cosmjs/tendermint-rpc@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.25.6.tgz#8198a08b0d0e1d6580618f3f22db83366329c9c3" - integrity sha512-wsvxTI7DReWJu+SVlXLblzh5NJppnh1mljuaTHodMf7HBxrXdbcCcBAO8oMbMgEqOASEY5G+z51wktxhrn9RtA== +"@cosmjs/tendermint-rpc@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.26.0.tgz#a7d36790de16c3c3c02f9eb93d8363cde26a67cc" + integrity sha512-PQbDLerUGAm8GwRiobVfdy7SM5nI9PzFQVDYOAnwwDME0kDsLGy83e7QNTG2DE1G+8861z9CXne5qz+54NbKwQ== dependencies: - "@cosmjs/crypto" "^0.25.6" - "@cosmjs/encoding" "^0.25.6" - "@cosmjs/json-rpc" "^0.25.6" - "@cosmjs/math" "^0.25.6" - "@cosmjs/socket" "^0.25.6" - "@cosmjs/stream" "^0.25.6" + "@cosmjs/crypto" "0.26.0" + "@cosmjs/encoding" "0.26.0" + "@cosmjs/json-rpc" "0.26.0" + "@cosmjs/math" "0.26.0" + "@cosmjs/socket" "0.26.0" + "@cosmjs/stream" "0.26.0" axios "^0.21.1" readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/utils@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.25.6.tgz#934d9a967180baa66163847616a74358732227ca" - integrity sha512-ofOYiuxVKNo238vCPPlaDzqPXy2AQ/5/nashBo5rvPZJkxt9LciGfUEQWPCOb1BIJDNx2Dzu0z4XCf/dwzl0Dg== +"@cosmjs/utils@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.26.0.tgz#a1c1728899e06e00ddfa99e2053b93413c9c20cf" + integrity sha512-InTQ3P1noUR0U5zJs8ssqnToIGH2NKbFb+hS5wmYGLB0XRdlNk0UGcb9pjbAzaWRQPWxTd08YQvXg6IK/WE4fA== "@cosmostation/cosmosjs@^0.10.6": version "0.10.6" @@ -1590,9 +1598,9 @@ integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ== "@types/node@>=13.7.0": - version "16.6.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.2.tgz#331b7b9f8621c638284787c5559423822fdffc50" - integrity sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA== + version "16.7.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc" + integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA== "@types/node@^13.7.0": version "13.13.52" @@ -2516,7 +2524,7 @@ axios-mock-adapter@1.19.0: axios@0.21.1, axios@^0.21.1: version "0.21.1" - resolved "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== dependencies: follow-redirects "^1.10.0" @@ -3835,6 +3843,14 @@ cosmiconfig@^5.0.0: js-yaml "^3.13.1" parse-json "^4.0.0" +cosmjs-types@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.2.0.tgz#0c3041ed1d54e1b73486c5bf01c8bd1f44449020" + integrity sha512-9/jBr7kxfHg8HCNzUi9hxutU2GldrScXXSjfTZWuZHlFJmn5sJDXlvxSWhpeWIorHRxN8CtxDPmt7zdo/+BYDg== + dependencies: + long "^4.0.0" + protobufjs "~6.11.2" + create-ecdh@^4.0.0: version "4.0.4" resolved "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz" @@ -4283,7 +4299,7 @@ defer-to-connect@^2.0.0: define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" - resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== dependencies: object-keys "^1.0.12" @@ -5489,11 +5505,16 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0, follow-redirects@^1.10.0: +follow-redirects@^1.0.0: version "1.14.1" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz" integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== +follow-redirects@^1.10.0: + version "1.14.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e" + integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" @@ -6004,7 +6025,7 @@ has@^1.0.0, has@^1.0.3: hash-base@^3.0.0: version "3.1.0" - resolved "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== dependencies: inherits "^2.0.4" @@ -6392,7 +6413,7 @@ inflight@^1.0.4: inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" - resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== inherits@2.0.1: @@ -9137,7 +9158,7 @@ proto-list@~1.2.1: resolved "https://registry.npm.taobao.org/proto-list/download/proto-list-1.2.4.tgz" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -protobufjs@^6.10.2, protobufjs@^6.8.8: +protobufjs@^6.10.2, protobufjs@^6.8.8, protobufjs@~6.11.2: version "6.11.2" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== @@ -9428,7 +9449,7 @@ read-pkg@^5.1.1: readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== dependencies: inherits "^2.0.3" @@ -10464,7 +10485,7 @@ string.prototype.trimstart@^1.0.4: string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== dependencies: safe-buffer "~5.2.0" @@ -11283,7 +11304,7 @@ use@^3.1.0: util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" - resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= util.promisify@1.0.0: @@ -11969,9 +11990,9 @@ ws@^6.0.0, ws@^6.2.1: async-limiter "~1.0.0" ws@^7: - version "7.5.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" - integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== + version "7.5.4" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.4.tgz#56bfa20b167427e138a7795de68d134fe92e21f9" + integrity sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg== xdg-basedir@^4.0.0: version "4.0.0"