carbon-js-sdk 0.3.38 → 0.3.39
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/lib/clients/CarbonQueryClient.js +2 -2
- package/lib/clients/ETHClient.js +15 -15
- package/lib/clients/HydrogenClient.js +1 -1
- package/lib/clients/NEOClient.js +7 -7
- package/lib/clients/ZILClient.js +17 -17
- package/lib/codec/cosmos/gov/v1beta1/query.js +2 -2
- package/lib/codec/cosmos/gov/v1beta1/tx.js +2 -2
- package/lib/codec/cosmos/tx/v1beta1/tx.js +2 -2
- package/lib/constant/generic.js +1 -1
- package/lib/constant/ibc.js +5 -0
- package/lib/modules/cdp.js +43 -43
- package/lib/modules/gov.js +14 -14
- package/lib/modules/liquiditypool.js +1 -1
- package/lib/provider/account/EthLedgerAccount/EthLedgerAccount.js +1 -1
- package/lib/provider/account/NeoLedgerAccount/N3Ledger/ErrorCode.js +1 -1
- package/lib/provider/account/NeoLedgerAccount/N3Ledger/main.js +8 -8
- package/lib/provider/account/NeoLedgerAccount/NeoLedgerAccount.js +3 -3
- package/lib/provider/account/NeoLedgerAccount/NeonLedger.js +1 -1
- package/lib/provider/amino/types/admin.js +30 -30
- package/lib/provider/amino/types/bank.js +1 -1
- package/lib/provider/amino/types/broker.js +1 -1
- package/lib/provider/amino/types/cdp.js +22 -22
- package/lib/provider/amino/types/coin.js +2 -2
- package/lib/provider/amino/types/gov.js +4 -4
- package/lib/provider/amino/types/ibc.js +1 -1
- package/lib/provider/amino/types/leverage.js +1 -1
- package/lib/provider/amino/types/liquidityPool.js +7 -7
- package/lib/provider/amino/types/market.js +1 -1
- package/lib/provider/amino/types/oracle.js +1 -1
- package/lib/provider/amino/types/order.js +4 -4
- package/lib/provider/amino/types/position.js +1 -1
- package/lib/provider/amino/types/profile.js +1 -1
- package/lib/provider/amino/types/staking.js +4 -4
- package/lib/provider/amino/types/subaccount.js +3 -3
- package/lib/provider/amino/utils.js +11 -11
- package/lib/provider/ledger/ledger.js +2 -2
- package/lib/provider/metamask/MetaMask.js +1 -1
- package/lib/provider/o3/O3Wallet.js +2 -2
- package/lib/util/address.js +13 -13
- package/lib/util/api.js +4 -4
- package/lib/util/fetch.js +1 -1
- package/lib/util/generic.js +3 -3
- package/lib/util/number.js +5 -5
- package/lib/wallet/CarbonSigner.js +2 -2
- package/lib/wallet/CarbonSigningClient.js +8 -8
- package/lib/wallet/CarbonWallet.js +6 -6
- package/lib/websocket/connector.js +3 -3
- package/package.json +1 -1
package/lib/modules/gov.js
CHANGED
|
@@ -48,7 +48,7 @@ class GovModule extends base_1.default {
|
|
|
48
48
|
const value = tx_1.MsgDeposit.fromPartial({
|
|
49
49
|
proposalId: new long_1.default(params.proposalId),
|
|
50
50
|
depositor: wallet.bech32Address,
|
|
51
|
-
amount:
|
|
51
|
+
amount: amino_1.coins(params.amount, params.denom),
|
|
52
52
|
});
|
|
53
53
|
return yield wallet.sendTx({
|
|
54
54
|
typeUrl: util_1.CarbonTx.Types.MsgDeposit,
|
|
@@ -78,21 +78,21 @@ class GovModule extends base_1.default {
|
|
|
78
78
|
const createTokenMsg = {
|
|
79
79
|
title: title,
|
|
80
80
|
description: description,
|
|
81
|
-
msg:
|
|
81
|
+
msg: admin_1.transfromCreateTokenParams(msg, wallet.bech32Address),
|
|
82
82
|
};
|
|
83
83
|
return proposal_1.CreateTokenProposal.encode(createTokenMsg).finish();
|
|
84
84
|
case "SetMsgGasCostProposal":
|
|
85
85
|
const setMsgGasCostMsg = {
|
|
86
86
|
title: title,
|
|
87
87
|
description: description,
|
|
88
|
-
msg:
|
|
88
|
+
msg: admin_1.transfromSetMsgGasCostParams(msg),
|
|
89
89
|
};
|
|
90
90
|
return proposal_2.SetMsgGasCostProposal.encode(setMsgGasCostMsg).finish();
|
|
91
91
|
case "SetMinGasPriceProposal":
|
|
92
92
|
const setMinGasPriceMsg = {
|
|
93
93
|
title: title,
|
|
94
94
|
description: description,
|
|
95
|
-
msg:
|
|
95
|
+
msg: admin_1.transfromSetMinGasPriceParams(msg),
|
|
96
96
|
};
|
|
97
97
|
return proposal_2.SetMinGasPriceProposal.encode(setMinGasPriceMsg).finish();
|
|
98
98
|
case "RemoveMsgGasCostProposal":
|
|
@@ -113,63 +113,63 @@ class GovModule extends base_1.default {
|
|
|
113
113
|
const linkPoolMsg = {
|
|
114
114
|
title: title,
|
|
115
115
|
description: description,
|
|
116
|
-
msg:
|
|
116
|
+
msg: admin_1.transfromLinkPoolParams(msg),
|
|
117
117
|
};
|
|
118
118
|
return proposal_3.LinkPoolProposal.encode(linkPoolMsg).finish();
|
|
119
119
|
case "UnlinkPoolProposal":
|
|
120
120
|
const unlinkPoolMsg = {
|
|
121
121
|
title: title,
|
|
122
122
|
description: description,
|
|
123
|
-
msg:
|
|
123
|
+
msg: admin_1.transfromUnlinkPoolParams(msg),
|
|
124
124
|
};
|
|
125
125
|
return proposal_3.UnlinkPoolProposal.encode(unlinkPoolMsg).finish();
|
|
126
126
|
case "SetRewardCurveProposal":
|
|
127
127
|
const setRewardCurveMsg = {
|
|
128
128
|
title: title,
|
|
129
129
|
description: description,
|
|
130
|
-
msg:
|
|
130
|
+
msg: admin_1.transfromSetRewardCurveParams(msg),
|
|
131
131
|
};
|
|
132
132
|
return proposal_3.SetRewardCurveProposal.encode(setRewardCurveMsg).finish();
|
|
133
133
|
case "SetCommitmentCurveProposal":
|
|
134
134
|
const setCommitmentCurveMsg = {
|
|
135
135
|
title: title,
|
|
136
136
|
description: description,
|
|
137
|
-
msg:
|
|
137
|
+
msg: admin_1.transfromSetCommitmentCurveParams(msg),
|
|
138
138
|
};
|
|
139
139
|
return proposal_3.SetCommitmentCurveProposal.encode(setCommitmentCurveMsg).finish();
|
|
140
140
|
case "SetRewardsWeightsProposal":
|
|
141
141
|
const setRewardsWeightsMsg = {
|
|
142
142
|
title: title,
|
|
143
143
|
description: description,
|
|
144
|
-
msg:
|
|
144
|
+
msg: admin_1.transfromSetRewardsWeightsParams(msg),
|
|
145
145
|
};
|
|
146
146
|
return proposal_3.SetRewardsWeightsProposal.encode(setRewardsWeightsMsg).finish();
|
|
147
147
|
case "UpdatePoolProposal":
|
|
148
148
|
const updatePoolProposalMsg = {
|
|
149
149
|
title: title,
|
|
150
150
|
description: description,
|
|
151
|
-
msg:
|
|
151
|
+
msg: admin_1.transfromUpdatePoolParams(msg),
|
|
152
152
|
};
|
|
153
153
|
return proposal_3.UpdatePoolProposal.encode(updatePoolProposalMsg).finish();
|
|
154
154
|
case "UpdateMarketProposal":
|
|
155
155
|
const updateMarketProposalMsg = {
|
|
156
156
|
title: title,
|
|
157
157
|
description: description,
|
|
158
|
-
msg:
|
|
158
|
+
msg: market_1.transfromUpdateMarketParams(msg),
|
|
159
159
|
};
|
|
160
160
|
return proposal_4.UpdateMarketProposal.encode(updateMarketProposalMsg).finish();
|
|
161
161
|
case "CreateOracleProposal":
|
|
162
162
|
const createOracleProposalMsg = {
|
|
163
163
|
title: title,
|
|
164
164
|
description: description,
|
|
165
|
-
msg:
|
|
165
|
+
msg: admin_1.transfromCreateOracleParams(msg, wallet.bech32Address),
|
|
166
166
|
};
|
|
167
167
|
return proposal_5.CreateOracleProposal.encode(createOracleProposalMsg).finish();
|
|
168
168
|
case "SettlementPriceProposal":
|
|
169
169
|
const settlementPriceProposalMsg = {
|
|
170
170
|
title: title,
|
|
171
171
|
description: description,
|
|
172
|
-
msg:
|
|
172
|
+
msg: admin_1.transformSetSettlementPriceParams(msg),
|
|
173
173
|
};
|
|
174
174
|
return proposal_6.SettlementPriceProposal.encode(settlementPriceProposalMsg).finish();
|
|
175
175
|
case "ParameterChangeProposal":
|
|
@@ -191,7 +191,7 @@ class GovModule extends base_1.default {
|
|
|
191
191
|
title: title,
|
|
192
192
|
description: description,
|
|
193
193
|
recipient: proposalMsg.recipient,
|
|
194
|
-
amount:
|
|
194
|
+
amount: admin_1.transformCommunityPoolSpendAmount(proposalMsg.amount),
|
|
195
195
|
};
|
|
196
196
|
return distribution_1.CommunityPoolSpendProposal.encode(communityPoolSpendProposalMsg).finish();
|
|
197
197
|
case "CancelSoftwareUpgradeProposal":
|
|
@@ -147,7 +147,7 @@ class LiquidityPoolModule extends base_1.default {
|
|
|
147
147
|
const SECONDS_IN_A_WEEK = new bignumber_js_1.BigNumber(604800);
|
|
148
148
|
const mintDataResponse = yield this.sdkProvider.query.inflation.MintData({});
|
|
149
149
|
const mintData = mintDataResponse.mintData;
|
|
150
|
-
const nowTime = new bignumber_js_1.BigNumber(
|
|
150
|
+
const nowTime = new bignumber_js_1.BigNumber(dayjs_1.default().unix());
|
|
151
151
|
const firstBlockTime = (_a = mintData === null || mintData === void 0 ? void 0 : mintData.firstBlockTime.toNumber()) !== null && _a !== void 0 ? _a : 0;
|
|
152
152
|
const difference = nowTime.minus(firstBlockTime);
|
|
153
153
|
const currentWeek = difference.div(SECONDS_IN_A_WEEK).dp(0, bignumber_js_1.BigNumber.ROUND_DOWN);
|
|
@@ -87,7 +87,7 @@ class EthLedgerAccount {
|
|
|
87
87
|
static tryConnect() {
|
|
88
88
|
return __awaiter(this, void 0, void 0, function* () {
|
|
89
89
|
try {
|
|
90
|
-
const transport = yield
|
|
90
|
+
const transport = yield ledger_1.getLedgerTransport();
|
|
91
91
|
// get public key to assert that NEO app is open
|
|
92
92
|
const ethApp = new hw_app_eth_1.default(transport);
|
|
93
93
|
const bipString = EthLedgerAccount.getETHBIP44String();
|
|
@@ -39,7 +39,7 @@ exports.looksLikeTransportStatusError = looksLikeTransportStatusError;
|
|
|
39
39
|
* @returns error with modified message if found.
|
|
40
40
|
*/
|
|
41
41
|
function evalTransportError(err) {
|
|
42
|
-
const transportErr =
|
|
42
|
+
const transportErr = lodash_1.cloneDeep(err);
|
|
43
43
|
switch (transportErr.statusCode) {
|
|
44
44
|
case StatusWord.APP_CLOSED:
|
|
45
45
|
transportErr.message = "Your NEO app is closed! Please login.";
|
|
@@ -49,8 +49,8 @@ function getAppName(ledger) {
|
|
|
49
49
|
return version.substring(0, version.length - 2); // take of status word
|
|
50
50
|
}
|
|
51
51
|
catch (e) {
|
|
52
|
-
if (
|
|
53
|
-
throw
|
|
52
|
+
if (ErrorCode_1.looksLikeTransportStatusError(e)) {
|
|
53
|
+
throw ErrorCode_1.evalTransportError(e);
|
|
54
54
|
}
|
|
55
55
|
throw e;
|
|
56
56
|
}
|
|
@@ -72,8 +72,8 @@ function getAppVersion(ledger) {
|
|
|
72
72
|
return major.toString() + "." + minor.toString() + "." + patch.toString();
|
|
73
73
|
}
|
|
74
74
|
catch (e) {
|
|
75
|
-
if (
|
|
76
|
-
throw
|
|
75
|
+
if (ErrorCode_1.looksLikeTransportStatusError(e)) {
|
|
76
|
+
throw ErrorCode_1.evalTransportError(e);
|
|
77
77
|
}
|
|
78
78
|
throw e;
|
|
79
79
|
}
|
|
@@ -109,8 +109,8 @@ function getPublicKey(ledger, bip44String, showAddressOnDevice = false) {
|
|
|
109
109
|
return response.toString("hex").substring(0, 130);
|
|
110
110
|
}
|
|
111
111
|
catch (e) {
|
|
112
|
-
if (
|
|
113
|
-
throw
|
|
112
|
+
if (ErrorCode_1.looksLikeTransportStatusError(e)) {
|
|
113
|
+
throw ErrorCode_1.evalTransportError(e);
|
|
114
114
|
}
|
|
115
115
|
throw e;
|
|
116
116
|
}
|
|
@@ -142,8 +142,8 @@ function getSignature(ledger, payload, bip44String, network) {
|
|
|
142
142
|
return DerToHexSignature(response.toString("hex"));
|
|
143
143
|
}
|
|
144
144
|
catch (e) {
|
|
145
|
-
if (
|
|
146
|
-
throw
|
|
145
|
+
if (ErrorCode_1.looksLikeTransportStatusError(e)) {
|
|
146
|
+
throw ErrorCode_1.evalTransportError(e);
|
|
147
147
|
}
|
|
148
148
|
throw e;
|
|
149
149
|
}
|
|
@@ -111,8 +111,8 @@ class NeoLedgerAccount {
|
|
|
111
111
|
*/
|
|
112
112
|
static tryConnect(version = "neo") {
|
|
113
113
|
return __awaiter(this, void 0, void 0, function* () {
|
|
114
|
-
const bipString =
|
|
115
|
-
const ledger = yield
|
|
114
|
+
const bipString = NeonLedger_1.getNEOBIP44String();
|
|
115
|
+
const ledger = yield ledger_1.getLedgerTransport();
|
|
116
116
|
// get public key to assert that NEO app is open
|
|
117
117
|
const ledgerAdapter = adapterForVersion(version);
|
|
118
118
|
const publicKey = yield ledgerAdapter.getPublicKey(ledger, bipString);
|
|
@@ -129,7 +129,7 @@ class NeoLedgerAccount {
|
|
|
129
129
|
}
|
|
130
130
|
sign(msg, magic = neon_core_next_1.CONST.MAGIC_NUMBER.MainNet) {
|
|
131
131
|
return __awaiter(this, void 0, void 0, function* () {
|
|
132
|
-
const bipString =
|
|
132
|
+
const bipString = NeonLedger_1.getNEOBIP44String();
|
|
133
133
|
const ledger = this.useLedger();
|
|
134
134
|
const ledgerAdapter = adapterForVersion(this.version);
|
|
135
135
|
console.log("getsignature", ledgerAdapter, ledger, msg, bipString, magic);
|
|
@@ -40,7 +40,7 @@ function evalTransportError(err) {
|
|
|
40
40
|
transportErr.message = "Transaction signing denied";
|
|
41
41
|
break;
|
|
42
42
|
default:
|
|
43
|
-
transportErr.message =
|
|
43
|
+
transportErr.message = hw_transport_1.getAltStatusMessage(transportErr.statusCode);
|
|
44
44
|
}
|
|
45
45
|
return err;
|
|
46
46
|
}
|
|
@@ -233,35 +233,35 @@ const MsgSetSmallLiquidationSize = {
|
|
|
233
233
|
},
|
|
234
234
|
};
|
|
235
235
|
const AdminAmino = {
|
|
236
|
-
[CarbonTx.Types.MsgCreateOracle]:
|
|
237
|
-
[CarbonTx.Types.MsgBindToken]:
|
|
238
|
-
[CarbonTx.Types.MsgCreateToken]:
|
|
239
|
-
[CarbonTx.Types.MsgLinkToken]:
|
|
240
|
-
[CarbonTx.Types.MsgSyncToken]:
|
|
241
|
-
[CarbonTx.Types.MsgCreateMarket]:
|
|
242
|
-
[CarbonTx.Types.MsgLinkPool]:
|
|
243
|
-
[CarbonTx.Types.MsgUnlinkPool]:
|
|
244
|
-
[CarbonTx.Types.MsgUpdatePool]:
|
|
245
|
-
[CarbonTx.Types.MsgSetRewardsWeights]:
|
|
246
|
-
[CarbonTx.Types.MsgSetRewardCurve]:
|
|
247
|
-
[CarbonTx.Types.MsgSetCommitmentCurve]:
|
|
248
|
-
[CarbonTx.Types.MsgSetTradingFlag]:
|
|
249
|
-
[CarbonTx.Types.MsgSetGasCost]:
|
|
250
|
-
[CarbonTx.Types.MsgSetMinGasPrice]:
|
|
251
|
-
[CarbonTx.Types.MsgRemoveGasCost]:
|
|
252
|
-
[CarbonTx.Types.MsgRemoveMinGasPrice]:
|
|
253
|
-
[CarbonTx.Types.MsgCreateValidator]:
|
|
254
|
-
[CarbonTx.Types.MsgEditValidator]:
|
|
255
|
-
[CarbonTx.Types.MsgAddRateStrategy]:
|
|
256
|
-
[CarbonTx.Types.MsgUpdateRateStrategy]:
|
|
257
|
-
[CarbonTx.Types.MsgRemoveRateStrategy]:
|
|
258
|
-
[CarbonTx.Types.MsgAddAsset]:
|
|
259
|
-
[CarbonTx.Types.MsgUpdateAsset]:
|
|
260
|
-
[CarbonTx.Types.MsgSetLiquidationFee]:
|
|
261
|
-
[CarbonTx.Types.MsgSetInterestFee]:
|
|
262
|
-
[CarbonTx.Types.MsgSetStablecoinInterestRate]:
|
|
263
|
-
[CarbonTx.Types.MsgSetCompleteLiquidationThreshold]:
|
|
264
|
-
[CarbonTx.Types.MsgSetMinimumCloseFactor]:
|
|
265
|
-
[CarbonTx.Types.MsgSetSmallLiquidationSize]:
|
|
236
|
+
[CarbonTx.Types.MsgCreateOracle]: utils_1.generateAminoType(MsgCreateOracle),
|
|
237
|
+
[CarbonTx.Types.MsgBindToken]: utils_1.generateAminoType(MsgBindToken),
|
|
238
|
+
[CarbonTx.Types.MsgCreateToken]: utils_1.generateAminoType(MsgCreateToken),
|
|
239
|
+
[CarbonTx.Types.MsgLinkToken]: utils_1.generateAminoType(MsgLinkToken),
|
|
240
|
+
[CarbonTx.Types.MsgSyncToken]: utils_1.generateAminoType(MsgSyncToken),
|
|
241
|
+
[CarbonTx.Types.MsgCreateMarket]: utils_1.generateAminoType(MsgCreateMarket),
|
|
242
|
+
[CarbonTx.Types.MsgLinkPool]: utils_1.generateAminoType(MsgLinkPool),
|
|
243
|
+
[CarbonTx.Types.MsgUnlinkPool]: utils_1.generateAminoType(MsgUnlinkPool),
|
|
244
|
+
[CarbonTx.Types.MsgUpdatePool]: utils_1.generateAminoType(MsgUpdatePool),
|
|
245
|
+
[CarbonTx.Types.MsgSetRewardsWeights]: utils_1.generateAminoType(MsgSetRewardsWeights),
|
|
246
|
+
[CarbonTx.Types.MsgSetRewardCurve]: utils_1.generateAminoType(MsgSetRewardCurve),
|
|
247
|
+
[CarbonTx.Types.MsgSetCommitmentCurve]: utils_1.generateAminoType(MsgSetCommitmentCurve),
|
|
248
|
+
[CarbonTx.Types.MsgSetTradingFlag]: utils_1.generateAminoType(MsgSetTradingFlag),
|
|
249
|
+
[CarbonTx.Types.MsgSetGasCost]: utils_1.generateAminoType(MsgSetGasCost),
|
|
250
|
+
[CarbonTx.Types.MsgSetMinGasPrice]: utils_1.generateAminoType(MsgSetMinGasPrice),
|
|
251
|
+
[CarbonTx.Types.MsgRemoveGasCost]: utils_1.generateAminoType(MsgRemoveGasCost),
|
|
252
|
+
[CarbonTx.Types.MsgRemoveMinGasPrice]: utils_1.generateAminoType(MsgRemoveMinGasPrice),
|
|
253
|
+
[CarbonTx.Types.MsgCreateValidator]: utils_1.generateAminoType(MsgCreateValidator),
|
|
254
|
+
[CarbonTx.Types.MsgEditValidator]: utils_1.generateAminoType(MsgEditValidator),
|
|
255
|
+
[CarbonTx.Types.MsgAddRateStrategy]: utils_1.generateAminoType(MsgAddRateStrategy),
|
|
256
|
+
[CarbonTx.Types.MsgUpdateRateStrategy]: utils_1.generateAminoType(MsgUpdateRateStrategy),
|
|
257
|
+
[CarbonTx.Types.MsgRemoveRateStrategy]: utils_1.generateAminoType(MsgRemoveRateStrategy),
|
|
258
|
+
[CarbonTx.Types.MsgAddAsset]: utils_1.generateAminoType(MsgAddAsset),
|
|
259
|
+
[CarbonTx.Types.MsgUpdateAsset]: utils_1.generateAminoType(MsgUpdateAsset),
|
|
260
|
+
[CarbonTx.Types.MsgSetLiquidationFee]: utils_1.generateAminoType(MsgSetLiquidationFee),
|
|
261
|
+
[CarbonTx.Types.MsgSetInterestFee]: utils_1.generateAminoType(MsgSetInterestFee),
|
|
262
|
+
[CarbonTx.Types.MsgSetStablecoinInterestRate]: utils_1.generateAminoType(MsgSetStablecoinInterestRate),
|
|
263
|
+
[CarbonTx.Types.MsgSetCompleteLiquidationThreshold]: utils_1.generateAminoType(MsgSetCompleteLiquidationThreshold),
|
|
264
|
+
[CarbonTx.Types.MsgSetMinimumCloseFactor]: utils_1.generateAminoType(MsgSetMinimumCloseFactor),
|
|
265
|
+
[CarbonTx.Types.MsgSetSmallLiquidationSize]: utils_1.generateAminoType(MsgSetSmallLiquidationSize),
|
|
266
266
|
};
|
|
267
267
|
exports.default = AdminAmino;
|
|
@@ -29,6 +29,6 @@ const MsgInitiateLiquidation = {
|
|
|
29
29
|
valueMap: {},
|
|
30
30
|
};
|
|
31
31
|
const BrokerAmino = {
|
|
32
|
-
[CarbonTx.Types.MsgInitiateLiquidation]:
|
|
32
|
+
[CarbonTx.Types.MsgInitiateLiquidation]: utils_1.generateAminoType(MsgInitiateLiquidation),
|
|
33
33
|
};
|
|
34
34
|
exports.default = BrokerAmino;
|
|
@@ -145,27 +145,27 @@ const MsgSetCdpPaused = {
|
|
|
145
145
|
valueMap: {},
|
|
146
146
|
};
|
|
147
147
|
const CdpAmino = {
|
|
148
|
-
[CarbonTx.Types.MsgSupplyAsset]:
|
|
149
|
-
[CarbonTx.Types.MsgWithdrawAsset]:
|
|
150
|
-
[CarbonTx.Types.MsgLockCollateral]:
|
|
151
|
-
[CarbonTx.Types.MsgUnlockCollateral]:
|
|
152
|
-
[CarbonTx.Types.MsgBorrowAsset]:
|
|
153
|
-
[CarbonTx.Types.MsgRepayAsset]:
|
|
154
|
-
[CarbonTx.Types.MsgSupplyAssetAndLockCollateral]:
|
|
155
|
-
[CarbonTx.Types.MsgUnlockCollateralAndWithdrawAsset]:
|
|
156
|
-
[CarbonTx.Types.MsgLiquidateCollateral]:
|
|
157
|
-
[CarbonTx.Types.MsgRepayAssetWithCdpTokens]:
|
|
158
|
-
[CarbonTx.Types.MsgRepayAssetWithCollateral]:
|
|
159
|
-
[CarbonTx.Types.MsgMintStablecoin]:
|
|
160
|
-
[CarbonTx.Types.MsgReturnStablecoin]:
|
|
161
|
-
[CarbonTx.Types.MsgLiquidateCollateralWithCdpTokens]:
|
|
162
|
-
[CarbonTx.Types.MsgLiquidateCollateralWithCollateral]:
|
|
163
|
-
[CarbonTx.Types.MsgLiquidateCollateralWithStablecoin]:
|
|
164
|
-
[CarbonTx.Types.MsgCreateRewardScheme]:
|
|
165
|
-
[CarbonTx.Types.MsgUpdateRewardScheme]:
|
|
166
|
-
[CarbonTx.Types.MsgClaimRewards]:
|
|
167
|
-
[CarbonTx.Types.MsgSetStablecoinMintCap]:
|
|
168
|
-
[CarbonTx.Types.MsgSetStalePriceGracePeriod]:
|
|
169
|
-
[CarbonTx.Types.MsgSetCdpPaused]:
|
|
148
|
+
[CarbonTx.Types.MsgSupplyAsset]: utils_1.generateAminoType(MsgSupplyAsset),
|
|
149
|
+
[CarbonTx.Types.MsgWithdrawAsset]: utils_1.generateAminoType(MsgWithdrawAsset),
|
|
150
|
+
[CarbonTx.Types.MsgLockCollateral]: utils_1.generateAminoType(MsgLockCollateral),
|
|
151
|
+
[CarbonTx.Types.MsgUnlockCollateral]: utils_1.generateAminoType(MsgUnlockCollateral),
|
|
152
|
+
[CarbonTx.Types.MsgBorrowAsset]: utils_1.generateAminoType(MsgBorrowAsset),
|
|
153
|
+
[CarbonTx.Types.MsgRepayAsset]: utils_1.generateAminoType(MsgRepayAsset),
|
|
154
|
+
[CarbonTx.Types.MsgSupplyAssetAndLockCollateral]: utils_1.generateAminoType(MsgSupplyAssetAndLockCollateral),
|
|
155
|
+
[CarbonTx.Types.MsgUnlockCollateralAndWithdrawAsset]: utils_1.generateAminoType(MsgUnlockCollateralAndWithdrawAsset),
|
|
156
|
+
[CarbonTx.Types.MsgLiquidateCollateral]: utils_1.generateAminoType(MsgLiquidateCollateral),
|
|
157
|
+
[CarbonTx.Types.MsgRepayAssetWithCdpTokens]: utils_1.generateAminoType(MsgRepayAssetWithCdpTokens),
|
|
158
|
+
[CarbonTx.Types.MsgRepayAssetWithCollateral]: utils_1.generateAminoType(MsgRepayAssetWithCollateral),
|
|
159
|
+
[CarbonTx.Types.MsgMintStablecoin]: utils_1.generateAminoType(MsgMintStablecoin),
|
|
160
|
+
[CarbonTx.Types.MsgReturnStablecoin]: utils_1.generateAminoType(MsgReturnStablecoin),
|
|
161
|
+
[CarbonTx.Types.MsgLiquidateCollateralWithCdpTokens]: utils_1.generateAminoType(MsgLiquidateCollateralWithCdpTokens),
|
|
162
|
+
[CarbonTx.Types.MsgLiquidateCollateralWithCollateral]: utils_1.generateAminoType(MsgLiquidateCollateralWithCollateral),
|
|
163
|
+
[CarbonTx.Types.MsgLiquidateCollateralWithStablecoin]: utils_1.generateAminoType(MsgLiquidateCollateralWithStablecoin),
|
|
164
|
+
[CarbonTx.Types.MsgCreateRewardScheme]: utils_1.generateAminoType(MsgCreateRewardScheme),
|
|
165
|
+
[CarbonTx.Types.MsgUpdateRewardScheme]: utils_1.generateAminoType(MsgUpdateRewardScheme),
|
|
166
|
+
[CarbonTx.Types.MsgClaimRewards]: utils_1.generateAminoType(MsgClaimRewards),
|
|
167
|
+
[CarbonTx.Types.MsgSetStablecoinMintCap]: utils_1.generateAminoType(MsgSetStablecoinMintCap),
|
|
168
|
+
[CarbonTx.Types.MsgSetStalePriceGracePeriod]: utils_1.generateAminoType(MsgSetStalePriceGracePeriod),
|
|
169
|
+
[CarbonTx.Types.MsgSetCdpPaused]: utils_1.generateAminoType(MsgSetCdpPaused),
|
|
170
170
|
};
|
|
171
171
|
exports.default = CdpAmino;
|
|
@@ -34,7 +34,7 @@ const MsgMintToken = {
|
|
|
34
34
|
valueMap: {},
|
|
35
35
|
};
|
|
36
36
|
const CoinAmino = {
|
|
37
|
-
[CarbonTx.Types.MsgWithdraw]:
|
|
38
|
-
[CarbonTx.Types.MsgMintToken]:
|
|
37
|
+
[CarbonTx.Types.MsgWithdraw]: utils_1.generateAminoType(MsgWithdraw),
|
|
38
|
+
[CarbonTx.Types.MsgMintToken]: utils_1.generateAminoType(MsgMintToken),
|
|
39
39
|
};
|
|
40
40
|
exports.default = CoinAmino;
|
|
@@ -171,7 +171,7 @@ const SettlementPrice = {
|
|
|
171
171
|
},
|
|
172
172
|
};
|
|
173
173
|
const preProcessAmino = (value, valueMap) => {
|
|
174
|
-
return
|
|
174
|
+
return utils_1.mapEachIndiv(value, valueMap, false);
|
|
175
175
|
};
|
|
176
176
|
const checkDecodeProposal = (content, amino) => {
|
|
177
177
|
const decodedValue = util_1.GovUtils.decodeContent(content);
|
|
@@ -402,8 +402,8 @@ const proposalAminoProcess = {
|
|
|
402
402
|
},
|
|
403
403
|
};
|
|
404
404
|
const GovAmino = {
|
|
405
|
-
[CarbonTx.Types.MsgSubmitProposal]:
|
|
406
|
-
[CarbonTx.Types.MsgDeposit]:
|
|
407
|
-
[CarbonTx.Types.MsgVote]:
|
|
405
|
+
[CarbonTx.Types.MsgSubmitProposal]: utils_1.generateAminoType(SubmitProposalMsg, proposalAminoProcess),
|
|
406
|
+
[CarbonTx.Types.MsgDeposit]: utils_1.generateAminoType(MsgDeposit),
|
|
407
|
+
[CarbonTx.Types.MsgVote]: utils_1.generateAminoType(MsgVote),
|
|
408
408
|
};
|
|
409
409
|
exports.default = GovAmino;
|
|
@@ -55,6 +55,6 @@ const pruneTransferProcess = {
|
|
|
55
55
|
},
|
|
56
56
|
};
|
|
57
57
|
const IbcAmino = {
|
|
58
|
-
[CarbonTx.Types.MsgTransfer]:
|
|
58
|
+
[CarbonTx.Types.MsgTransfer]: utils_1.generateAminoType(MsgTransfer, pruneTransferProcess),
|
|
59
59
|
};
|
|
60
60
|
exports.default = IbcAmino;
|
|
@@ -31,6 +31,6 @@ const MsgSetLeverage = {
|
|
|
31
31
|
},
|
|
32
32
|
};
|
|
33
33
|
const LeverageAmino = {
|
|
34
|
-
[CarbonTx.Types.MsgSetLeverage]:
|
|
34
|
+
[CarbonTx.Types.MsgSetLeverage]: utils_1.generateAminoType(MsgSetLeverage),
|
|
35
35
|
};
|
|
36
36
|
exports.default = LeverageAmino;
|
|
@@ -95,12 +95,12 @@ const commitTokensProcess = {
|
|
|
95
95
|
},
|
|
96
96
|
};
|
|
97
97
|
const LiquidityPoolAmino = {
|
|
98
|
-
[CarbonTx.Types.MsgCreatePool]:
|
|
99
|
-
[CarbonTx.Types.MsgCreatePoolWithLiquidity]:
|
|
100
|
-
[CarbonTx.Types.MsgAddLiquidity]:
|
|
101
|
-
[CarbonTx.Types.MsgRemoveLiquidity]:
|
|
102
|
-
[CarbonTx.Types.MsgStakePoolToken]:
|
|
103
|
-
[CarbonTx.Types.MsgUnstakePoolToken]:
|
|
104
|
-
[CarbonTx.Types.MsgClaimPoolRewards]:
|
|
98
|
+
[CarbonTx.Types.MsgCreatePool]: utils_1.generateAminoType(MsgCreatePool),
|
|
99
|
+
[CarbonTx.Types.MsgCreatePoolWithLiquidity]: utils_1.generateAminoType(MsgCreatePoolWithLiquidity),
|
|
100
|
+
[CarbonTx.Types.MsgAddLiquidity]: utils_1.generateAminoType(MsgAddLiquidity),
|
|
101
|
+
[CarbonTx.Types.MsgRemoveLiquidity]: utils_1.generateAminoType(MsgRemoveLiquidity),
|
|
102
|
+
[CarbonTx.Types.MsgStakePoolToken]: utils_1.generateAminoType(MsgStakePoolToken, commitTokensProcess),
|
|
103
|
+
[CarbonTx.Types.MsgUnstakePoolToken]: utils_1.generateAminoType(MsgUnstakePoolToken),
|
|
104
|
+
[CarbonTx.Types.MsgClaimPoolRewards]: utils_1.generateAminoType(MsgClaimPoolRewards),
|
|
105
105
|
};
|
|
106
106
|
exports.default = LiquidityPoolAmino;
|
|
@@ -41,6 +41,6 @@ const MsgUpdateMarket = {
|
|
|
41
41
|
},
|
|
42
42
|
};
|
|
43
43
|
const MarketAmino = {
|
|
44
|
-
[CarbonTx.Types.MsgUpdateMarket]:
|
|
44
|
+
[CarbonTx.Types.MsgUpdateMarket]: utils_1.generateAminoType(MsgUpdateMarket),
|
|
45
45
|
};
|
|
46
46
|
exports.default = MarketAmino;
|
|
@@ -76,9 +76,9 @@ const createOrderProcess = {
|
|
|
76
76
|
},
|
|
77
77
|
};
|
|
78
78
|
const OrderAmino = {
|
|
79
|
-
[CarbonTx.Types.MsgCreateOrder]:
|
|
80
|
-
[CarbonTx.Types.MsgCancelOrder]:
|
|
81
|
-
[CarbonTx.Types.MsgEditOrder]:
|
|
82
|
-
[CarbonTx.Types.MsgCancelAll]:
|
|
79
|
+
[CarbonTx.Types.MsgCreateOrder]: utils_1.generateAminoType(MsgCreateOrder, createOrderProcess),
|
|
80
|
+
[CarbonTx.Types.MsgCancelOrder]: utils_1.generateAminoType(MsgCancelOrder),
|
|
81
|
+
[CarbonTx.Types.MsgEditOrder]: utils_1.generateAminoType(MsgEditOrder),
|
|
82
|
+
[CarbonTx.Types.MsgCancelAll]: utils_1.generateAminoType(MsgCancelAll),
|
|
83
83
|
};
|
|
84
84
|
exports.default = OrderAmino;
|
|
@@ -29,6 +29,6 @@ const MsgSetMargin = {
|
|
|
29
29
|
valueMap: {},
|
|
30
30
|
};
|
|
31
31
|
const PositionAmino = {
|
|
32
|
-
[CarbonTx.Types.MsgSetMargin]:
|
|
32
|
+
[CarbonTx.Types.MsgSetMargin]: utils_1.generateAminoType(MsgSetMargin),
|
|
33
33
|
};
|
|
34
34
|
exports.default = PositionAmino;
|
|
@@ -45,6 +45,6 @@ const updateProfileProcess = {
|
|
|
45
45
|
},
|
|
46
46
|
};
|
|
47
47
|
const ProfileAmino = {
|
|
48
|
-
[CarbonTx.Types.MsgUpdateProfile]:
|
|
48
|
+
[CarbonTx.Types.MsgUpdateProfile]: utils_1.generateAminoType(MsgUpdateProfile, updateProfileProcess),
|
|
49
49
|
};
|
|
50
50
|
exports.default = ProfileAmino;
|
|
@@ -44,9 +44,9 @@ const MsgWithdrawDelegatorReward = {
|
|
|
44
44
|
valueMap: {},
|
|
45
45
|
};
|
|
46
46
|
const StakingAmino = {
|
|
47
|
-
[CarbonTx.Types.MsgDelegate]:
|
|
48
|
-
[CarbonTx.Types.MsgUndelegate]:
|
|
49
|
-
[CarbonTx.Types.MsgBeginRedelegate]:
|
|
50
|
-
[CarbonTx.Types.MsgWithdrawDelegatorReward]:
|
|
47
|
+
[CarbonTx.Types.MsgDelegate]: utils_1.generateAminoType(MsgDelegate),
|
|
48
|
+
[CarbonTx.Types.MsgUndelegate]: utils_1.generateAminoType(MsgUndelegate),
|
|
49
|
+
[CarbonTx.Types.MsgBeginRedelegate]: utils_1.generateAminoType(MsgBeginRedelegate),
|
|
50
|
+
[CarbonTx.Types.MsgWithdrawDelegatorReward]: utils_1.generateAminoType(MsgWithdrawDelegatorReward),
|
|
51
51
|
};
|
|
52
52
|
exports.default = StakingAmino;
|
|
@@ -39,8 +39,8 @@ const MsgRemoveSubAccount = {
|
|
|
39
39
|
valueMap: {},
|
|
40
40
|
};
|
|
41
41
|
const SubAccountAmino = {
|
|
42
|
-
[CarbonTx.Types.MsgCreateSubAccount]:
|
|
43
|
-
[CarbonTx.Types.MsgActivateSubAccount]:
|
|
44
|
-
[CarbonTx.Types.MsgRemoveSubAccount]:
|
|
42
|
+
[CarbonTx.Types.MsgCreateSubAccount]: utils_1.generateAminoType(MsgCreateSubAccount),
|
|
43
|
+
[CarbonTx.Types.MsgActivateSubAccount]: utils_1.generateAminoType(MsgActivateSubAccount),
|
|
44
|
+
[CarbonTx.Types.MsgRemoveSubAccount]: utils_1.generateAminoType(MsgRemoveSubAccount),
|
|
45
45
|
};
|
|
46
46
|
exports.default = SubAccountAmino;
|
|
@@ -44,23 +44,23 @@ const mapEachIndiv = (mapItem, valueKey, toAmino = false) => {
|
|
|
44
44
|
if (typeof keyMap !== "object") {
|
|
45
45
|
// Check if this is a Long/BigNumber/Buffer/Date/Duration obj or a non-object/array
|
|
46
46
|
if (typeCheck(mapItem[key]) || typeof mapItem[key] !== "object") {
|
|
47
|
-
directMap[altKey] =
|
|
47
|
+
directMap[altKey] = exports.paramConverter(mapItem[key], keyMap, toAmino);
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
if (mapItem[key].length && typeof mapItem[key] === "object") {
|
|
52
52
|
// If value is an array of objects, iterate through objects and call mapToObj function
|
|
53
53
|
directMap[altKey] = mapItem[key].map((newMap) => {
|
|
54
|
-
return
|
|
54
|
+
return exports.mapEachIndiv(newMap, valueKey, toAmino);
|
|
55
55
|
});
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
else {
|
|
59
59
|
if (util_1.TypeUtils.isDurationType(mapItem[key])) {
|
|
60
|
-
directMap[altKey] =
|
|
60
|
+
directMap[altKey] = exports.paramConverter(mapItem[key], keyMap, toAmino);
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
|
-
directMap[altKey] =
|
|
63
|
+
directMap[altKey] = exports.mapEachIndiv(mapItem[key], keyMap, toAmino);
|
|
64
64
|
}
|
|
65
65
|
});
|
|
66
66
|
return directMap;
|
|
@@ -137,18 +137,18 @@ const generateAminoType = (amino, aminoProcess = {}) => {
|
|
|
137
137
|
if (!newInput[key])
|
|
138
138
|
return;
|
|
139
139
|
if (typeCheck(newInput[key])) {
|
|
140
|
-
aminoObj[snakeKey] =
|
|
140
|
+
aminoObj[snakeKey] = exports.paramConverter(newInput[key], newAminoMap[key], true);
|
|
141
141
|
return;
|
|
142
142
|
}
|
|
143
143
|
if (typeof newInput[key] !== "object" && typeof newAminoMap[key] !== "object") {
|
|
144
|
-
aminoObj[snakeKey] =
|
|
144
|
+
aminoObj[snakeKey] = exports.paramConverter(newInput[key], newAminoMap[key], true);
|
|
145
145
|
}
|
|
146
146
|
else {
|
|
147
147
|
if (((_a = newInput[key]) === null || _a === void 0 ? void 0 : _a.length) && typeof newInput[key] === "object") {
|
|
148
|
-
aminoObj[snakeKey] = newInput[key].map((newItem) =>
|
|
148
|
+
aminoObj[snakeKey] = newInput[key].map((newItem) => exports.mapEachIndiv(newItem, newAminoMap[key], true));
|
|
149
149
|
return;
|
|
150
150
|
}
|
|
151
|
-
aminoObj[snakeKey] =
|
|
151
|
+
aminoObj[snakeKey] = exports.mapEachIndiv(newInput[key], newAminoMap[key], true);
|
|
152
152
|
}
|
|
153
153
|
});
|
|
154
154
|
return aminoObj;
|
|
@@ -162,14 +162,14 @@ const generateAminoType = (amino, aminoProcess = {}) => {
|
|
|
162
162
|
var _a;
|
|
163
163
|
const camelKey = util_1.TypeUtils.snakeToCamel(key);
|
|
164
164
|
if (typeof newInput[key] !== "object" && typeof newAminoMap[key] !== "object") {
|
|
165
|
-
aminoObj[camelKey] =
|
|
165
|
+
aminoObj[camelKey] = exports.paramConverter(newInput[key], newAminoMap[camelKey], false);
|
|
166
166
|
}
|
|
167
167
|
else {
|
|
168
168
|
if (((_a = newInput[key]) === null || _a === void 0 ? void 0 : _a.length) && typeof newInput[key] === "object") {
|
|
169
|
-
aminoObj[camelKey] = newInput[key].map((newItem) =>
|
|
169
|
+
aminoObj[camelKey] = newInput[key].map((newItem) => exports.mapEachIndiv(newItem, newAminoMap[camelKey], false));
|
|
170
170
|
return;
|
|
171
171
|
}
|
|
172
|
-
aminoObj[camelKey] =
|
|
172
|
+
aminoObj[camelKey] = exports.mapEachIndiv(newInput[key], newAminoMap[camelKey], false);
|
|
173
173
|
}
|
|
174
174
|
});
|
|
175
175
|
return aminoObj;
|
|
@@ -147,7 +147,7 @@ class CosmosLedger {
|
|
|
147
147
|
const response = yield this.cosmosApp.getVersion();
|
|
148
148
|
this.checkLedgerErrors(response);
|
|
149
149
|
const { major, minor, patch, test_mode } = response;
|
|
150
|
-
|
|
150
|
+
exports.checkAppMode(this.testModeAllowed, test_mode);
|
|
151
151
|
const version = versionString({ major, minor, patch });
|
|
152
152
|
return version;
|
|
153
153
|
});
|
|
@@ -238,7 +238,7 @@ class CosmosLedger {
|
|
|
238
238
|
const response = yield this.cosmosApp.sign(this.hdPath, signMessage);
|
|
239
239
|
this.checkLedgerErrors(response);
|
|
240
240
|
// we have to parse the signature from Ledger as it's in DER format
|
|
241
|
-
const parsedSignature =
|
|
241
|
+
const parsedSignature = secp256k1_1.signatureImport(response.signature);
|
|
242
242
|
return parsedSignature;
|
|
243
243
|
});
|
|
244
244
|
}
|
|
@@ -210,7 +210,7 @@ class MetaMask {
|
|
|
210
210
|
return __awaiter(this, void 0, void 0, function* () {
|
|
211
211
|
const chainIdHex = (yield ((_a = this.getAPI()) === null || _a === void 0 ? void 0 : _a.request({ method: "eth_chainId" })));
|
|
212
212
|
const chainId = !!chainIdHex ? parseInt(chainIdHex, 16) : undefined;
|
|
213
|
-
const blockchain =
|
|
213
|
+
const blockchain = blockchain_1.getBlockchainFromChain(chainId);
|
|
214
214
|
this.blockchain = blockchain;
|
|
215
215
|
return { chainId, blockchain };
|
|
216
216
|
});
|
|
@@ -60,9 +60,9 @@ class O3Wallet {
|
|
|
60
60
|
return {
|
|
61
61
|
type: index_1.CarbonSignerTypes.BrowserInjected,
|
|
62
62
|
signAmino: (_, doc) => __awaiter(this, void 0, void 0, function* () {
|
|
63
|
-
const msg = JSON.stringify(
|
|
63
|
+
const msg = JSON.stringify(generic_1.sortObject(doc));
|
|
64
64
|
const signBytes = yield dapi.signMessage(msg);
|
|
65
|
-
const signature =
|
|
65
|
+
const signature = amino_1.encodeSecp256k1Signature(pubKey, signBytes);
|
|
66
66
|
return {
|
|
67
67
|
signed: doc,
|
|
68
68
|
signature,
|