@keplr-wallet/stores 0.12.215 → 0.12.216

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -56,6 +56,16 @@ class ObservableChainQueryDenomTrace extends chain_query_1.ObservableChainQuery
56
56
  for (let i = 0; i < rawPaths.length; i += 2) {
57
57
  rawPathChunks.push(rawPaths.slice(i, i + 2));
58
58
  }
59
+ // 기존 ibc-go랑 ibc v2랑 섞이면 base denom 안에 path가 포함되어 버린다...;;
60
+ const rawPathsInBaseDenom = this.response.data.denom_trace.base_denom.split("/");
61
+ if (rawPathsInBaseDenom.length % 2 === 1) {
62
+ for (let i = 0; i < rawPathsInBaseDenom.length; i += 2) {
63
+ if (rawPathsInBaseDenom[i] === "transfer" &&
64
+ i + 1 < rawPathsInBaseDenom.length) {
65
+ rawPathChunks.push(rawPathsInBaseDenom.slice(i, i + 2));
66
+ }
67
+ }
68
+ }
59
69
  return rawPathChunks.map((chunk) => {
60
70
  return {
61
71
  portId: chunk[0],
@@ -70,6 +80,20 @@ class ObservableChainQueryDenomTrace extends chain_query_1.ObservableChainQuery
70
80
  if ("denom" in this.response.data) {
71
81
  return this.response.data.denom.base;
72
82
  }
83
+ // 기존 ibc-go랑 ibc v2랑 섞이면 base denom 안에 path가 포함되어 버린다...;;
84
+ const rawPathsInBaseDenom = this.response.data.denom_trace.base_denom.split("/");
85
+ if (rawPathsInBaseDenom.length % 2 === 1) {
86
+ for (let i = 0; i < rawPathsInBaseDenom.length; i += 2) {
87
+ if (rawPathsInBaseDenom[i] === "transfer" &&
88
+ i + 1 < rawPathsInBaseDenom.length) {
89
+ rawPathsInBaseDenom.shift();
90
+ rawPathsInBaseDenom.shift();
91
+ }
92
+ }
93
+ if (rawPathsInBaseDenom.length === 1 && rawPathsInBaseDenom[0]) {
94
+ return rawPathsInBaseDenom[0];
95
+ }
96
+ }
73
97
  return this.response.data.denom_trace.base_denom;
74
98
  }
75
99
  get denomTrace() {
@@ -1 +1 @@
1
- {"version":3,"file":"denom-trace.js","sourceRoot":"","sources":["../../../../src/query/cosmos/ibc/denom-trace.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"denom-trace.js","sourceRoot":"","sources":["../../../../src/query/cosmos/ibc/denom-trace.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@keplr-wallet/stores",
3
- "version": "0.12.215",
3
+ "version": "0.12.216",
4
4
  "main": "build/index.js",
5
5
  "author": "chainapsis",
6
6
  "license": "Apache-2.0",
@@ -16,17 +16,17 @@
16
16
  "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
17
17
  },
18
18
  "devDependencies": {
19
- "@keplr-wallet/provider-mock": "0.12.215"
19
+ "@keplr-wallet/provider-mock": "0.12.216"
20
20
  },
21
21
  "dependencies": {
22
- "@keplr-wallet/common": "0.12.215",
23
- "@keplr-wallet/cosmos": "0.12.215",
24
- "@keplr-wallet/crypto": "0.12.215",
25
- "@keplr-wallet/mobx-utils": "0.12.215",
26
- "@keplr-wallet/proto-types": "0.12.215",
27
- "@keplr-wallet/simple-fetch": "0.12.215",
28
- "@keplr-wallet/types": "0.12.215",
29
- "@keplr-wallet/unit": "0.12.215",
22
+ "@keplr-wallet/common": "0.12.216",
23
+ "@keplr-wallet/cosmos": "0.12.216",
24
+ "@keplr-wallet/crypto": "0.12.216",
25
+ "@keplr-wallet/mobx-utils": "0.12.216",
26
+ "@keplr-wallet/proto-types": "0.12.216",
27
+ "@keplr-wallet/simple-fetch": "0.12.216",
28
+ "@keplr-wallet/types": "0.12.216",
29
+ "@keplr-wallet/unit": "0.12.216",
30
30
  "buffer": "^6.0.3",
31
31
  "deepmerge": "^4.2.2",
32
32
  "eventemitter3": "^4.0.7",
@@ -38,5 +38,5 @@
38
38
  "mobx": "^6",
39
39
  "mobx-utils": "^6"
40
40
  },
41
- "gitHead": "76ed391081cd0e34788d2a8411f221f4e5b3533e"
41
+ "gitHead": "0542470d8adcb2e600667ec64ce90681f6ce6eda"
42
42
  }
@@ -79,6 +79,20 @@ export class ObservableChainQueryDenomTrace extends ObservableChainQuery<
79
79
  rawPathChunks.push(rawPaths.slice(i, i + 2));
80
80
  }
81
81
 
82
+ // 기존 ibc-go랑 ibc v2랑 섞이면 base denom 안에 path가 포함되어 버린다...;;
83
+ const rawPathsInBaseDenom =
84
+ this.response.data.denom_trace.base_denom.split("/");
85
+ if (rawPathsInBaseDenom.length % 2 === 1) {
86
+ for (let i = 0; i < rawPathsInBaseDenom.length; i += 2) {
87
+ if (
88
+ rawPathsInBaseDenom[i] === "transfer" &&
89
+ i + 1 < rawPathsInBaseDenom.length
90
+ ) {
91
+ rawPathChunks.push(rawPathsInBaseDenom.slice(i, i + 2));
92
+ }
93
+ }
94
+ }
95
+
82
96
  return rawPathChunks.map((chunk) => {
83
97
  return {
84
98
  portId: chunk[0],
@@ -96,6 +110,24 @@ export class ObservableChainQueryDenomTrace extends ObservableChainQuery<
96
110
  return this.response.data.denom.base;
97
111
  }
98
112
 
113
+ // 기존 ibc-go랑 ibc v2랑 섞이면 base denom 안에 path가 포함되어 버린다...;;
114
+ const rawPathsInBaseDenom =
115
+ this.response.data.denom_trace.base_denom.split("/");
116
+ if (rawPathsInBaseDenom.length % 2 === 1) {
117
+ for (let i = 0; i < rawPathsInBaseDenom.length; i += 2) {
118
+ if (
119
+ rawPathsInBaseDenom[i] === "transfer" &&
120
+ i + 1 < rawPathsInBaseDenom.length
121
+ ) {
122
+ rawPathsInBaseDenom.shift();
123
+ rawPathsInBaseDenom.shift();
124
+ }
125
+ }
126
+ if (rawPathsInBaseDenom.length === 1 && rawPathsInBaseDenom[0]) {
127
+ return rawPathsInBaseDenom[0];
128
+ }
129
+ }
130
+
99
131
  return this.response.data.denom_trace.base_denom;
100
132
  }
101
133