carbon-js-sdk 0.2.16 → 0.2.18
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 +6 -6
- package/lib/clients/ZILClient.js +16 -16
- package/lib/codec/cdp/asset_params.d.ts +1 -1
- package/lib/codec/cdp/asset_params.js +11 -10
- package/lib/codec/cdp/params.d.ts +8 -0
- package/lib/codec/cdp/params.js +52 -9
- package/lib/codec/cdp/reward_scheme.d.ts +1 -13
- package/lib/codec/cdp/reward_scheme.js +15 -92
- 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/codec/pricing/legacy.d.ts +22 -0
- package/lib/codec/pricing/legacy.js +93 -0
- package/lib/constant/generic.js +1 -1
- 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 +20 -20
- 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 +4 -4
- 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/keplr/KeplrAccount.js +5 -0
- package/lib/provider/keplr/KeplrStore.js +1 -1
- 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/util/tx.d.ts +1 -0
- package/lib/wallet/CarbonSigner.d.ts +5 -2
- package/lib/wallet/CarbonSigner.js +15 -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
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.RewardDebt = exports.
|
|
6
|
+
exports.RewardDebt = exports.UpdateRewardSchemeParams = exports.CreateRewardSchemeParams = exports.RewardScheme = exports.protobufPackage = void 0;
|
|
7
7
|
/* eslint-disable */
|
|
8
8
|
const long_1 = __importDefault(require("long"));
|
|
9
9
|
const minimal_1 = __importDefault(require("protobufjs/minimal"));
|
|
@@ -429,96 +429,6 @@ exports.UpdateRewardSchemeParams = {
|
|
|
429
429
|
return message;
|
|
430
430
|
},
|
|
431
431
|
};
|
|
432
|
-
const baseAddReservesParams = {
|
|
433
|
-
creator: "",
|
|
434
|
-
rewardSchemeId: long_1.default.UZERO,
|
|
435
|
-
amount: "",
|
|
436
|
-
denom: "",
|
|
437
|
-
};
|
|
438
|
-
exports.AddReservesParams = {
|
|
439
|
-
encode(message, writer = minimal_1.default.Writer.create()) {
|
|
440
|
-
if (message.creator !== "") {
|
|
441
|
-
writer.uint32(10).string(message.creator);
|
|
442
|
-
}
|
|
443
|
-
if (!message.rewardSchemeId.isZero()) {
|
|
444
|
-
writer.uint32(16).uint64(message.rewardSchemeId);
|
|
445
|
-
}
|
|
446
|
-
if (message.amount !== "") {
|
|
447
|
-
writer.uint32(26).string(message.amount);
|
|
448
|
-
}
|
|
449
|
-
if (message.denom !== "") {
|
|
450
|
-
writer.uint32(34).string(message.denom);
|
|
451
|
-
}
|
|
452
|
-
return writer;
|
|
453
|
-
},
|
|
454
|
-
decode(input, length) {
|
|
455
|
-
const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
|
|
456
|
-
let end = length === undefined ? reader.len : reader.pos + length;
|
|
457
|
-
const message = Object.assign({}, baseAddReservesParams);
|
|
458
|
-
while (reader.pos < end) {
|
|
459
|
-
const tag = reader.uint32();
|
|
460
|
-
switch (tag >>> 3) {
|
|
461
|
-
case 1:
|
|
462
|
-
message.creator = reader.string();
|
|
463
|
-
break;
|
|
464
|
-
case 2:
|
|
465
|
-
message.rewardSchemeId = reader.uint64();
|
|
466
|
-
break;
|
|
467
|
-
case 3:
|
|
468
|
-
message.amount = reader.string();
|
|
469
|
-
break;
|
|
470
|
-
case 4:
|
|
471
|
-
message.denom = reader.string();
|
|
472
|
-
break;
|
|
473
|
-
default:
|
|
474
|
-
reader.skipType(tag & 7);
|
|
475
|
-
break;
|
|
476
|
-
}
|
|
477
|
-
}
|
|
478
|
-
return message;
|
|
479
|
-
},
|
|
480
|
-
fromJSON(object) {
|
|
481
|
-
const message = Object.assign({}, baseAddReservesParams);
|
|
482
|
-
message.creator =
|
|
483
|
-
object.creator !== undefined && object.creator !== null
|
|
484
|
-
? String(object.creator)
|
|
485
|
-
: "";
|
|
486
|
-
message.rewardSchemeId =
|
|
487
|
-
object.rewardSchemeId !== undefined && object.rewardSchemeId !== null
|
|
488
|
-
? long_1.default.fromString(object.rewardSchemeId)
|
|
489
|
-
: long_1.default.UZERO;
|
|
490
|
-
message.amount =
|
|
491
|
-
object.amount !== undefined && object.amount !== null
|
|
492
|
-
? String(object.amount)
|
|
493
|
-
: "";
|
|
494
|
-
message.denom =
|
|
495
|
-
object.denom !== undefined && object.denom !== null
|
|
496
|
-
? String(object.denom)
|
|
497
|
-
: "";
|
|
498
|
-
return message;
|
|
499
|
-
},
|
|
500
|
-
toJSON(message) {
|
|
501
|
-
const obj = {};
|
|
502
|
-
message.creator !== undefined && (obj.creator = message.creator);
|
|
503
|
-
message.rewardSchemeId !== undefined &&
|
|
504
|
-
(obj.rewardSchemeId = (message.rewardSchemeId || long_1.default.UZERO).toString());
|
|
505
|
-
message.amount !== undefined && (obj.amount = message.amount);
|
|
506
|
-
message.denom !== undefined && (obj.denom = message.denom);
|
|
507
|
-
return obj;
|
|
508
|
-
},
|
|
509
|
-
fromPartial(object) {
|
|
510
|
-
var _a, _b, _c;
|
|
511
|
-
const message = Object.assign({}, baseAddReservesParams);
|
|
512
|
-
message.creator = (_a = object.creator) !== null && _a !== void 0 ? _a : "";
|
|
513
|
-
message.rewardSchemeId =
|
|
514
|
-
object.rewardSchemeId !== undefined && object.rewardSchemeId !== null
|
|
515
|
-
? long_1.default.fromValue(object.rewardSchemeId)
|
|
516
|
-
: long_1.default.UZERO;
|
|
517
|
-
message.amount = (_b = object.amount) !== null && _b !== void 0 ? _b : "";
|
|
518
|
-
message.denom = (_c = object.denom) !== null && _c !== void 0 ? _c : "";
|
|
519
|
-
return message;
|
|
520
|
-
},
|
|
521
|
-
};
|
|
522
432
|
const baseRewardDebt = {
|
|
523
433
|
userAddress: "",
|
|
524
434
|
rewardSchemeId: long_1.default.UZERO,
|
|
@@ -535,6 +445,9 @@ exports.RewardDebt = {
|
|
|
535
445
|
if (message.rewardDebt !== "") {
|
|
536
446
|
writer.uint32(26).string(message.rewardDebt);
|
|
537
447
|
}
|
|
448
|
+
if (message.lastUpdatedAt !== undefined) {
|
|
449
|
+
timestamp_1.Timestamp.encode(toTimestamp(message.lastUpdatedAt), writer.uint32(34).fork()).ldelim();
|
|
450
|
+
}
|
|
538
451
|
return writer;
|
|
539
452
|
},
|
|
540
453
|
decode(input, length) {
|
|
@@ -553,6 +466,9 @@ exports.RewardDebt = {
|
|
|
553
466
|
case 3:
|
|
554
467
|
message.rewardDebt = reader.string();
|
|
555
468
|
break;
|
|
469
|
+
case 4:
|
|
470
|
+
message.lastUpdatedAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
|
|
471
|
+
break;
|
|
556
472
|
default:
|
|
557
473
|
reader.skipType(tag & 7);
|
|
558
474
|
break;
|
|
@@ -574,6 +490,10 @@ exports.RewardDebt = {
|
|
|
574
490
|
object.rewardDebt !== undefined && object.rewardDebt !== null
|
|
575
491
|
? String(object.rewardDebt)
|
|
576
492
|
: "";
|
|
493
|
+
message.lastUpdatedAt =
|
|
494
|
+
object.lastUpdatedAt !== undefined && object.lastUpdatedAt !== null
|
|
495
|
+
? fromJsonTimestamp(object.lastUpdatedAt)
|
|
496
|
+
: undefined;
|
|
577
497
|
return message;
|
|
578
498
|
},
|
|
579
499
|
toJSON(message) {
|
|
@@ -583,10 +503,12 @@ exports.RewardDebt = {
|
|
|
583
503
|
message.rewardSchemeId !== undefined &&
|
|
584
504
|
(obj.rewardSchemeId = (message.rewardSchemeId || long_1.default.UZERO).toString());
|
|
585
505
|
message.rewardDebt !== undefined && (obj.rewardDebt = message.rewardDebt);
|
|
506
|
+
message.lastUpdatedAt !== undefined &&
|
|
507
|
+
(obj.lastUpdatedAt = message.lastUpdatedAt.toISOString());
|
|
586
508
|
return obj;
|
|
587
509
|
},
|
|
588
510
|
fromPartial(object) {
|
|
589
|
-
var _a, _b;
|
|
511
|
+
var _a, _b, _c;
|
|
590
512
|
const message = Object.assign({}, baseRewardDebt);
|
|
591
513
|
message.userAddress = (_a = object.userAddress) !== null && _a !== void 0 ? _a : "";
|
|
592
514
|
message.rewardSchemeId =
|
|
@@ -594,6 +516,7 @@ exports.RewardDebt = {
|
|
|
594
516
|
? long_1.default.fromValue(object.rewardSchemeId)
|
|
595
517
|
: long_1.default.UZERO;
|
|
596
518
|
message.rewardDebt = (_b = object.rewardDebt) !== null && _b !== void 0 ? _b : "";
|
|
519
|
+
message.lastUpdatedAt = (_c = object.lastUpdatedAt) !== null && _c !== void 0 ? _c : undefined;
|
|
597
520
|
return message;
|
|
598
521
|
},
|
|
599
522
|
};
|
|
@@ -159,7 +159,7 @@ exports.QueryProposalsRequest = {
|
|
|
159
159
|
const message = Object.assign({}, baseQueryProposalsRequest);
|
|
160
160
|
message.proposalStatus =
|
|
161
161
|
object.proposalStatus !== undefined && object.proposalStatus !== null
|
|
162
|
-
?
|
|
162
|
+
? gov_1.proposalStatusFromJSON(object.proposalStatus)
|
|
163
163
|
: 0;
|
|
164
164
|
message.voter =
|
|
165
165
|
object.voter !== undefined && object.voter !== null
|
|
@@ -178,7 +178,7 @@ exports.QueryProposalsRequest = {
|
|
|
178
178
|
toJSON(message) {
|
|
179
179
|
const obj = {};
|
|
180
180
|
message.proposalStatus !== undefined &&
|
|
181
|
-
(obj.proposalStatus =
|
|
181
|
+
(obj.proposalStatus = gov_1.proposalStatusToJSON(message.proposalStatus));
|
|
182
182
|
message.voter !== undefined && (obj.voter = message.voter);
|
|
183
183
|
message.depositor !== undefined && (obj.depositor = message.depositor);
|
|
184
184
|
message.pagination !== undefined &&
|
|
@@ -185,7 +185,7 @@ exports.MsgVote = {
|
|
|
185
185
|
: "";
|
|
186
186
|
message.option =
|
|
187
187
|
object.option !== undefined && object.option !== null
|
|
188
|
-
?
|
|
188
|
+
? gov_1.voteOptionFromJSON(object.option)
|
|
189
189
|
: 0;
|
|
190
190
|
return message;
|
|
191
191
|
},
|
|
@@ -195,7 +195,7 @@ exports.MsgVote = {
|
|
|
195
195
|
(obj.proposalId = (message.proposalId || long_1.default.UZERO).toString());
|
|
196
196
|
message.voter !== undefined && (obj.voter = message.voter);
|
|
197
197
|
message.option !== undefined &&
|
|
198
|
-
(obj.option =
|
|
198
|
+
(obj.option = gov_1.voteOptionToJSON(message.option));
|
|
199
199
|
return obj;
|
|
200
200
|
},
|
|
201
201
|
fromPartial(object) {
|
|
@@ -618,13 +618,13 @@ exports.ModeInfo_Single = {
|
|
|
618
618
|
const message = Object.assign({}, baseModeInfo_Single);
|
|
619
619
|
message.mode =
|
|
620
620
|
object.mode !== undefined && object.mode !== null
|
|
621
|
-
?
|
|
621
|
+
? signing_1.signModeFromJSON(object.mode)
|
|
622
622
|
: 0;
|
|
623
623
|
return message;
|
|
624
624
|
},
|
|
625
625
|
toJSON(message) {
|
|
626
626
|
const obj = {};
|
|
627
|
-
message.mode !== undefined && (obj.mode =
|
|
627
|
+
message.mode !== undefined && (obj.mode = signing_1.signModeToJSON(message.mode));
|
|
628
628
|
return obj;
|
|
629
629
|
},
|
|
630
630
|
fromPartial(object) {
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import Long from "long";
|
|
2
|
+
import _m0 from "protobufjs/minimal";
|
|
3
|
+
import { Duration } from "../google/protobuf/duration";
|
|
4
|
+
export declare const protobufPackage = "Switcheo.carbon.pricing";
|
|
5
|
+
/** Legacy Params from v.2.13.0. */
|
|
6
|
+
export interface ParamsV2130 {
|
|
7
|
+
smoothenBand: number;
|
|
8
|
+
impactBand: number;
|
|
9
|
+
staleIndexAllowance?: Duration;
|
|
10
|
+
}
|
|
11
|
+
export declare const ParamsV2130: {
|
|
12
|
+
encode(message: ParamsV2130, writer?: _m0.Writer): _m0.Writer;
|
|
13
|
+
decode(input: _m0.Reader | Uint8Array, length?: number | undefined): ParamsV2130;
|
|
14
|
+
fromJSON(object: any): ParamsV2130;
|
|
15
|
+
toJSON(message: ParamsV2130): unknown;
|
|
16
|
+
fromPartial(object: DeepPartial<ParamsV2130>): ParamsV2130;
|
|
17
|
+
};
|
|
18
|
+
declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
|
|
19
|
+
export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
|
|
20
|
+
[K in keyof T]?: DeepPartial<T[K]>;
|
|
21
|
+
} : Partial<T>;
|
|
22
|
+
export {};
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ParamsV2130 = exports.protobufPackage = void 0;
|
|
7
|
+
/* eslint-disable */
|
|
8
|
+
const long_1 = __importDefault(require("long"));
|
|
9
|
+
const minimal_1 = __importDefault(require("protobufjs/minimal"));
|
|
10
|
+
const duration_1 = require("../google/protobuf/duration");
|
|
11
|
+
exports.protobufPackage = "Switcheo.carbon.pricing";
|
|
12
|
+
const baseParamsV2130 = { smoothenBand: 0, impactBand: 0 };
|
|
13
|
+
exports.ParamsV2130 = {
|
|
14
|
+
encode(message, writer = minimal_1.default.Writer.create()) {
|
|
15
|
+
if (message.smoothenBand !== 0) {
|
|
16
|
+
writer.uint32(8).uint32(message.smoothenBand);
|
|
17
|
+
}
|
|
18
|
+
if (message.impactBand !== 0) {
|
|
19
|
+
writer.uint32(16).uint32(message.impactBand);
|
|
20
|
+
}
|
|
21
|
+
if (message.staleIndexAllowance !== undefined) {
|
|
22
|
+
duration_1.Duration.encode(message.staleIndexAllowance, writer.uint32(26).fork()).ldelim();
|
|
23
|
+
}
|
|
24
|
+
return writer;
|
|
25
|
+
},
|
|
26
|
+
decode(input, length) {
|
|
27
|
+
const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
|
|
28
|
+
let end = length === undefined ? reader.len : reader.pos + length;
|
|
29
|
+
const message = Object.assign({}, baseParamsV2130);
|
|
30
|
+
while (reader.pos < end) {
|
|
31
|
+
const tag = reader.uint32();
|
|
32
|
+
switch (tag >>> 3) {
|
|
33
|
+
case 1:
|
|
34
|
+
message.smoothenBand = reader.uint32();
|
|
35
|
+
break;
|
|
36
|
+
case 2:
|
|
37
|
+
message.impactBand = reader.uint32();
|
|
38
|
+
break;
|
|
39
|
+
case 3:
|
|
40
|
+
message.staleIndexAllowance = duration_1.Duration.decode(reader, reader.uint32());
|
|
41
|
+
break;
|
|
42
|
+
default:
|
|
43
|
+
reader.skipType(tag & 7);
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return message;
|
|
48
|
+
},
|
|
49
|
+
fromJSON(object) {
|
|
50
|
+
const message = Object.assign({}, baseParamsV2130);
|
|
51
|
+
message.smoothenBand =
|
|
52
|
+
object.smoothenBand !== undefined && object.smoothenBand !== null
|
|
53
|
+
? Number(object.smoothenBand)
|
|
54
|
+
: 0;
|
|
55
|
+
message.impactBand =
|
|
56
|
+
object.impactBand !== undefined && object.impactBand !== null
|
|
57
|
+
? Number(object.impactBand)
|
|
58
|
+
: 0;
|
|
59
|
+
message.staleIndexAllowance =
|
|
60
|
+
object.staleIndexAllowance !== undefined &&
|
|
61
|
+
object.staleIndexAllowance !== null
|
|
62
|
+
? duration_1.Duration.fromJSON(object.staleIndexAllowance)
|
|
63
|
+
: undefined;
|
|
64
|
+
return message;
|
|
65
|
+
},
|
|
66
|
+
toJSON(message) {
|
|
67
|
+
const obj = {};
|
|
68
|
+
message.smoothenBand !== undefined &&
|
|
69
|
+
(obj.smoothenBand = message.smoothenBand);
|
|
70
|
+
message.impactBand !== undefined && (obj.impactBand = message.impactBand);
|
|
71
|
+
message.staleIndexAllowance !== undefined &&
|
|
72
|
+
(obj.staleIndexAllowance = message.staleIndexAllowance
|
|
73
|
+
? duration_1.Duration.toJSON(message.staleIndexAllowance)
|
|
74
|
+
: undefined);
|
|
75
|
+
return obj;
|
|
76
|
+
},
|
|
77
|
+
fromPartial(object) {
|
|
78
|
+
var _a, _b;
|
|
79
|
+
const message = Object.assign({}, baseParamsV2130);
|
|
80
|
+
message.smoothenBand = (_a = object.smoothenBand) !== null && _a !== void 0 ? _a : 0;
|
|
81
|
+
message.impactBand = (_b = object.impactBand) !== null && _b !== void 0 ? _b : 0;
|
|
82
|
+
message.staleIndexAllowance =
|
|
83
|
+
object.staleIndexAllowance !== undefined &&
|
|
84
|
+
object.staleIndexAllowance !== null
|
|
85
|
+
? duration_1.Duration.fromPartial(object.staleIndexAllowance)
|
|
86
|
+
: undefined;
|
|
87
|
+
return message;
|
|
88
|
+
},
|
|
89
|
+
};
|
|
90
|
+
if (minimal_1.default.util.Long !== long_1.default) {
|
|
91
|
+
minimal_1.default.util.Long = long_1.default;
|
|
92
|
+
minimal_1.default.configure();
|
|
93
|
+
}
|
package/lib/constant/generic.js
CHANGED
|
@@ -12,7 +12,7 @@ exports.DEFAULT_FEE_DENOM = "swth";
|
|
|
12
12
|
exports.DEFAULT_GAS_PRICE = new bignumber_js_1.default(10);
|
|
13
13
|
exports.DEFAULT_GAS = new bignumber_js_1.default(10000000);
|
|
14
14
|
exports.DEFAULT_FEE = {
|
|
15
|
-
amount:
|
|
15
|
+
amount: proto_signing_1.coins(exports.DEFAULT_GAS_PRICE.times(exports.DEFAULT_GAS).dp(0).toString(), "swth"),
|
|
16
16
|
gas: exports.DEFAULT_GAS.toString(10),
|
|
17
17
|
};
|
|
18
18
|
exports.CURRENT_GAS_PRICE = 769.23077;
|
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":
|
|
@@ -145,7 +145,7 @@ class LiquidityPoolModule extends base_1.default {
|
|
|
145
145
|
const SECONDS_IN_A_WEEK = new bignumber_js_1.BigNumber(604800);
|
|
146
146
|
const mintDataResponse = yield this.sdkProvider.query.inflation.MintData({});
|
|
147
147
|
const mintData = mintDataResponse.mintData;
|
|
148
|
-
const nowTime = new bignumber_js_1.BigNumber(
|
|
148
|
+
const nowTime = new bignumber_js_1.BigNumber(dayjs_1.default().unix());
|
|
149
149
|
const firstBlockTime = (_a = mintData === null || mintData === void 0 ? void 0 : mintData.firstBlockTime.toNumber()) !== null && _a !== void 0 ? _a : 0;
|
|
150
150
|
const difference = nowTime.minus(firstBlockTime);
|
|
151
151
|
const currentWeek = difference.div(SECONDS_IN_A_WEEK).dp(0, bignumber_js_1.BigNumber.ROUND_DOWN);
|
|
@@ -85,7 +85,7 @@ class EthLedgerAccount {
|
|
|
85
85
|
static tryConnect() {
|
|
86
86
|
return __awaiter(this, void 0, void 0, function* () {
|
|
87
87
|
try {
|
|
88
|
-
const transport = yield
|
|
88
|
+
const transport = yield ledger_1.getLedgerTransport();
|
|
89
89
|
// get public key to assert that NEO app is open
|
|
90
90
|
const ethApp = new hw_app_eth_1.default(transport);
|
|
91
91
|
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
|
}
|
|
@@ -109,8 +109,8 @@ class NeoLedgerAccount {
|
|
|
109
109
|
*/
|
|
110
110
|
static tryConnect(version = "neo") {
|
|
111
111
|
return __awaiter(this, void 0, void 0, function* () {
|
|
112
|
-
const bipString =
|
|
113
|
-
const ledger = yield
|
|
112
|
+
const bipString = NeonLedger_1.getNEOBIP44String();
|
|
113
|
+
const ledger = yield ledger_1.getLedgerTransport();
|
|
114
114
|
// get public key to assert that NEO app is open
|
|
115
115
|
const ledgerAdapter = adapterForVersion(version);
|
|
116
116
|
const publicKey = yield ledgerAdapter.getPublicKey(ledger, bipString);
|
|
@@ -127,7 +127,7 @@ class NeoLedgerAccount {
|
|
|
127
127
|
}
|
|
128
128
|
sign(msg, magic = neon_core_next_1.CONST.MAGIC_NUMBER.MainNet) {
|
|
129
129
|
return __awaiter(this, void 0, void 0, function* () {
|
|
130
|
-
const bipString =
|
|
130
|
+
const bipString = NeonLedger_1.getNEOBIP44String();
|
|
131
131
|
const ledger = this.useLedger();
|
|
132
132
|
const ledgerAdapter = adapterForVersion(this.version);
|
|
133
133
|
console.log("getsignature", ledgerAdapter, ledger, msg, bipString, magic);
|
|
@@ -41,7 +41,7 @@ function evalTransportError(err) {
|
|
|
41
41
|
transportErr.message = "Transaction signing denied";
|
|
42
42
|
break;
|
|
43
43
|
default:
|
|
44
|
-
transportErr.message =
|
|
44
|
+
transportErr.message = hw_transport_1.getAltStatusMessage(transportErr.statusCode);
|
|
45
45
|
}
|
|
46
46
|
return err;
|
|
47
47
|
}
|
|
@@ -178,25 +178,25 @@ const MsgEditValidator = {
|
|
|
178
178
|
},
|
|
179
179
|
};
|
|
180
180
|
const AdminAmino = {
|
|
181
|
-
[CarbonTx.Types.MsgCreateOracle]:
|
|
182
|
-
[CarbonTx.Types.MsgBindToken]:
|
|
183
|
-
[CarbonTx.Types.MsgCreateToken]:
|
|
184
|
-
[CarbonTx.Types.MsgLinkToken]:
|
|
185
|
-
[CarbonTx.Types.MsgSyncToken]:
|
|
186
|
-
[CarbonTx.Types.MsgCreateMarket]:
|
|
187
|
-
[CarbonTx.Types.MsgCreateVaultType]:
|
|
188
|
-
[CarbonTx.Types.MsgLinkPool]:
|
|
189
|
-
[CarbonTx.Types.MsgUnlinkPool]:
|
|
190
|
-
[CarbonTx.Types.MsgUpdatePool]:
|
|
191
|
-
[CarbonTx.Types.MsgSetRewardsWeights]:
|
|
192
|
-
[CarbonTx.Types.MsgSetRewardCurve]:
|
|
193
|
-
[CarbonTx.Types.MsgSetCommitmentCurve]:
|
|
194
|
-
[CarbonTx.Types.MsgSetTradingFlag]:
|
|
195
|
-
[CarbonTx.Types.MsgSetGasCost]:
|
|
196
|
-
[CarbonTx.Types.MsgSetMinGasPrice]:
|
|
197
|
-
[CarbonTx.Types.MsgRemoveGasCost]:
|
|
198
|
-
[CarbonTx.Types.MsgRemoveMinGasPrice]:
|
|
199
|
-
[CarbonTx.Types.MsgCreateValidator]:
|
|
200
|
-
[CarbonTx.Types.MsgEditValidator]:
|
|
181
|
+
[CarbonTx.Types.MsgCreateOracle]: utils_1.generateAminoType(MsgCreateOracle),
|
|
182
|
+
[CarbonTx.Types.MsgBindToken]: utils_1.generateAminoType(MsgBindToken),
|
|
183
|
+
[CarbonTx.Types.MsgCreateToken]: utils_1.generateAminoType(MsgCreateToken),
|
|
184
|
+
[CarbonTx.Types.MsgLinkToken]: utils_1.generateAminoType(MsgLinkToken),
|
|
185
|
+
[CarbonTx.Types.MsgSyncToken]: utils_1.generateAminoType(MsgSyncToken),
|
|
186
|
+
[CarbonTx.Types.MsgCreateMarket]: utils_1.generateAminoType(MsgCreateMarket),
|
|
187
|
+
[CarbonTx.Types.MsgCreateVaultType]: utils_1.generateAminoType(MsgCreateVaultType),
|
|
188
|
+
[CarbonTx.Types.MsgLinkPool]: utils_1.generateAminoType(MsgLinkPool),
|
|
189
|
+
[CarbonTx.Types.MsgUnlinkPool]: utils_1.generateAminoType(MsgUnlinkPool),
|
|
190
|
+
[CarbonTx.Types.MsgUpdatePool]: utils_1.generateAminoType(MsgUpdatePool),
|
|
191
|
+
[CarbonTx.Types.MsgSetRewardsWeights]: utils_1.generateAminoType(MsgSetRewardsWeights),
|
|
192
|
+
[CarbonTx.Types.MsgSetRewardCurve]: utils_1.generateAminoType(MsgSetRewardCurve),
|
|
193
|
+
[CarbonTx.Types.MsgSetCommitmentCurve]: utils_1.generateAminoType(MsgSetCommitmentCurve),
|
|
194
|
+
[CarbonTx.Types.MsgSetTradingFlag]: utils_1.generateAminoType(MsgSetTradingFlag),
|
|
195
|
+
[CarbonTx.Types.MsgSetGasCost]: utils_1.generateAminoType(MsgSetGasCost),
|
|
196
|
+
[CarbonTx.Types.MsgSetMinGasPrice]: utils_1.generateAminoType(MsgSetMinGasPrice),
|
|
197
|
+
[CarbonTx.Types.MsgRemoveGasCost]: utils_1.generateAminoType(MsgRemoveGasCost),
|
|
198
|
+
[CarbonTx.Types.MsgRemoveMinGasPrice]: utils_1.generateAminoType(MsgRemoveMinGasPrice),
|
|
199
|
+
[CarbonTx.Types.MsgCreateValidator]: utils_1.generateAminoType(MsgCreateValidator),
|
|
200
|
+
[CarbonTx.Types.MsgEditValidator]: utils_1.generateAminoType(MsgEditValidator),
|
|
201
201
|
};
|
|
202
202
|
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;
|
|
@@ -52,9 +52,9 @@ const MsgRemoveDebt = {
|
|
|
52
52
|
},
|
|
53
53
|
};
|
|
54
54
|
const CdpAmino = {
|
|
55
|
-
[CarbonTx.Types.MsgAddCollateral]:
|
|
56
|
-
[CarbonTx.Types.MsgRemoveCollateral]:
|
|
57
|
-
[CarbonTx.Types.MsgAddDebt]:
|
|
58
|
-
[CarbonTx.Types.MsgRemoveDebt]:
|
|
55
|
+
[CarbonTx.Types.MsgAddCollateral]: utils_1.generateAminoType(MsgAddCollateral),
|
|
56
|
+
[CarbonTx.Types.MsgRemoveCollateral]: utils_1.generateAminoType(MsgRemoveCollateral),
|
|
57
|
+
[CarbonTx.Types.MsgAddDebt]: utils_1.generateAminoType(MsgAddDebt),
|
|
58
|
+
[CarbonTx.Types.MsgRemoveDebt]: utils_1.generateAminoType(MsgRemoveDebt),
|
|
59
59
|
};
|
|
60
60
|
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;
|