@keplr-wallet/stores-core 0.12.114-rc.0 → 0.12.115-rc.0

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.
@@ -29,7 +29,11 @@ export declare class ChainSuggestStore {
29
29
  chainInfo: ChainInfo | undefined;
30
30
  isLoading: boolean;
31
31
  };
32
- protected fetchCommunityChainInfo(chainId: string): Generator<Promise<import("@keplr-wallet/simple-fetch").SimpleFetchResponse<ChainInfo>>, void, import("@keplr-wallet/simple-fetch").SimpleFetchResponse<ChainInfo>>;
32
+ protected fetchCommunityChainInfo(chainId: string): Generator<Promise<import("@keplr-wallet/simple-fetch").SimpleFetchResponse<ChainInfo | (Omit<ChainInfo, "rest"> & {
33
+ websocket: string;
34
+ })>>, void, import("@keplr-wallet/simple-fetch").SimpleFetchResponse<ChainInfo | (Omit<ChainInfo, "rest"> & {
35
+ websocket: string;
36
+ })>>;
33
37
  approveWithProceedNext(id: string, chainInfo: ChainInfoWithSuggestedOptions, afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
34
38
  rejectWithProceedNext(id: string, afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
35
39
  rejectAll(): Promise<void>;
@@ -38,8 +38,9 @@ class ChainSuggestStore {
38
38
  return `https://github.com/${this.communityChainInfoRepo.organizationName}/${this.communityChainInfoRepo.repoName}`;
39
39
  }
40
40
  getCommunityChainInfoUrl(chainId) {
41
+ const isEvmOnlyChain = chainId.startsWith("eip155:");
41
42
  const chainIdHelper = cosmos_1.ChainIdHelper.parse(chainId);
42
- return `${this.communityChainInfoRepoUrl}/blob/${this.communityChainInfoRepo.branchName}/cosmos/${chainIdHelper.identifier}.json`;
43
+ return `${this.communityChainInfoRepoUrl}/blob/${this.communityChainInfoRepo.branchName}/${isEvmOnlyChain ? "evm" : "cosmos"}/${chainIdHelper.identifier}.json`;
43
44
  }
44
45
  getCommunityChainInfo(chainId) {
45
46
  const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainId).identifier;
@@ -49,6 +50,7 @@ class ChainSuggestStore {
49
50
  return this.communityChainInfo.get(chainIdentifier);
50
51
  }
51
52
  *fetchCommunityChainInfo(chainId) {
53
+ var _a;
52
54
  const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainId).identifier;
53
55
  const communityChainInfo = this.communityChainInfo.get(chainIdentifier);
54
56
  if (communityChainInfo) {
@@ -59,16 +61,24 @@ class ChainSuggestStore {
59
61
  chainInfo: undefined,
60
62
  });
61
63
  try {
64
+ const isEvmOnlyChain = chainId.startsWith("eip155:");
62
65
  const response = yield* (0, common_1.toGenerator)((0, simple_fetch_1.simpleFetch)(this.communityChainInfoRepo.alternativeURL
63
- ? this.communityChainInfoRepo.alternativeURL.replace("{chain_identifier}", chainIdentifier)
64
- : `https://raw.githubusercontent.com/${this.communityChainInfoRepo.organizationName}/${this.communityChainInfoRepo.repoName}/${this.communityChainInfoRepo.branchName}/cosmos/${chainIdentifier}.json`));
66
+ ? this.communityChainInfoRepo.alternativeURL
67
+ .replace("{chain_identifier}", chainIdentifier)
68
+ .replace("/cosmos/", isEvmOnlyChain ? "/evm/" : "/cosmos/")
69
+ : `https://raw.githubusercontent.com/${this.communityChainInfoRepo.organizationName}/${this.communityChainInfoRepo.repoName}/${this.communityChainInfoRepo.branchName}/${isEvmOnlyChain ? "evm" : "cosmos"}/${chainIdentifier}.json`));
70
+ const chainInfo = "rest" in response.data && !isEvmOnlyChain
71
+ ? response.data
72
+ : Object.assign(Object.assign({}, response.data), { rest: response.data.rpc, evm: Object.assign({ chainId: parseInt(response.data.chainId.replace("eip155:", ""), 10), rpc: response.data.rpc }, ("websocket" in response.data && {
73
+ websocket: response.data.websocket,
74
+ })), features: ["eth-address-gen", "eth-key-sign"].concat((_a = response.data.features) !== null && _a !== void 0 ? _a : []) });
65
75
  if (cosmos_1.ChainIdHelper.parse(response.data.chainId).identifier !==
66
76
  chainIdentifier) {
67
77
  throw new Error(`Invalid chain identifier: (expected: ${chainIdentifier}, actual: ${cosmos_1.ChainIdHelper.parse(response.data.chainId).identifier})`);
68
78
  }
69
79
  this.communityChainInfo.set(chainIdentifier, {
70
80
  isLoading: false,
71
- chainInfo: response.data,
81
+ chainInfo,
72
82
  });
73
83
  }
