@keplr-wallet/stores-eth 0.12.98 → 0.12.99-rc.2

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.
@@ -121,7 +121,6 @@ class EthereumAccountBase {
121
121
  switch (denomHelper.type) {
122
122
  case "erc20":
123
123
  return {
124
- type: transactions_1.TransactionTypes.eip1559,
125
124
  chainId: evmInfo.chainId,
126
125
  nonce: Number(transactionCountResponse.data.result),
127
126
  gasLimit: (0, bytes_1.hexValue)(gasLimit),
@@ -136,7 +135,6 @@ class EthereumAccountBase {
136
135
  };
137
136
  default:
138
137
  return {
139
- type: transactions_1.TransactionTypes.eip1559,
140
138
  chainId: evmInfo.chainId,
141
139
  nonce: Number(transactionCountResponse.data.result),
142
140
  gasLimit: (0, bytes_1.hexValue)(gasLimit),
@@ -162,6 +160,10 @@ class EthereumAccountBase {
162
160
  const keplr = (yield this.getKeplr());
163
161
  const signEthereum = keplr.signEthereum.bind(keplr);
164
162
  const signature = yield signEthereum(this.chainId, sender, JSON.stringify(unsignedTx), types_1.EthSignType.TRANSACTION);
163
+ const isEIP1559 = !!unsignedTx.maxFeePerGas || !!unsignedTx.maxPriorityFeePerGas;
164
+ if (isEIP1559) {
165
+ unsignedTx.type = transactions_1.TransactionTypes.eip1559;
166
+ }
165
167
  const signedTx = Buffer.from((0, transactions_1.serialize)(unsignedTx, signature).replace("0x", ""), "hex");
166
168
  const sendEthereumTx = keplr.sendEthereumTx.bind(keplr);
167
169
  const txHash = yield sendEthereumTx(this.chainId, signedTx);
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/account/base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/account/base.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { ChainGetter, HasMapStore, ObservableJsonRPCQuery, QuerySharedContext }
2
2
  export declare class ObservableEvmChainJsonRpcQuery<T = unknown, E = unknown> extends ObservableJsonRPCQuery<T, E> {
3
3
  protected readonly _chainId: string;
4
4
  protected readonly chainGetter: ChainGetter;
5
- constructor(sharedContext: QuerySharedContext, chainId: string, chainGetter: ChainGetter, method: string, params: any[]);
5
+ constructor(sharedContext: QuerySharedContext, chainId: string, chainGetter: ChainGetter, method: string, params: unknown[] | Record<string, unknown>);
6
6
  get chainId(): string;
7
7
  }
8
8
  export declare class ObservableEvmChainJsonRpcQueryMap<T = unknown, E = unknown> extends HasMapStore<ObservableEvmChainJsonRpcQuery<T, E>> {
@@ -1 +1 @@
1
- {"version":3,"file":"evm-chain-json-rpc.js","sourceRoot":"","sources":["../../src/queries/evm-chain-json-rpc.ts"],"names":[],"mappings":";;;AAAA,iDAK8B;AAE9B,MAAa,8BAGX,SAAQ,+BAA4B;IAKpC,YACE,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,MAAc,EACd,MAAa;;QAEb,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEhD,KAAK,CAAC,aAAa,EAAE,MAAA,MAAA,SAAS,CAAC,GAAG,0CAAE,GAAG,mCAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAEnE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AA1BD,wEA0BC;AAED,MAAa,iCAGX,SAAQ,oBAAiD;IACzD,YACqB,aAAiC,EACjC,OAAe,EACf,WAAwB,EAC3C,OAA8D;QAE9D,KAAK,CAAC,OAAO,CAAC,CAAC;QALI,kBAAa,GAAb,aAAa,CAAoB;QACjC,YAAO,GAAP,OAAO,CAAQ;QACf,gBAAW,GAAX,WAAW,CAAa;IAI7C,CAAC;CACF;AAZD,8EAYC"}
1
+ {"version":3,"file":"evm-chain-json-rpc.js","sourceRoot":"","sources":["../../src/queries/evm-chain-json-rpc.ts"],"names":[],"mappings":";;;AAAA,iDAK8B;AAE9B,MAAa,8BAGX,SAAQ,+BAA4B;IAKpC,YACE,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,MAAc,EACd,MAA2C;;QAE3C,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEhD,KAAK,CAAC,aAAa,EAAE,MAAA,MAAA,SAAS,CAAC,GAAG,0CAAE,GAAG,mCAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAEnE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AA1BD,wEA0BC;AAED,MAAa,iCAGX,SAAQ,oBAAiD;IACzD,YACqB,aAAiC,EACjC,OAAe,EACf,WAAwB,EAC3C,OAA8D;QAE9D,KAAK,CAAC,OAAO,CAAC,CAAC;QALI,kBAAa,GAAb,aAAa,CAAoB;QACjC,YAAO,GAAP,OAAO,CAAQ;QACf,gBAAW,GAAX,WAAW,CAAa;IAI7C,CAAC;CACF;AAZD,8EAYC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@keplr-wallet/stores-eth",
3
- "version": "0.12.98",
3
+ "version": "0.12.99-rc.2",
4
4
  "main": "build/index.js",
5
5
  "author": "chainapsis",
6
6
  "license": "Apache-2.0",
@@ -21,11 +21,11 @@
21
21
  "@ethersproject/bytes": "^5.7.0",
22
22
  "@ethersproject/transactions": "^5.7.0",
23
23
  "@ethersproject/units": "^5.7.0",
24
- "@keplr-wallet/common": "0.12.98",
25
- "@keplr-wallet/simple-fetch": "0.12.98",
26
- "@keplr-wallet/stores": "0.12.98",
27
- "@keplr-wallet/types": "0.12.98",
28
- "@keplr-wallet/unit": "0.12.98",
24
+ "@keplr-wallet/common": "0.12.99-rc.2",
25
+ "@keplr-wallet/simple-fetch": "0.12.99-rc.2",
26
+ "@keplr-wallet/stores": "0.12.99-rc.2",
27
+ "@keplr-wallet/types": "0.12.99-rc.2",
28
+ "@keplr-wallet/unit": "0.12.99-rc.2",
29
29
  "big-integer": "^1.6.48",
30
30
  "utility-types": "^3.10.0"
31
31
  },
@@ -33,5 +33,5 @@
33
33
  "mobx": "^6",
34
34
  "mobx-utils": "^6"
35
35
  },
36
- "gitHead": "4d0c7d79c1cc1ada576e709294b23a684217cd38"
36
+ "gitHead": "d7328f6e09b99001e457408f90dc83b62e15b6f0"
37
37
  }
@@ -12,9 +12,9 @@ import { erc20ContractInterface } from "../constants";
12
12
  import { hexValue } from "@ethersproject/bytes";
13
13
  import { parseUnits } from "@ethersproject/units";
14
14
  import {
15
+ TransactionTypes,
15
16
  UnsignedTransaction,
16
17
  serialize,
17
- TransactionTypes,
18
18
  } from "@ethersproject/transactions";
19
19
  import { getAddress as getEthAddress } from "@ethersproject/address";
20
20
  import { action, makeObservable, observable } from "mobx";
@@ -162,7 +162,6 @@ export class EthereumAccountBase {
162
162
  switch (denomHelper.type) {
163
163
  case "erc20":
164
164
  return {
165
- type: TransactionTypes.eip1559,
166
165
  chainId: evmInfo.chainId,
167
166
  nonce: Number(transactionCountResponse.data.result),
168
167
  gasLimit: hexValue(gasLimit),
@@ -177,7 +176,6 @@ export class EthereumAccountBase {
177
176
  };
178
177
  default:
179
178
  return {
180
- type: TransactionTypes.eip1559,
181
179
  chainId: evmInfo.chainId,
182
180
  nonce: Number(transactionCountResponse.data.result),
183
181
  gasLimit: hexValue(gasLimit),
@@ -218,6 +216,12 @@ export class EthereumAccountBase {
218
216
  EthSignType.TRANSACTION
219
217
  );
220
218
 
219
+ const isEIP1559 =
220
+ !!unsignedTx.maxFeePerGas || !!unsignedTx.maxPriorityFeePerGas;
221
+ if (isEIP1559) {
222
+ unsignedTx.type = TransactionTypes.eip1559;
223
+ }
224
+
221
225
  const signedTx = Buffer.from(
222
226
  serialize(unsignedTx, signature).replace("0x", ""),
223
227
  "hex"
@@ -18,7 +18,7 @@ export class ObservableEvmChainJsonRpcQuery<
18
18
  chainId: string,
19
19
  chainGetter: ChainGetter,
20
20
  method: string,
21
- params: any[]
21
+ params: unknown[] | Record<string, unknown>
22
22
  ) {
23
23
  const chainInfo = chainGetter.getChain(chainId);
24
24