@keplr-wallet/hooks 0.10.16 → 0.10.17-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.
- package/build/tx/fee.js +21 -0
- package/build/tx/fee.js.map +1 -1
- package/package.json +12 -12
- package/src/tx/fee.ts +27 -0
package/build/tx/fee.js
CHANGED
|
@@ -32,6 +32,9 @@ class FeeConfig extends chain_1.TxChainSetter {
|
|
|
32
32
|
this.additionAmountToNeedFee = true;
|
|
33
33
|
this._disableBalanceCheck = false;
|
|
34
34
|
this.getFeeTypePretty = mobx_utils_1.computedFn((feeType) => {
|
|
35
|
+
if (this._manualFee) {
|
|
36
|
+
throw new Error("Can't calculate fee from fee type. Because fee config uses the manual fee now");
|
|
37
|
+
}
|
|
35
38
|
if (!this.feeCurrency) {
|
|
36
39
|
throw new Error("Fee currency not set");
|
|
37
40
|
}
|
|
@@ -67,6 +70,18 @@ class FeeConfig extends chain_1.TxChainSetter {
|
|
|
67
70
|
return this.chainInfo.feeCurrencies;
|
|
68
71
|
}
|
|
69
72
|
get feeCurrency() {
|
|
73
|
+
if (this._manualFee) {
|
|
74
|
+
for (const currency of this.chainInfo.feeCurrencies) {
|
|
75
|
+
if (currency.coinMinimalDenom === this._manualFee.denom) {
|
|
76
|
+
return currency;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return {
|
|
80
|
+
coinMinimalDenom: this._manualFee.denom,
|
|
81
|
+
coinDenom: this._manualFee.denom,
|
|
82
|
+
coinDecimals: 0,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
70
85
|
return this.chainInfo.feeCurrencies[0];
|
|
71
86
|
}
|
|
72
87
|
toStdFee() {
|
|
@@ -107,6 +122,9 @@ class FeeConfig extends chain_1.TxChainSetter {
|
|
|
107
122
|
return undefined;
|
|
108
123
|
}
|
|
109
124
|
getFeeTypePrimitive(feeType) {
|
|
125
|
+
if (this._manualFee) {
|
|
126
|
+
throw new Error("Can't calculate fee from fee type. Because fee config uses the manual fee now");
|
|
127
|
+
}
|
|
110
128
|
if (!this.feeCurrency) {
|
|
111
129
|
throw new Error("Fee currency not set");
|
|
112
130
|
}
|
|
@@ -197,6 +215,9 @@ __decorate([
|
|
|
197
215
|
__decorate([
|
|
198
216
|
mobx_1.action
|
|
199
217
|
], FeeConfig.prototype, "setManualFee", null);
|
|
218
|
+
__decorate([
|
|
219
|
+
mobx_1.computed
|
|
220
|
+
], FeeConfig.prototype, "feeCurrency", null);
|
|
200
221
|
__decorate([
|
|
201
222
|
mobx_1.computed
|
|
202
223
|
], FeeConfig.prototype, "fee", null);
|
package/build/tx/fee.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fee.js","sourceRoot":"","sources":["../../src/tx/fee.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAMiB;AACjB,mCAAwC;AAMxC,+BAAoE;AACpE,6CAA0E;AAE1E,2CAAwC;AAExC,iCAAiC;AACjC,qCAAmE;AAEnE,MAAa,SAAU,SAAQ,qBAAa;IAuB1C,YACE,WAAwB,EACL,YAA2B,EAC9C,cAAsB,EACtB,MAAc,EACK,YAA2B,EAC3B,SAAqB,EACxC,0BAAmC,IAAI;QAEvC,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAPhB,iBAAY,GAAZ,YAAY,CAAe;QAG3B,iBAAY,GAAZ,YAAY,CAAe;QAC3B,cAAS,GAAT,SAAS,CAAY;QAxBhC,aAAQ,GAAwB,SAAS,CAAC;QAG1C,eAAU,GAA8B,SAAS,CAAC;QAE5D;;;;;;WAMG;QAEO,4BAAuB,GAAY,IAAI,CAAC;QAGxC,yBAAoB,GAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"fee.js","sourceRoot":"","sources":["../../src/tx/fee.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@keplr-wallet/hooks",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.17-rc.2",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"author": "chainapsis",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -22,16 +22,16 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@cosmjs/launchpad": "^0.24.0-alpha.25",
|
|
24
24
|
"@ethersproject/address": "^5.6.0",
|
|
25
|
-
"@keplr-wallet/background": "0.10.
|
|
26
|
-
"@keplr-wallet/common": "0.10.
|
|
27
|
-
"@keplr-wallet/cosmos": "0.10.
|
|
28
|
-
"@keplr-wallet/crypto": "0.10.
|
|
29
|
-
"@keplr-wallet/ens": "0.10.
|
|
30
|
-
"@keplr-wallet/popup": "0.10.
|
|
31
|
-
"@keplr-wallet/proto-types": "0.10.
|
|
32
|
-
"@keplr-wallet/stores": "0.10.
|
|
33
|
-
"@keplr-wallet/types": "0.10.
|
|
34
|
-
"@keplr-wallet/unit": "0.10.
|
|
25
|
+
"@keplr-wallet/background": "0.10.17-rc.2",
|
|
26
|
+
"@keplr-wallet/common": "0.10.17-rc.2",
|
|
27
|
+
"@keplr-wallet/cosmos": "0.10.17-rc.2",
|
|
28
|
+
"@keplr-wallet/crypto": "0.10.17-rc.2",
|
|
29
|
+
"@keplr-wallet/ens": "0.10.17-rc.2",
|
|
30
|
+
"@keplr-wallet/popup": "0.10.17-rc.2",
|
|
31
|
+
"@keplr-wallet/proto-types": "0.10.17-rc.2",
|
|
32
|
+
"@keplr-wallet/stores": "0.10.17-rc.2",
|
|
33
|
+
"@keplr-wallet/types": "0.10.17-rc.2",
|
|
34
|
+
"@keplr-wallet/unit": "0.10.17-rc.2",
|
|
35
35
|
"axios": "^0.21.4",
|
|
36
36
|
"long": "^4.0.0",
|
|
37
37
|
"mobx": "^6.1.7",
|
|
@@ -40,5 +40,5 @@
|
|
|
40
40
|
"react-router": "^5.1.2",
|
|
41
41
|
"utility-types": "^3.10.0"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "cbd093ececa180c9daa3350cb7cff589623bc865"
|
|
44
44
|
}
|
package/src/tx/fee.ts
CHANGED
|
@@ -93,7 +93,22 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
|
|
|
93
93
|
return this.chainInfo.feeCurrencies;
|
|
94
94
|
}
|
|
95
95
|
|
|
96
|
+
@computed
|
|
96
97
|
get feeCurrency(): Currency | undefined {
|
|
98
|
+
if (this._manualFee) {
|
|
99
|
+
for (const currency of this.chainInfo.feeCurrencies) {
|
|
100
|
+
if (currency.coinMinimalDenom === this._manualFee.denom) {
|
|
101
|
+
return currency;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
return {
|
|
106
|
+
coinMinimalDenom: this._manualFee.denom,
|
|
107
|
+
coinDenom: this._manualFee.denom,
|
|
108
|
+
coinDecimals: 0,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
|
|
97
112
|
return this.chainInfo.feeCurrencies[0];
|
|
98
113
|
}
|
|
99
114
|
|
|
@@ -145,6 +160,12 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
|
|
|
145
160
|
}
|
|
146
161
|
|
|
147
162
|
protected getFeeTypePrimitive(feeType: FeeType): CoinPrimitive {
|
|
163
|
+
if (this._manualFee) {
|
|
164
|
+
throw new Error(
|
|
165
|
+
"Can't calculate fee from fee type. Because fee config uses the manual fee now"
|
|
166
|
+
);
|
|
167
|
+
}
|
|
168
|
+
|
|
148
169
|
if (!this.feeCurrency) {
|
|
149
170
|
throw new Error("Fee currency not set");
|
|
150
171
|
}
|
|
@@ -163,6 +184,12 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
|
|
|
163
184
|
}
|
|
164
185
|
|
|
165
186
|
readonly getFeeTypePretty = computedFn((feeType: FeeType) => {
|
|
187
|
+
if (this._manualFee) {
|
|
188
|
+
throw new Error(
|
|
189
|
+
"Can't calculate fee from fee type. Because fee config uses the manual fee now"
|
|
190
|
+
);
|
|
191
|
+
}
|
|
192
|
+
|
|
166
193
|
if (!this.feeCurrency) {
|
|
167
194
|
throw new Error("Fee currency not set");
|
|
168
195
|
}
|