74
84
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"chain-suggest.js","sourceRoot":"","sources":["../../../src/core/interaction/chain-suggest.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"chain-suggest.js","sourceRoot":"","sources":["../../../src/core/interaction/chain-suggest.ts"],"names":[],"mappings":"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"}
@@ -12,9 +12,12 @@ export declare class PermissionStore {
12
12
  get waitingPermissionMergedData(): ({
13
13
  ids: string[];
14
14
  } & PermissionData) | undefined;
15
+ get waitingPermissionMergedDataForEVM(): ({
16
+ ids: string[];
17
+ } & PermissionData) | undefined;
15
18
  get waitingGlobalPermissionData(): import("@keplr-wallet/background").InteractionWaitingData<GlobalPermissionData> | undefined;
16
19
  get waitingGlobalPermissionDatas(): import("@keplr-wallet/background").InteractionWaitingData<GlobalPermissionData>[];
17
- approvePermissionWithProceedNext(id: string | string[], afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
20
+ approvePermissionWithProceedNext(id: string | string[], afterFn: (proceedNext: boolean) => void | Promise<void>, result?: string): Promise<void>;
18
21
  rejectPermissionWithProceedNext(id: string | string[], afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
19
22
  rejectPermissionAll(): Promise<void>;
20
23
  approveGlobalPermissionWithProceedNext(id: string, afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
@@ -35,7 +35,7 @@ class PermissionStore {
35
35
  return this.interactionStore.getAllData(background_1.INTERACTION_TYPE_PERMISSION);
36
36
  }
37
37
  get waitingPermissionMergedData() {
38
- const data = this.waitingPermissionDatas;
38
+ const data = this.waitingPermissionDatas.filter((data) => { var _a; return !((_a = data.data.options) === null || _a === void 0 ? void 0 : _a.isForEVM); });
39
39
  if (data.length === 0) {
40
40
  return;
41
41
  }
@@ -45,6 +45,35 @@ class PermissionStore {
45
45
  chainIds: first.data.chainIds,
46
46
  type: first.data.type,
47
47
  origins: first.data.origins,
48
+ options: first.data.options,
49
+ };
50
+ for (let i = 1; i < data.length; i++) {
51
+ const d = data[i];
52
+ if (d.data.type !== first.data.type) {
53
+ break;
54
+ }
55
+ if (d.data.origins.join(",") !== first.data.origins.join(",")) {
56
+ break;
57
+ }
58
+ res.ids.push(d.id);
59
+ res.chainIds.push(...d.data.chainIds);
60
+ }
61
+ // Remove duplicated chain ids.
62
+ res.chainIds = [...new Set(res.chainIds)];
63
+ return res;
64
+ }
65
+ get waitingPermissionMergedDataForEVM() {
66
+ const data = this.waitingPermissionDatas.filter((data) => { var _a; return !!((_a = data.data.options) === null || _a === void 0 ? void 0 : _a.isForEVM); });
67
+ if (data.length === 0) {
68
+ return;
69
+ }
70
+ const first = data[0];
71
+ const res = {
72
+ ids: [first.id],
73
+ chainIds: first.data.chainIds,
74
+ type: first.data.type,
75
+ origins: first.data.origins,
76
+ options: first.data.options,
48
77
  };
49
78
  for (let i = 1; i < data.length; i++) {
50
79
  const d = data[i];
@@ -69,9 +98,9 @@ class PermissionStore {
69
98
  get waitingGlobalPermissionDatas() {
70
99
  return this.interactionStore.getAllData(background_1.INTERACTION_TYPE_GLOBAL_PERMISSION);
71
100
  }
72
- approvePermissionWithProceedNext(id, afterFn) {
101
+ approvePermissionWithProceedNext(id, afterFn, result) {
73
102
  return __awaiter(this, void 0, void 0, function* () {
74
- yield this.interactionStore.approveWithProceedNextV2(id, {}, afterFn);
103
+ yield this.interactionStore.approveWithProceedNextV2(id, result, afterFn);
75
104
  yield this.permissionManagerStore.syncPermissionsFromBackground();
76
105
  });
77
106
  }
@@ -113,5 +142,8 @@ class PermissionStore {
113
142
  __decorate([
114
143
  mobx_1.computed
115
144
  ], PermissionStore.prototype, "waitingPermissionMergedData", null);
145
+ __decorate([
146
+ mobx_1.computed
147
+ ], PermissionStore.prototype, "waitingPermissionMergedDataForEVM", null);
116
148
  exports.PermissionStore = PermissionStore;
117
149
  //# sourceMappingURL=permission.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"permission.js","sourceRoot":"","sources":["../../../src/core/interaction/permission.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"permission.js","sourceRoot":"","sources":["../../../src/core/interaction/permission.ts"],"names":[],"mappings":"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"}
@@ -129,12 +129,14 @@ class TokensStore {
129
129
  var _a;
130
130
  const bech32Address = this.accountStore.getAccount(chainId).bech32Address;
131
131
  const chainInfo = this.chainStore.getChain(chainId);
132
- const associatedAccountAddress = bech32Address
132
+ const hasBech32Config = chainInfo.bech32Config != null;
133
+ const associatedAccountAddress = hasBech32Config && bech32Address
133
134
  ? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, chainInfo.bech32Config.bech32PrefixAccAddr).address).toString("hex")
134
- : "";
135
+ : undefined;
135
136
  const tokens = (_a = this.tokenMap.get(cosmos_1.ChainIdHelper.parse(chainId).identifier)) !== null && _a !== void 0 ? _a : [];
136
137
  return tokens.filter((token) => {
137
138
  if (token.associatedAccountAddress &&
139
+ associatedAccountAddress &&
138
140
  token.associatedAccountAddress !== associatedAccountAddress) {
139
141
  return false;
140
142
  }
@@ -148,8 +150,11 @@ class TokensStore {
148
150
  throw new Error("Account not initialized");
149
151
  }
150
152
  const chainInfo = this.chainStore.getChain(chainId);
151
- const isEvmChain = chainInfo.evm !== undefined;
152
- const associatedAccountAddress = buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, chainInfo.bech32Config.bech32PrefixAccAddr).address).toString("hex");
153
+ const isEvmChain = chainInfo.evm != null;
154
+ const hasBech32Config = chainInfo.bech32Config != null;
155
+ const associatedAccountAddress = hasBech32Config
156
+ ? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, chainInfo.bech32Config.bech32PrefixAccAddr).address).toString("hex")
157
+ : "";
153
158
  const msg = isEvmChain
154
159
  ? new background_1.AddERC20TokenMsg(chainId, currency)
155
160
  : new background_1.AddTokenMsg(chainId, associatedAccountAddress, currency);
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/core/tokens.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/core/tokens.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@keplr-wallet/stores-core",
3
- "version": "0.12.114-rc.0",
3
+ "version": "0.12.115-rc.0",
4
4
  "main": "build/index.js",
5
5
  "author": "chainapsis",
6
6
  "license": "Apache-2.0",
@@ -16,18 +16,18 @@
16
16
  "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
17
17
  },
18
18
  "dependencies": {
19
- "@keplr-wallet/background": "0.12.114-rc.0",
20
- "@keplr-wallet/common": "0.12.114-rc.0",
21
- "@keplr-wallet/cosmos": "0.12.114-rc.0",
22
- "@keplr-wallet/router": "0.12.114-rc.0",
23
- "@keplr-wallet/simple-fetch": "0.12.114-rc.0",
24
- "@keplr-wallet/stores": "0.12.114-rc.0",
25
- "@keplr-wallet/types": "0.12.114-rc.0",
19
+ "@keplr-wallet/background": "0.12.115-rc.0",
20
+ "@keplr-wallet/common": "0.12.115-rc.0",
21
+ "@keplr-wallet/cosmos": "0.12.115-rc.0",
22
+ "@keplr-wallet/router": "0.12.115-rc.0",
23
+ "@keplr-wallet/simple-fetch": "0.12.115-rc.0",
24
+ "@keplr-wallet/stores": "0.12.115-rc.0",
25
+ "@keplr-wallet/types": "0.12.115-rc.0",
26
26
  "buffer": "^6.0.3"
27
27
  },
28
28
  "peerDependencies": {
29
29
  "mobx": "^6",
30
30
  "mobx-utils": "^6"
31
31
  },
32
- "gitHead": "4cb7741d19ff12540f1dbce21735c51ccb3ad36c"
32
+ "gitHead": "7ca33dd8744560426aac4ffdf19dd63b255df91b"
33
33
  }
@@ -47,8 +47,11 @@ export class ChainSuggestStore {
47
47
  }
48
48
 
49
49
  getCommunityChainInfoUrl(chainId: string): string {
50
+ const isEvmOnlyChain = chainId.startsWith("eip155:");
50
51
  const chainIdHelper = ChainIdHelper.parse(chainId);
51
- return `${this.communityChainInfoRepoUrl}/blob/${this.communityChainInfoRepo.branchName}/cosmos/${chainIdHelper.identifier}.json`;
52
+ return `${this.communityChainInfoRepoUrl}/blob/${
53
+ this.communityChainInfoRepo.branchName
54
+ }/${isEvmOnlyChain ? "evm" : "cosmos"}/${chainIdHelper.identifier}.json`;
52
55
  }
53
56
 
54
57
  getCommunityChainInfo(chainId: string): {
@@ -77,16 +80,42 @@ export class ChainSuggestStore {
77
80
  });
78
81
 
79
82
  try {
83
+ const isEvmOnlyChain = chainId.startsWith("eip155:");
80
84
  const response = yield* toGenerator(
81
- simpleFetch<ChainInfo>(
85
+ simpleFetch<
86
+ (Omit<ChainInfo, "rest"> & { websocket: string }) | ChainInfo
87
+ >(
82
88
  this.communityChainInfoRepo.alternativeURL
83
- ? this.communityChainInfoRepo.alternativeURL.replace(
84
- "{chain_identifier}",
85
- chainIdentifier
86
- )
87
- : `https://raw.githubusercontent.com/${this.communityChainInfoRepo.organizationName}/${this.communityChainInfoRepo.repoName}/${this.communityChainInfoRepo.branchName}/cosmos/${chainIdentifier}.json`
89
+ ? this.communityChainInfoRepo.alternativeURL
90
+ .replace("{chain_identifier}", chainIdentifier)
91
+ .replace("/cosmos/", isEvmOnlyChain ? "/evm/" : "/cosmos/")
92
+ : `https://raw.githubusercontent.com/${
93
+ this.communityChainInfoRepo.organizationName
94
+ }/${this.communityChainInfoRepo.repoName}/${
95
+ this.communityChainInfoRepo.branchName
96
+ }/${isEvmOnlyChain ? "evm" : "cosmos"}/${chainIdentifier}.json`
88
97
  )
89
98
  );
99
+ const chainInfo: ChainInfo =
100
+ "rest" in response.data && !isEvmOnlyChain
101
+ ? response.data
102
+ : {
103
+ ...response.data,
104
+ rest: response.data.rpc,
105
+ evm: {
106
+ chainId: parseInt(
107
+ response.data.chainId.replace("eip155:", ""),
108
+ 10
109
+ ),
110
+ rpc: response.data.rpc,
111
+ ...("websocket" in response.data && {
112
+ websocket: response.data.websocket,
113
+ }),
114
+ },
115
+ features: ["eth-address-gen", "eth-key-sign"].concat(
116
+ response.data.features ?? []
117
+ ),
118
+ };
90
119
 
91
120
  if (
92
121
  ChainIdHelper.parse(response.data.chainId).identifier !==
@@ -101,7 +130,7 @@ export class ChainSuggestStore {
101
130
 
102
131
  this.communityChainInfo.set(chainIdentifier, {
103
132
  isLoading: false,
104
- chainInfo: response.data,
133
+ chainInfo,
105
134
  });
106
135
  } catch (e) {
107
136
  console.log(e);
@@ -37,7 +37,9 @@ export class PermissionStore {
37
37
  ids: string[];
38
38
  } & PermissionData)
39
39
  | undefined {
40
- const data = this.waitingPermissionDatas;
40
+ const data = this.waitingPermissionDatas.filter(
41
+ (data) => !data.data.options?.isForEVM
42
+ );
41
43
  if (data.length === 0) {
42
44
  return;
43
45
  }
@@ -51,6 +53,51 @@ export class PermissionStore {
51
53
  chainIds: first.data.chainIds,
52
54
  type: first.data.type,
53
55
  origins: first.data.origins,
56
+ options: first.data.options,
57
+ };
58
+
59
+ for (let i = 1; i < data.length; i++) {
60
+ const d = data[i];
61
+ if (d.data.type !== first.data.type) {
62
+ break;
63
+ }
64
+ if (d.data.origins.join(",") !== first.data.origins.join(",")) {
65
+ break;
66
+ }
67
+
68
+ res.ids.push(d.id);
69
+ res.chainIds.push(...d.data.chainIds);
70
+ }
71
+
72
+ // Remove duplicated chain ids.
73
+ res.chainIds = [...new Set(res.chainIds)];
74
+
75
+ return res;
76
+ }
77
+
78
+ @computed
79
+ get waitingPermissionMergedDataForEVM():
80
+ | ({
81
+ ids: string[];
82
+ } & PermissionData)
83
+ | undefined {
84
+ const data = this.waitingPermissionDatas.filter(
85
+ (data) => !!data.data.options?.isForEVM
86
+ );
87
+ if (data.length === 0) {
88
+ return;
89
+ }
90
+
91
+ const first = data[0];
92
+
93
+ const res: {
94
+ ids: string[];
95
+ } & PermissionData = {
96
+ ids: [first.id],
97
+ chainIds: first.data.chainIds,
98
+ type: first.data.type,
99
+ origins: first.data.origins,
100
+ options: first.data.options,
54
101
  };
55
102
 
56
103
  for (let i = 1; i < data.length; i++) {
@@ -86,9 +133,10 @@ export class PermissionStore {
86
133
 
87
134
  async approvePermissionWithProceedNext(
88
135
  id: string | string[],
89
- afterFn: (proceedNext: boolean) => void | Promise<void>
136
+ afterFn: (proceedNext: boolean) => void | Promise<void>,
137
+ result?: string
90
138
  ) {
91
- await this.interactionStore.approveWithProceedNextV2(id, {}, afterFn);
139
+ await this.interactionStore.approveWithProceedNextV2(id, result, afterFn);
92
140
 
93
141
  await this.permissionManagerStore.syncPermissionsFromBackground();
94
142
  }
@@ -162,14 +162,17 @@ export class TokensStore {
162
162
  getTokens(chainId: string): ReadonlyArray<TokenInfo> {
163
163
  const bech32Address = this.accountStore.getAccount(chainId).bech32Address;
164
164
  const chainInfo = this.chainStore.getChain(chainId);
165
- const associatedAccountAddress = bech32Address
166
- ? Buffer.from(
167
- Bech32Address.fromBech32(
168
- bech32Address,
169
- chainInfo.bech32Config.bech32PrefixAccAddr
170
- ).address
171
- ).toString("hex")
172
- : "";
165
+
166
+ const hasBech32Config = chainInfo.bech32Config != null;
167
+ const associatedAccountAddress =
168
+ hasBech32Config && bech32Address
169
+ ? Buffer.from(
170
+ Bech32Address.fromBech32(
171
+ bech32Address,
172
+ chainInfo.bech32Config.bech32PrefixAccAddr
173
+ ).address
174
+ ).toString("hex")
175
+ : undefined;
173
176
 
174
177
  const tokens =
175
178
  this.tokenMap.get(ChainIdHelper.parse(chainId).identifier) ?? [];
@@ -177,6 +180,7 @@ export class TokensStore {
177
180
  return tokens.filter((token) => {
178
181
  if (
179
182
  token.associatedAccountAddress &&
183
+ associatedAccountAddress &&
180
184
  token.associatedAccountAddress !== associatedAccountAddress
181
185
  ) {
182
186
  return false;
@@ -192,13 +196,16 @@ export class TokensStore {
192
196
  throw new Error("Account not initialized");
193
197
  }
194
198
  const chainInfo = this.chainStore.getChain(chainId);
195
- const isEvmChain = chainInfo.evm !== undefined;
196
- const associatedAccountAddress = Buffer.from(
197
- Bech32Address.fromBech32(
198
- bech32Address,
199
- chainInfo.bech32Config.bech32PrefixAccAddr
200
- ).address
201
- ).toString("hex");
199
+ const isEvmChain = chainInfo.evm != null;
200
+ const hasBech32Config = chainInfo.bech32Config != null;
201
+ const associatedAccountAddress = hasBech32Config
202
+ ? Buffer.from(
203
+ Bech32Address.fromBech32(
204
+ bech32Address,
205
+ chainInfo.bech32Config.bech32PrefixAccAddr
206
+ ).address
207
+ ).toString("hex")
208
+ : "";
202
209
 
203
210
  const msg = isEvmChain
204
211
  ? new AddERC20TokenMsg(chainId, currency)