From c4b735a74861554b3a2070e30030cc2550130f88 Mon Sep 17 00:00:00 2001 From: Anshudhar Kumar Singh Date: Sat, 7 Sep 2024 17:52:03 +0530 Subject: [PATCH] fix: vulnerebilities in packages --- package.json | 5 ++- packages/andrjs/package.json | 5 ++- packages/andrjs/src/AndromedaClient.ts | 3 +- packages/andrjs/src/clients/CosmClient.ts | 1 + packages/cli/package.json | 7 +++ packages/gql/package.json | 7 +++ pnpm-lock.yaml | 53 +++++------------------ 7 files changed, 35 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 1e30b5c..875d10d 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,10 @@ "semver@>=7.0.0 <7.5.2": ">=7.5.2", "axios@>=0.8.1 <0.28.0": "^1.6.7", "jose@>=3.0.0 <=4.15.4": ">=4.15.5", - "follow-redirects@<=1.15.5": ">=1.15.6" + "follow-redirects@<=1.15.5": ">=1.15.6", + "braces@<3.0.3": ">=3.0.3", + "ws@>=7.0.0 <7.5.10": ">=7.5.10", + "micromatch@<4.0.8": ">=4.0.8" } } } \ No newline at end of file diff --git a/packages/andrjs/package.json b/packages/andrjs/package.json index 5abc673..e8070a9 100644 --- a/packages/andrjs/package.json +++ b/packages/andrjs/package.json @@ -63,7 +63,10 @@ "semver@>=7.0.0 <7.5.2": ">=7.5.2", "axios@>=0.8.1 <0.28.0": ">=0.28.0", "jose@>=3.0.0 <=4.15.4": ">=4.15.5", - "follow-redirects@<=1.15.5": ">=1.15.6" + "follow-redirects@<=1.15.5": ">=1.15.6", + "braces@<3.0.3": ">=3.0.3", + "ws@>=7.0.0 <7.5.10": ">=7.5.10", + "micromatch@<4.0.8": ">=4.0.8" } } } \ No newline at end of file diff --git a/packages/andrjs/src/AndromedaClient.ts b/packages/andrjs/src/AndromedaClient.ts index e1da6a1..644bae7 100644 --- a/packages/andrjs/src/AndromedaClient.ts +++ b/packages/andrjs/src/AndromedaClient.ts @@ -64,11 +64,12 @@ export default class AndromedaClient { signer?: OfflineSigner | OfflineDirectSigner, // Only used for Cosmos Clients options?: SigningStargateClientOptions, + config?: Partial, rpcClient?: RpcClient ) { delete this.chainClient; - this.chainClient = createClient(addressPrefix); + this.chainClient = createClient(addressPrefix, config); // Nibiru rpc somehow doesn't work with HttpBatchClient if (!rpcClient && addressPrefix === 'nibi') { diff --git a/packages/andrjs/src/clients/CosmClient.ts b/packages/andrjs/src/clients/CosmClient.ts index 449a7b2..4572aa5 100644 --- a/packages/andrjs/src/clients/CosmClient.ts +++ b/packages/andrjs/src/clients/CosmClient.ts @@ -463,6 +463,7 @@ export default class CosmClient extends BaseChainClient implements ChainClient { export const andromedaAccountParser = (account: Any) => { switch (account.typeUrl) { case "/injective.types.v1beta1.EthAccount": + case "/eth.types.v1.EthAccount": case "/ethermint.types.v1.EthAccount": { const baseAccount = ModuleAccount.decode(account.value).baseAccount; assert(baseAccount); diff --git a/packages/cli/package.json b/packages/cli/package.json index f633fa4..41bfc22 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -78,5 +78,12 @@ "tsc-alias": "^1.8.10", "tsconfig-paths": "^4.2.0", "typescript": "^5.5.4" + }, + "pnpm": { + "overrides": { + "braces@<3.0.3": ">=3.0.3", + "ws@>=7.0.0 <7.5.10": ">=7.5.10", + "micromatch@<4.0.8": ">=4.0.8" + } } } \ No newline at end of file diff --git a/packages/gql/package.json b/packages/gql/package.json index 7b73043..74e1d93 100644 --- a/packages/gql/package.json +++ b/packages/gql/package.json @@ -44,5 +44,12 @@ "depcheck": "^1.4.7", "tsc-alias": "^1.8.10", "typescript": "^5.5.4" + }, + "pnpm": { + "overrides": { + "braces@<3.0.3": ">=3.0.3", + "ws@>=7.0.0 <7.5.10": ">=7.5.10", + "micromatch@<4.0.8": ">=4.0.8" + } } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c911674..a5ba7c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,6 +12,9 @@ overrides: axios@>=0.8.1 <0.28.0: ^1.6.7 jose@>=3.0.0 <=4.15.4: '>=4.15.5' follow-redirects@<=1.15.5: '>=1.15.6' + braces@<3.0.3: '>=3.0.3' + ws@>=7.0.0 <7.5.10: '>=7.5.10' + micromatch@<4.0.8: '>=4.0.8' importers: @@ -1617,8 +1620,8 @@ packages: resolution: {integrity: sha512-davcyYziBhkzfXQTu1l5NrpDYv0K9GekZCC9apBRvL1dvMc9F/ygM7iemHjUA+z8tJkxKxrt/YPjJ6XNHzLrkw==} dependencies: '@cosmjs/stream': 0.32.4 - isomorphic-ws: 4.0.1(ws@7.5.9) - ws: 7.5.9 + isomorphic-ws: 4.0.1(ws@8.18.0) + ws: 8.18.0 xstream: 11.14.0 transitivePeerDependencies: - bufferutil @@ -2807,7 +2810,7 @@ packages: jest-haste-map: 29.7.0 jest-regex-util: 29.6.3 jest-util: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.8 pirates: 4.0.6 slash: 3.0.0 write-file-atomic: 4.0.2 @@ -3831,13 +3834,6 @@ packages: balanced-match: 1.0.2 dev: true - /braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} - engines: {node: '>=8'} - dependencies: - fill-range: 7.0.1 - dev: true - /braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} @@ -4942,13 +4938,6 @@ packages: minimatch: 5.1.6 dev: true - /fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} - engines: {node: '>=8'} - dependencies: - to-regex-range: 5.0.1 - dev: true - /fill-range@7.1.1: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} @@ -5640,18 +5629,18 @@ packages: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true - /isomorphic-ws@4.0.1(ws@7.5.9): + /isomorphic-ws@4.0.1(ws@8.18.0): resolution: {integrity: sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==} peerDependencies: - ws: '*' + ws: '>=7.5.10' dependencies: - ws: 7.5.9 + ws: 8.18.0 dev: false /isomorphic-ws@5.0.0(ws@8.18.0): resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==} peerDependencies: - ws: '*' + ws: '>=7.5.10' dependencies: ws: 8.18.0 dev: true @@ -6581,14 +6570,6 @@ packages: '@types/node': 18.19.50 dev: true - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} - engines: {node: '>=8.6'} - dependencies: - braces: 3.0.2 - picomatch: 2.3.1 - dev: true - /micromatch@4.0.8: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} @@ -8296,19 +8277,6 @@ packages: signal-exit: 3.0.7 dev: true - /ws@7.5.9: - resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==} - engines: {node: '>=8.3.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - dev: false - /ws@8.17.1: resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==} engines: {node: '>=10.0.0'} @@ -8333,7 +8301,6 @@ packages: optional: true utf-8-validate: optional: true - dev: true /xstream@11.14.0: resolution: {integrity: sha512-1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==}