From efcdf54fb3c88e461ce4ce25aa6e850302503669 Mon Sep 17 00:00:00 2001 From: Shunji Zhan Date: Wed, 18 Jan 2023 09:22:55 +0800 Subject: [PATCH] update subql to 2120 compatible (#631) * update subql to 2120 compatible * update polkadot deps --- evm-subql/package.json | 32 +- evm-subql/project-karura-3280470.yaml | 28 -- evm-subql/src/mappings/mappingHandlers.ts | 13 +- evm-subql/yarn.lock | 448 ++++++++++++---------- 4 files changed, 269 insertions(+), 252 deletions(-) delete mode 100644 evm-subql/project-karura-3280470.yaml diff --git a/evm-subql/package.json b/evm-subql/package.json index 51ec04115..53445973a 100644 --- a/evm-subql/package.json +++ b/evm-subql/package.json @@ -22,7 +22,7 @@ "author": "Acala Developers ", "license": "Apache-2.0", "dependencies": { - "@acala-network/eth-providers": "~2.5.9" + "@acala-network/eth-providers": "~2.5.10" }, "devDependencies": { "@subql/cli": "~1.10.0", @@ -32,20 +32,20 @@ "typescript": "~4.6.3" }, "resolutions": { - "@polkadot/api": "9.9.1", - "@polkadot/api-augment": "9.9.1", - "@polkadot/api-base": "9.9.1", - "@polkadot/api-derive": "9.9.1", - "@polkadot/keyring": "^10.1.13", - "@polkadot/rpc-augment": "9.9.1", - "@polkadot/rpc-core": "9.9.1", - "@polkadot/rpc-provider": "9.9.1", - "@polkadot/types": "9.9.1", - "@polkadot/types-augment": "9.9.1", - "@polkadot/types-codec": "9.9.1", - "@polkadot/types-create": "9.9.1", - "@polkadot/types-known": "9.9.1", - "@polkadot/util": "^10.1.13", - "@polkadot/util-crypto": "^10.1.13" + "@polkadot/api": "9.10.3", + "@polkadot/api-augment": "9.10.3", + "@polkadot/api-base": "9.10.3", + "@polkadot/api-derive": "9.10.3", + "@polkadot/rpc-augment": "9.10.3", + "@polkadot/rpc-core": "9.10.3", + "@polkadot/rpc-provider": "9.10.3", + "@polkadot/types-augment": "9.10.3", + "@polkadot/types-codec": "9.10.3", + "@polkadot/keyring": "^10.2.1", + "@polkadot/types": "9.10.3", + "@polkadot/types-create": "9.10.3", + "@polkadot/types-known": "9.10.3", + "@polkadot/util": "^10.2.1", + "@polkadot/util-crypto": "^10.2.1" } } diff --git a/evm-subql/project-karura-3280470.yaml b/evm-subql/project-karura-3280470.yaml deleted file mode 100644 index 0ea62fe6c..000000000 --- a/evm-subql/project-karura-3280470.yaml +++ /dev/null @@ -1,28 +0,0 @@ -specVersion: 1.0.0 -name: '@acala-network/evm-subql' -version: 1.0.0 -runner: - node: - name: '@subql/node' - version: 1.17.0 - query: - name: '@subql/query' - version: 1.4.0 -description: 'subquery for Karura EVM+' -repository: 'https://github.com/AcalaNetwork/bodhi.js/tree/master/evm-subql' -schema: - file: ./schema.graphql -network: - # Karura - chainId: '0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b' - endpoint: wss://karura-rpc-0.aca-api.network - chaintypes: - file: ./types.json -dataSources: - - kind: substrate/Runtime - startBlock: 3280470 - mapping: - file: ./dist/index.js - handlers: - - handler: handleBlock - kind: substrate/BlockHandler diff --git a/evm-subql/src/mappings/mappingHandlers.ts b/evm-subql/src/mappings/mappingHandlers.ts index b5049d42a..a42efa116 100644 --- a/evm-subql/src/mappings/mappingHandlers.ts +++ b/evm-subql/src/mappings/mappingHandlers.ts @@ -3,7 +3,8 @@ import { PartialTransactionReceipt, getTransactionIndexAndHash, getEffectiveGasPrice, - findEvmEvent + findEvmEvent, + findTxFeeEvent } from '@acala-network/eth-providers/lib/utils'; import { EventData } from '@acala-network/eth-providers/lib/base-provider'; import { BigNumber } from '@ethersproject/bignumber/lib/bignumber'; @@ -46,7 +47,15 @@ export async function handleEvmExtrinsic( return; } - const effectiveGasPrice = await getEffectiveGasPrice(evmEvent, global.unsafeApi, blockHash, extrinsic, actualWeight); + const txFeeEvent = findTxFeeEvent(extrinsicEvents); + const effectiveGasPrice = await getEffectiveGasPrice( + evmEvent, + txFeeEvent, + global.unsafeApi, + blockHash, + extrinsic, + actualWeight + ); const transactionInfo = { transactionIndex: BigInt(transactionIndex), diff --git a/evm-subql/yarn.lock b/evm-subql/yarn.lock index c11332ac4..4ddf80dff 100644 --- a/evm-subql/yarn.lock +++ b/evm-subql/yarn.lock @@ -29,14 +29,14 @@ resolved "https://registry.npmjs.org/@acala-network/contracts/-/contracts-4.3.4.tgz#f37cf54894c72b762df539042a61f90b10b68600" integrity sha512-oBgXGUjRW+lRo9TWGtCB1+OpEOFfhxW//wReb7V/YdbEElVvYuKw3lmfly/eZ/mdBgqxA3eXxNW0AgXiyOn2NQ== -"@acala-network/eth-providers@~2.5.6": - version "2.5.6" - resolved "https://registry.npmjs.org/@acala-network/eth-providers/-/eth-providers-2.5.6.tgz#bc30fe227b9d5383645b12a9d9185df77b39ce20" - integrity sha512-VA2OdUsHulWoBZErflpYwuTAXFubJzGBtNRYE9UaR/kDDDsahWp+AqGxaffIL+Yc7JntlNoGnB9VCIXjLVsC0w== +"@acala-network/eth-providers@~2.5.10": + version "2.5.10" + resolved "https://registry.npmjs.org/@acala-network/eth-providers/-/eth-providers-2.5.10.tgz#f267e96a319e9b39bf305644ad52773b703842fb" + integrity sha512-0+UQLLlLSkfQ6wpQMZ4pyAvFYeHw0+CetH0kYMnZXt6ZuCvEnStdLYAWJ4K1xnIwGnU/Vi/hpE2WKjyRH38kFw== dependencies: "@acala-network/api" "~4.1.8-9" "@acala-network/contracts" "~4.3.4" - "@acala-network/eth-transactions" "2.5.6" + "@acala-network/eth-transactions" "2.5.10" "@acala-network/types" "~4.1.8-9" "@ethersproject/abstract-provider" "~5.7.0" "@ethersproject/address" "~5.7.0" @@ -50,23 +50,23 @@ "@ethersproject/providers" "~5.7.0" "@ethersproject/transactions" "~5.7.0" "@ethersproject/wallet" "~5.7.0" - "@polkadot/api" "^9.9.1" - "@polkadot/api-augment" "9.9.1" - "@polkadot/api-derive" "^9.9.1" - "@polkadot/keyring" "^10.1.13" - "@polkadot/types" "^9.9.1" - "@polkadot/util" "^10.1.13" - "@polkadot/util-crypto" "^10.1.13" + "@polkadot/api" "9.10.3" + "@polkadot/api-augment" "9.10.3" + "@polkadot/api-derive" "9.10.3" + "@polkadot/keyring" "^10.2.1" + "@polkadot/types" "9.10.3" + "@polkadot/util" "^10.2.1" + "@polkadot/util-crypto" "^10.2.1" bn.js "~5.2.0" ethers "~5.7.0" graphql "~16.0.1" graphql-request "~3.6.1" lru-cache "~7.8.2" -"@acala-network/eth-transactions@2.5.6": - version "2.5.6" - resolved "https://registry.npmjs.org/@acala-network/eth-transactions/-/eth-transactions-2.5.6.tgz#0635e1cb895d77a9ef0dc396342a110b65d3dae0" - integrity sha512-E6e8aXO0fwwrPqbAGoZ0IKHExN7ZOIg7BUckXl8WQcmdUTRXaoum2iStJFxEeZ8YBe88Q0fz/JLclN1Y0LsVmw== +"@acala-network/eth-transactions@2.5.10": + version "2.5.10" + resolved "https://registry.npmjs.org/@acala-network/eth-transactions/-/eth-transactions-2.5.10.tgz#71f43b704490c6575b743ed827acbfb214a9ed83" + integrity sha512-d1MPfUBlXtXvivkb2C1rw4ZBZaz29NtGc0xzD4d8xxKuOkummmKO7xmk+076vTapRQbdbnsVyZHq/Wbvku8RVQ== dependencies: "@ethersproject/address" "~5.7.0" "@ethersproject/bignumber" "~5.7.0" @@ -117,13 +117,20 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/runtime@^7.10.2", "@babel/runtime@^7.20.1", "@babel/runtime@^7.20.6": +"@babel/runtime@^7.10.2", "@babel/runtime@^7.20.6": version "7.20.6" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3" integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA== dependencies: regenerator-runtime "^0.13.11" +"@babel/runtime@^7.20.7": + version "7.20.7" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd" + integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ== + dependencies: + regenerator-runtime "^0.13.11" + "@confio/ics23@^0.6.8": version "0.6.8" resolved "https://registry.npmjs.org/@confio/ics23/-/ics23-0.6.8.tgz#2a6b4f1f2b7b20a35d9a0745bb5a446e72930b3d" @@ -1187,70 +1194,70 @@ dependencies: "@open-web3/orml-type-definitions" "1.1.4" -"@polkadot/api-augment@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-9.9.1.tgz#5615ed8117a385d7ade3609fb51ea6119b79b8ef" - integrity sha512-0HS6Kit9ZiO2iQU/aS/jpOjXl9rFcwW6FdUs1eSXvWjvAFpoxwCMG8bv8wVjNZcCUuA2w5U0+2B+Xa612QEQQg== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/api-base" "9.9.1" - "@polkadot/rpc-augment" "9.9.1" - "@polkadot/types" "9.9.1" - "@polkadot/types-augment" "9.9.1" - "@polkadot/types-codec" "9.9.1" - "@polkadot/util" "^10.1.13" - -"@polkadot/api-base@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/api-base/-/api-base-9.9.1.tgz#716143c3a9849570a499a7b44d82fd2533f141de" - integrity sha512-uJDLi+nHQ08QZ+p1ldzwMeNjCyIkpR1DOzvKV3M3bLepglF8r7V/7W5dXk+qlClMqgB92RgKwo4R6EPRgr5BcA== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/rpc-core" "9.9.1" - "@polkadot/types" "9.9.1" - "@polkadot/util" "^10.1.13" - rxjs "^7.5.7" - -"@polkadot/api-derive@9.9.1", "@polkadot/api-derive@^8.5.1", "@polkadot/api-derive@^9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-9.9.1.tgz#73f1db5ca2525996153a2cf9c1b84fbedeba5484" - integrity sha512-cCCbnhXfCo9Mj4DCM0TVoDOEe5yleOLdqoICU9T4PMv5R51D+iMmw97+MYCgyjRdm7wIW05LlW32iUVrgDiSJw== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/api" "9.9.1" - "@polkadot/api-augment" "9.9.1" - "@polkadot/api-base" "9.9.1" - "@polkadot/rpc-core" "9.9.1" - "@polkadot/types" "9.9.1" - "@polkadot/types-codec" "9.9.1" - "@polkadot/util" "^10.1.13" - "@polkadot/util-crypto" "^10.1.13" - rxjs "^7.5.7" - -"@polkadot/api@9.9.1", "@polkadot/api@^9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/api/-/api-9.9.1.tgz#a8baf368fc57211acfd9ecf831b820272f8144d6" - integrity sha512-3ltj6BbqEV9SCUlJIEmXWBmmQlZCvVPaj0N+99J9L2yiQ1E0KJsAizh10RxEjCvgYb2iWaE4ItPfhN0GxFJm7Q== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/api-augment" "9.9.1" - "@polkadot/api-base" "9.9.1" - "@polkadot/api-derive" "9.9.1" - "@polkadot/keyring" "^10.1.13" - "@polkadot/rpc-augment" "9.9.1" - "@polkadot/rpc-core" "9.9.1" - "@polkadot/rpc-provider" "9.9.1" - "@polkadot/types" "9.9.1" - "@polkadot/types-augment" "9.9.1" - "@polkadot/types-codec" "9.9.1" - "@polkadot/types-create" "9.9.1" - "@polkadot/types-known" "9.9.1" - "@polkadot/util" "^10.1.13" - "@polkadot/util-crypto" "^10.1.13" +"@polkadot/api-augment@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-9.10.3.tgz#8b622b65dfc9625e3fba337166f6c0445009368b" + integrity sha512-lgcvAwpvCFJ+nUCeCJvDFhowflrPXZn9mio8b/uCvkvEbI8JscMDOfOpp3qODl5eMzwDUi+Nac+sYz3WT4M8ew== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/api-base" "9.10.3" + "@polkadot/rpc-augment" "9.10.3" + "@polkadot/types" "9.10.3" + "@polkadot/types-augment" "9.10.3" + "@polkadot/types-codec" "9.10.3" + "@polkadot/util" "^10.2.1" + +"@polkadot/api-base@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/api-base/-/api-base-9.10.3.tgz#e3cebf2c809249fedae8ee754390aa824b168bb0" + integrity sha512-/aI+7DCSi1M4i1YsYS88aEckY5RdfPmGF6p0aupp+OE6C1sPTLtCWRpC0hJRM4DA49WuWuezGYUF+eBywjHTWw== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/rpc-core" "9.10.3" + "@polkadot/types" "9.10.3" + "@polkadot/util" "^10.2.1" + rxjs "^7.8.0" + +"@polkadot/api-derive@9.10.3", "@polkadot/api-derive@^8.5.1": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-9.10.3.tgz#1bcdfc5b86b61b6a443f591ff8c64ffa11fd510c" + integrity sha512-Y5vLMT2XjoUfc7MVOSAhrIjoPn8flLOk2rXXEayS1b4AnSB5A/0MrVuZT3YQbyWn9U/4yMFpWWRaXfCLlAzGEQ== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/api" "9.10.3" + "@polkadot/api-augment" "9.10.3" + "@polkadot/api-base" "9.10.3" + "@polkadot/rpc-core" "9.10.3" + "@polkadot/types" "9.10.3" + "@polkadot/types-codec" "9.10.3" + "@polkadot/util" "^10.2.1" + "@polkadot/util-crypto" "^10.2.1" + rxjs "^7.8.0" + +"@polkadot/api@9.10.3", "@polkadot/api@^9.9.1": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/api/-/api-9.10.3.tgz#de967c49ecef65d13e8b6b4d45c8986e4b1162e4" + integrity sha512-IKdP+H8G8EdRjN0o5fuRWYCjvPemE8bAVCP6b5+OpQQJFv71ZGkMRWAN7cfrI+5CieSzZ+yKBAdug+1PCX5cSw== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/api-augment" "9.10.3" + "@polkadot/api-base" "9.10.3" + "@polkadot/api-derive" "9.10.3" + "@polkadot/keyring" "^10.2.1" + "@polkadot/rpc-augment" "9.10.3" + "@polkadot/rpc-core" "9.10.3" + "@polkadot/rpc-provider" "9.10.3" + "@polkadot/types" "9.10.3" + "@polkadot/types-augment" "9.10.3" + "@polkadot/types-codec" "9.10.3" + "@polkadot/types-create" "9.10.3" + "@polkadot/types-known" "9.10.3" + "@polkadot/util" "^10.2.1" + "@polkadot/util-crypto" "^10.2.1" eventemitter3 "^4.0.7" - rxjs "^7.5.7" + rxjs "^7.8.0" -"@polkadot/keyring@^10.1.13": +"@polkadot/keyring@^10.2.1": version "10.2.1" resolved "https://registry.npmjs.org/@polkadot/keyring/-/keyring-10.2.1.tgz#692d4e24dcbbe294b6945640802fc924ea20348e" integrity sha512-84/zzxDZANQ4AfsCT1vrjX3I23/mj9WUWl1F7q9ruK6UBFyGsl46Y3ABOopFHij9UXhppndhB65IeDnqoOKqxQ== @@ -1259,7 +1266,7 @@ "@polkadot/util" "10.2.1" "@polkadot/util-crypto" "10.2.1" -"@polkadot/networks@10.2.1", "@polkadot/networks@^10.1.13": +"@polkadot/networks@10.2.1": version "10.2.1" resolved "https://registry.npmjs.org/@polkadot/networks/-/networks-10.2.1.tgz#5095011795afa20291ef3e34a2ad38ed2c63fe09" integrity sha512-cDZIY4jBo2tlDdSXNbECpuWer0NWlPcJNhHHveTiu2idje2QyIBNxBlAPViNGpz+ScAR0EknEzmQKuHOcSKxzg== @@ -1268,111 +1275,120 @@ "@polkadot/util" "10.2.1" "@substrate/ss58-registry" "^1.35.0" -"@polkadot/rpc-augment@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-9.9.1.tgz#84f71a818bfcc5c33ff87252ffa263344f69255b" - integrity sha512-t3gTendxM9KD9Sg+hT7Wn72Xdusl25EsXcdOjFqQWUtFL8xjYcFngrTTifG90e+ciFIk1DWps2+zc6lbDwBfeA== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/rpc-core" "9.9.1" - "@polkadot/types" "9.9.1" - "@polkadot/types-codec" "9.9.1" - "@polkadot/util" "^10.1.13" - -"@polkadot/rpc-core@9.9.1", "@polkadot/rpc-core@^9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-9.9.1.tgz#f66318fe54f66652287dab9c4d611b71863b266a" - integrity sha512-ij1OxDfbPpdZ9+aN8oicZrysIfUjC7INBhDwwoZ4R/4jhqJvIV1fisgj6XOdHGlZGl+vQBnObOw0nEOU7apdQg== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/rpc-augment" "9.9.1" - "@polkadot/rpc-provider" "9.9.1" - "@polkadot/types" "9.9.1" - "@polkadot/util" "^10.1.13" - rxjs "^7.5.7" - -"@polkadot/rpc-provider@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-9.9.1.tgz#1dcddb127aca53fcf1f269bbf7cac68982c67854" - integrity sha512-YyIwYDAgeEAAjvsH/v5v6sFkhkoaER98rPIcfP+81sGcxpjBCArg4feDtzTPQMsnUcbj3708ppJicu6ECc1xFg== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/keyring" "^10.1.13" - "@polkadot/types" "9.9.1" - "@polkadot/types-support" "9.9.1" - "@polkadot/util" "^10.1.13" - "@polkadot/util-crypto" "^10.1.13" - "@polkadot/x-fetch" "^10.1.13" - "@polkadot/x-global" "^10.1.13" - "@polkadot/x-ws" "^10.1.13" - "@substrate/connect" "0.7.17" +"@polkadot/networks@^10.2.1": + version "10.2.6" + resolved "https://registry.npmjs.org/@polkadot/networks/-/networks-10.2.6.tgz#8bb354a16b8cfff75fe113d5253705717d4e2959" + integrity sha512-n9e5SBdZvlNMS2E9UL0Hc+9A9d5vVT124EznhSMRwO+NnR708Y2kd+Fl7fRz4250mh78ponaSDzy83iL90IfTQ== + dependencies: + "@babel/runtime" "^7.20.7" + "@polkadot/util" "10.2.6" + "@substrate/ss58-registry" "^1.37.0" + +"@polkadot/rpc-augment@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-9.10.3.tgz#0f750e16149ed239d9df9a58f5c52b2f99266e28" + integrity sha512-lNjZAAUp96h2mejhMGAnw9tyvsppX6PtjIDnSCqTgXifU+yepYpH78tlarF/ALAGPzqZxqA5vMDdBF7x/HF/5w== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/rpc-core" "9.10.3" + "@polkadot/types" "9.10.3" + "@polkadot/types-codec" "9.10.3" + "@polkadot/util" "^10.2.1" + +"@polkadot/rpc-core@9.10.3", "@polkadot/rpc-core@^9.9.1": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-9.10.3.tgz#cbbdcc29b52ce76dd41803029296fb50a8139199" + integrity sha512-+FnPyHQmTPFx94LdOYTSenxUSw2vesjT91/eDBxBn7NHZ36cr3iUa0tw4fa/N5wjwjaUv3iPjbAS7xsQX/knTQ== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/rpc-augment" "9.10.3" + "@polkadot/rpc-provider" "9.10.3" + "@polkadot/types" "9.10.3" + "@polkadot/util" "^10.2.1" + rxjs "^7.8.0" + +"@polkadot/rpc-provider@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-9.10.3.tgz#a5402636d827204beaaea096c9d3736bf4891439" + integrity sha512-+UFyEBhtfa3YeHsLMVPr/ZZx6E2s1Uh6pvbu0NT5Gj++LO7c1pxocbNIXGkzfZwkaJgGzVexeVsV4llW/BTp4Q== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/keyring" "^10.2.1" + "@polkadot/types" "9.10.3" + "@polkadot/types-support" "9.10.3" + "@polkadot/util" "^10.2.1" + "@polkadot/util-crypto" "^10.2.1" + "@polkadot/x-fetch" "^10.2.1" + "@polkadot/x-global" "^10.2.1" + "@polkadot/x-ws" "^10.2.1" + "@substrate/connect" "0.7.18" eventemitter3 "^4.0.7" mock-socket "^9.1.5" nock "^13.2.9" -"@polkadot/types-augment@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-9.9.1.tgz#77e7d9df2a3bd69236c7fa8c02b6574b1e232d84" - integrity sha512-h4DhtVPbe7/6Mdwickqih3ltvEV9y08a8LVvjxVVaGw1gRcoQpcMLkvsyWh5caYBPCKuJvXV40p4PnvO/HtW2A== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/types" "9.9.1" - "@polkadot/types-codec" "9.9.1" - "@polkadot/util" "^10.1.13" - -"@polkadot/types-codec@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-9.9.1.tgz#4a5f789bedb29f27af612afe789d91e78d6bd136" - integrity sha512-vBzInneVp2ClDD/bmrf9HUp9La0udBJnhvyqwdLA2IKQBjIYOxVtuC62D4dg1Svp34NH4+b/nAtWlOvflSjOQQ== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/util" "^10.1.13" - "@polkadot/x-bigint" "^10.1.13" - -"@polkadot/types-create@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/types-create/-/types-create-9.9.1.tgz#4a9c6596a2adb879e878a6fba6f1bb967567a637" - integrity sha512-fzHTdWdXPbJxAYNP2nFzM9B1Nom7wiIFalltIj3jLQYF8uCgPuMF4/nLDi5uEg5YpCBCTagqyoVUuEd4riDS/Q== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/types-codec" "9.9.1" - "@polkadot/util" "^10.1.13" - -"@polkadot/types-known@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/types-known/-/types-known-9.9.1.tgz#5cd6b55f06051f12fcad09957d1746ac5ce185ae" - integrity sha512-kD51etsC0Oh5RnBTVabxmIqXe03XRYBDAaaC6yj2MGiPsyuy3X6g26xPZy9pSYcjkkWIF81CtPcLaJE5YrG0/A== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/networks" "^10.1.13" - "@polkadot/types" "9.9.1" - "@polkadot/types-codec" "9.9.1" - "@polkadot/types-create" "9.9.1" - "@polkadot/util" "^10.1.13" - -"@polkadot/types-support@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/types-support/-/types-support-9.9.1.tgz#d93ddf1d68de39ff7241d7962cf50b9f7fe6d0f6" - integrity sha512-PGu80mMvyr+rD6pi8Z/r9l650cadpW4X+pWt4tJnKYAbtiaE9mQJGFwq+HgY3vExzRDhaXNOUDg9d1ry5XUvJQ== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/util" "^10.1.13" - -"@polkadot/types@9.9.1", "@polkadot/types@^9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@polkadot/types/-/types-9.9.1.tgz#ef223eb82066303c807828d23668672a8153712e" - integrity sha512-WK0CPj0LZhb5ZSfhMvT5ZZv0nnqz9wQdRSehjqeuq7DD2TgTIPZL22zP4UjJPAJEyTtwyfcRn6+ZhL2JS5w0Jg== - dependencies: - "@babel/runtime" "^7.20.1" - "@polkadot/keyring" "^10.1.13" - "@polkadot/types-augment" "9.9.1" - "@polkadot/types-codec" "9.9.1" - "@polkadot/types-create" "9.9.1" - "@polkadot/util" "^10.1.13" - "@polkadot/util-crypto" "^10.1.13" - rxjs "^7.5.7" - -"@polkadot/util-crypto@10.2.1", "@polkadot/util-crypto@^10", "@polkadot/util-crypto@^10.1.13", "@polkadot/util-crypto@^9.0.1": +"@polkadot/types-augment@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-9.10.3.tgz#78a87d95d97209d3ed6dfbc90d27c61c4add8ef6" + integrity sha512-cCfcXfPSfx0v5AfNXkT54C6bx5Gi2l01DqxfTOpbf4bcfoGLAYjVeiul6nM1GDBAgB1KclWbuPjSgid/bpdLuQ== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/types" "9.10.3" + "@polkadot/types-codec" "9.10.3" + "@polkadot/util" "^10.2.1" + +"@polkadot/types-codec@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-9.10.3.tgz#ec7c8a8a68f021d00a9801a0a45abfa35316d037" + integrity sha512-0W2Vn727SJEKCoeRR9YamIeAiAhQ7x/6S8wgISz3er2p7WxbMSS6BfnxYpIf1Lf/S73E15Cz1mIvqtHUG0WAsA== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/util" "^10.2.1" + "@polkadot/x-bigint" "^10.2.1" + +"@polkadot/types-create@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/types-create/-/types-create-9.10.3.tgz#c797ef16c7069ca73265594ec7413a063cba024f" + integrity sha512-x56cMlwwkoEPyZ1x3kImqnfAShrN77qghuJgROGsZ8n0Sq64v2XtE0V+rGM1/y9RWOhD7FQEAZiha8jFNHXO5A== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/types-codec" "9.10.3" + "@polkadot/util" "^10.2.1" + +"@polkadot/types-known@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/types-known/-/types-known-9.10.3.tgz#73afd4a5f9ceb8df9f03c85c81cb2ba9e5e3f723" + integrity sha512-qOYiBYhnJiIZxsVRlJ5VYlLr25y0TRG8vPXRosVaY14CBamT0dGPct0FXKE7fCZi8sS5Y++EGhI6TByLmsx+jA== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/networks" "^10.2.1" + "@polkadot/types" "9.10.3" + "@polkadot/types-codec" "9.10.3" + "@polkadot/types-create" "9.10.3" + "@polkadot/util" "^10.2.1" + +"@polkadot/types-support@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/types-support/-/types-support-9.10.3.tgz#4ed6c89d84051e2d32bbd85d0407ff3e6da42aa5" + integrity sha512-iPlEtuLglhKQ9HOxViARnsLijU1//r9pVM799NcDw+qcqi93u8bcNqHsYXXyfjkPuorM3QWezdDf+TmRaolfZA== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/util" "^10.2.1" + +"@polkadot/types@9.10.3": + version "9.10.3" + resolved "https://registry.npmjs.org/@polkadot/types/-/types-9.10.3.tgz#a7f36152167e71604c85fa158918f6fd6b0725e5" + integrity sha512-4cyAe36bFo6i+rMtpFuNbMl4BYFQ++r4Hqb4XgiecTo+OJETsjNsdnaCZ7U19qhEZUQtX5tFvxfMlXuN7Hu2oQ== + dependencies: + "@babel/runtime" "^7.20.6" + "@polkadot/keyring" "^10.2.1" + "@polkadot/types-augment" "9.10.3" + "@polkadot/types-codec" "9.10.3" + "@polkadot/types-create" "9.10.3" + "@polkadot/util" "^10.2.1" + "@polkadot/util-crypto" "^10.2.1" + rxjs "^7.8.0" + +"@polkadot/util-crypto@10.2.1", "@polkadot/util-crypto@^10", "@polkadot/util-crypto@^10.2.1", "@polkadot/util-crypto@^9.0.1": version "10.2.1" resolved "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-10.2.1.tgz#f6ce1c81496336ca50c2ca84975bcde79aa16634" integrity sha512-UH1J4oD92gkLXMfVTLee3Y2vYadNyp1lmS4P2nZwQ0SOzGZ4rN7khD2CrB1cXS9WPq196Zb5oZdGLnPYnXHtjw== @@ -1389,7 +1405,7 @@ ed2curve "^0.3.0" tweetnacl "^1.0.3" -"@polkadot/util@10.2.1", "@polkadot/util@^10", "@polkadot/util@^10.1.13", "@polkadot/util@^8": +"@polkadot/util@10.2.1", "@polkadot/util@10.2.6", "@polkadot/util@^10", "@polkadot/util@^10.2.1", "@polkadot/util@^8": version "10.2.1" resolved "https://registry.npmjs.org/@polkadot/util/-/util-10.2.1.tgz#a8c3a4fe87091197448bec70f7ea079b60d5abf6" integrity sha512-ewGKSOp+VXKEeCvpCCP2Qqi/FVkewBF9vb/N8pRwuNQ2XE9k1lnsOZZeQemVBDhKsZz+h3IeNcWejaF6K3vYHQ== @@ -1453,7 +1469,7 @@ dependencies: "@babel/runtime" "^7.20.6" -"@polkadot/x-bigint@10.2.1", "@polkadot/x-bigint@^10.1.13": +"@polkadot/x-bigint@10.2.1": version "10.2.1" resolved "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-10.2.1.tgz#aa2d4384bb4ae6b5a3f333aa25bf6fd64d9006c5" integrity sha512-asFroI2skC4gYv0oIqqb84DqCCxhNUTSCKobEg57WdXoT4TKrN9Uetg2AMSIHRiX/9lP3EPMhUjM1VVGobTQRQ== @@ -1461,23 +1477,38 @@ "@babel/runtime" "^7.20.6" "@polkadot/x-global" "10.2.1" -"@polkadot/x-fetch@^10.1.13": - version "10.2.1" - resolved "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-10.2.1.tgz#cb5b33da1d91787eb2e5207ef62806a75ef3c62f" - integrity sha512-6ASJUZIrbLaKW+AOW7E5CuktwJwa2LHhxxRyJe398HxZUjJRjO2VJPdqoSwwCYvfFa1TcIr3FDWS63ooDfvGMA== +"@polkadot/x-bigint@^10.2.1": + version "10.2.6" + resolved "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-10.2.6.tgz#94a7a10f00ae3df05448456879ab4709fa99defc" + integrity sha512-C49pzOJ/spdRAcyTPHxBzvvi1JsOxeRIV20MvJyRHJ0u9W3Smj1UH+1VhkeoPsKGqswG5ql6AwjESEbXQgZtIw== dependencies: - "@babel/runtime" "^7.20.6" - "@polkadot/x-global" "10.2.1" + "@babel/runtime" "^7.20.7" + "@polkadot/x-global" "10.2.6" + +"@polkadot/x-fetch@^10.2.1": + version "10.2.6" + resolved "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-10.2.6.tgz#eb59856df430c72d1fa7ae6d8416604d7af66196" + integrity sha512-0ZhRSjVIOAWqLkEBPzeOUw0fFLG/dhx08YONGwZ79gvbgysRlWqrYnGWE/IdMeKdX8UJj3L6ezB4tZvDXLBkdg== + dependencies: + "@babel/runtime" "^7.20.7" + "@polkadot/x-global" "10.2.6" "@types/node-fetch" "^2.6.2" node-fetch "^3.3.0" -"@polkadot/x-global@10.2.1", "@polkadot/x-global@^10.1.13": +"@polkadot/x-global@10.2.1": version "10.2.1" resolved "https://registry.npmjs.org/@polkadot/x-global/-/x-global-10.2.1.tgz#6fbaab05653e680adc8c69c07947eee49afc1238" integrity sha512-kWmPku2lCcoYKU16+lWGOb95+6Lu9zo1trvzTWmAt7z0DXw2GlD9+qmDTt5iYGtguJsGXoRZDGilDTo3MeFrkA== dependencies: "@babel/runtime" "^7.20.6" +"@polkadot/x-global@10.2.6", "@polkadot/x-global@^10.2.1": + version "10.2.6" + resolved "https://registry.npmjs.org/@polkadot/x-global/-/x-global-10.2.6.tgz#712af3d7c5731cc1d882afa0cc3c9bf448103917" + integrity sha512-Cb6goXAwvhNdx/zclG4SNCC0lqqMzQ1mGFIhWNunfvsYAUsms9oFrGpVrM3cboDLvSSTjCjZ/gx1umA0mil6Cg== + dependencies: + "@babel/runtime" "^7.20.7" + "@polkadot/x-randomvalues@10.2.1": version "10.2.1" resolved "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-10.2.1.tgz#1c463625c0b7cf775e94594f522eb21a5229b42e" @@ -1502,13 +1533,13 @@ "@babel/runtime" "^7.20.6" "@polkadot/x-global" "10.2.1" -"@polkadot/x-ws@^10.1.13": - version "10.2.1" - resolved "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-10.2.1.tgz#ec119c22a8cb7b9cde00e9909e37b6ba2845efd1" - integrity sha512-oS/WEHc1JSJ+xMArzFXbg1yEeaRrp6GsJLBvObj4DgTyqoWTR5fYkq1G1nHbyqdR729yAnR6755PdaWecIg98g== +"@polkadot/x-ws@^10.2.1": + version "10.2.6" + resolved "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-10.2.6.tgz#5e232fe923aded4bb35646338aba228270069eb1" + integrity sha512-WsOSBSwI37HrIxON+Mw2kG3Ft8d1o8WtArNVs7uGavKEzy5JaSTbxFdfEyne2Azd+tHgJ0/u21qKGnN5RibvkA== dependencies: - "@babel/runtime" "^7.20.6" - "@polkadot/x-global" "10.2.1" + "@babel/runtime" "^7.20.7" + "@polkadot/x-global" "10.2.6" "@types/websocket" "^1.0.5" websocket "^1.0.34" @@ -1862,19 +1893,19 @@ resolved "https://registry.npmjs.org/@substrate/connect-extension-protocol/-/connect-extension-protocol-1.0.1.tgz#fa5738039586c648013caa6a0c95c43265dbe77d" integrity sha512-161JhCC1csjH3GE5mPLEd7HbWtwNSPJBg3p1Ksz9SFlTzj/bgEwudiRN2y5i0MoLGCIJRYKyKGMxVnd29PzNjg== -"@substrate/connect@0.7.17": - version "0.7.17" - resolved "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.17.tgz#b76ce23d24255e89028db81b3cb280c7f86db72e" - integrity sha512-s0XBmGpUCFWZFa+TS0TEvOKtWjJP2uT4xKmvzApH8INB5xbz79wqWFX6WWh3AlK/X1P0Smt+RVEH7HQiLJAYAw== +"@substrate/connect@0.7.18": + version "0.7.18" + resolved "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.18.tgz#ed4a95a4f5f60132dd26dbaf98820044b622763e" + integrity sha512-T1CaZJhe+uaeyM/cBdmD/oMWnaGf+tJdfG+3Os4H5YR0NVKXWsHpSfBryBP5wEce2hQhRiNnzQ+9ny8siKqRgg== dependencies: "@substrate/connect-extension-protocol" "^1.0.1" - "@substrate/smoldot-light" "0.7.7" + "@substrate/smoldot-light" "0.7.9" eventemitter3 "^4.0.7" -"@substrate/smoldot-light@0.7.7": - version "0.7.7" - resolved "https://registry.npmjs.org/@substrate/smoldot-light/-/smoldot-light-0.7.7.tgz#ee5f89bb25af64d2014d97548b959b7da4c67f08" - integrity sha512-ksxeAed6dIUtYSl0f8ehgWQjwXnpDGTIJt+WVRIGt3OObZkA96ZdBWx0xP7GrXZtj37u4n/Y1z7TyTm4bwQvrw== +"@substrate/smoldot-light@0.7.9": + version "0.7.9" + resolved "https://registry.npmjs.org/@substrate/smoldot-light/-/smoldot-light-0.7.9.tgz#68449873a25558e547e9468289686ee228a9930f" + integrity sha512-HP8iP7sFYlpSgjjbo0lqHyU+gu9lL2hbDNce6dWk5/10mFFF9jKIFGfui4zCecUY808o/Go9pan/31kMJoLbug== dependencies: pako "^2.0.4" ws "^8.8.1" @@ -1884,6 +1915,11 @@ resolved "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.36.0.tgz#22b59fa85cacc0bdf40aa5d8131a377c1b5a8dd8" integrity sha512-YfQIpe2bIvGg/XWNByycznbOiAknMvpYaUpQJ2sLmNT/OwPx7XjEXk7dLShccuiQDoOQt3trTtF3Frz/Tjv6Fg== +"@substrate/ss58-registry@^1.37.0": + version "1.37.0" + resolved "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.37.0.tgz#78f2a6f59f8c712cfe3ea747c52dcdfded3ec517" + integrity sha512-8R/4aQdZlKEPNrp2HSoPNxlDPPOyJe20qFk2w1hT0lXVbY4ZALrsO5Z4NrObAM2D9wTSpcxNKMFVQ2hIsqEHdw== + "@tootallnate/once@1": version "1.1.2" resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" @@ -6038,7 +6074,7 @@ rxjs@^6.6.2: dependencies: tslib "^1.9.0" -rxjs@^7.0.0, rxjs@^7.2.0, rxjs@^7.5.5, rxjs@^7.5.7: +rxjs@^7.0.0, rxjs@^7.2.0, rxjs@^7.5.5, rxjs@^7.8.0: version "7.8.0" resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==