carbon-js-sdk 0.7.1-beta.3 → 0.7.1-beta.4

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.
Files changed (59) hide show
  1. package/lib/CarbonSDK.js +0 -1
  2. package/lib/clients/ETHClient.js +4 -3
  3. package/lib/clients/InsightsQueryClient.js +1 -1
  4. package/lib/clients/N3Client.js +3 -3
  5. package/lib/clients/NEOClient.js +2 -2
  6. package/lib/clients/TokenClient.js +8 -10
  7. package/lib/codec/index.js +60 -34
  8. package/lib/codec/liquiditypool/event.d.ts +15 -0
  9. package/lib/codec/liquiditypool/event.js +148 -1
  10. package/lib/codec/liquiditypool/export.d.ts +1 -1
  11. package/lib/codec/liquiditypool/export.js +4 -3
  12. package/lib/constant/eip712.js +18 -18
  13. package/lib/constant/ibc.js +15 -15
  14. package/lib/modules/admin.d.ts +1 -1
  15. package/lib/modules/admin.js +2 -2
  16. package/lib/modules/cdp.js +1 -1
  17. package/lib/modules/coin.js +3 -3
  18. package/lib/modules/cosmwasm.js +3 -2
  19. package/lib/modules/erc20.d.ts +1 -1
  20. package/lib/modules/erc20.js +5 -6
  21. package/lib/modules/evm.js +3 -3
  22. package/lib/modules/feemarket.js +2 -2
  23. package/lib/modules/gov.js +34 -17
  24. package/lib/modules/ibc.js +5 -5
  25. package/lib/modules/market.js +3 -3
  26. package/lib/modules/staking.d.ts +1 -1
  27. package/lib/provider/account/EthLedgerAccount/EthLedgerAccount.js +1 -1
  28. package/lib/provider/account/EthLedgerAccount/EthLedgerSigner.js +1 -1
  29. package/lib/provider/account/NeoLedgerAccount/NeoLedgerAccount.js +1 -4
  30. package/lib/provider/amino/types/admin.js +0 -20
  31. package/lib/provider/amino/types/cdp.js +1 -1
  32. package/lib/provider/amino/types/evm.js +1 -1
  33. package/lib/provider/amino/types/gov.js +39 -59
  34. package/lib/provider/amino/types/liquidityPool.js +1 -1
  35. package/lib/provider/amino/types/market.js +5 -5
  36. package/lib/provider/amino/types/oracle.js +1 -1
  37. package/lib/provider/amino/utils.js +5 -2
  38. package/lib/provider/keplr/KeplrAccount.js +6 -6
  39. package/lib/provider/leap/LeapAccount.js +1 -1
  40. package/lib/provider/metamask/MetaMask.js +16 -16
  41. package/lib/provider/metamask/legacy-accounts.js +8 -8
  42. package/lib/provider/o3/O3Wallet.js +1 -1
  43. package/lib/util/address.d.ts +1 -1
  44. package/lib/util/api.js +3 -1
  45. package/lib/util/blockchain.js +5 -3
  46. package/lib/util/eip712.js +2 -2
  47. package/lib/util/ethermint.d.ts +1 -1
  48. package/lib/util/ethermint.js +9 -5
  49. package/lib/util/generic.js +1 -5
  50. package/lib/util/ibc.js +3 -3
  51. package/lib/util/legacyEIP712.js +1 -1
  52. package/lib/util/network.js +5 -5
  53. package/lib/util/tx.js +1 -1
  54. package/lib/util/type.js +1 -1
  55. package/lib/wallet/CarbonSigningClient.js +1 -1
  56. package/lib/wallet/CarbonWallet.d.ts +2 -0
  57. package/lib/wallet/CarbonWallet.js +40 -53
  58. package/lib/websocket/channel.js +1 -1
  59. package/package.json +5 -2
package/lib/CarbonSDK.js CHANGED
@@ -166,7 +166,6 @@ class CarbonSDK {
166
166
  console.error(error);
167
167
  normalInit = false;
168
168
  }
169
- console.log("normal init", normalInit);
170
169
  const sdk = new CarbonSDK({ network, config: configOverride, tmClient, defaultTimeoutBlocks, chainId, useTmAbciQuery: opts.useTmAbciQuery });
171
170
  if (!normalInit)
172
171
  return sdk;
@@ -197,12 +197,11 @@ class ETHClient {
197
197
  const nonce = Math.floor(Math.random() * 1000000000); // random nonce to prevent replay attacks
198
198
  const message = ethers_1.ethers.utils.solidityKeccak256(["string", "address", "bytes", "bytes", "bytes", "uint256", "uint256", "uint256"], ["sendTokens", assetId, targetProxyHash, toAssetHash, feeAddress, amount, feeAmount, nonce]);
199
199
  // logger("sendDeposit message", message)
200
- let signatureResult;
201
200
  const { address, signature } = yield getSignatureCallback(message);
202
201
  const signatureBytes = ethers_1.ethers.utils.arrayify(generic_1.appendHexPrefix(signature));
203
202
  const rsv = ethers_1.ethers.utils.splitSignature(signatureBytes);
204
203
  // logger("sign result", address, signature)
205
- signatureResult = {
204
+ const signatureResult = {
206
205
  owner: address,
207
206
  v: rsv.v.toString(),
208
207
  r: rsv.r,
@@ -345,7 +344,9 @@ class ETHClient {
345
344
  try {
346
345
  return ethers_1.ethers.utils.getAddress(input);
347
346
  }
348
- catch (_a) { }
347
+ catch (_a) {
348
+ // empty catch
349
+ }
349
350
  }
350
351
  getTxNonce(ethAddress, customNonce, provider) {
351
352
  return __awaiter(this, void 0, void 0, function* () {
@@ -102,7 +102,7 @@ class InsightsQueryClient {
102
102
  const parsedEntries = rawEntries.map(entry => ({
103
103
  lastHeight: entry.lastHeight,
104
104
  time: dayjs_1.default(entry.time),
105
- volumeValue: new bignumber_js_1.default(entry.volumeValue)
105
+ volumeValue: new bignumber_js_1.default(entry.volumeValue),
106
106
  }));
107
107
  const parsedMeta = {
108
108
  from: dayjs_1.default(meta.from),
@@ -40,7 +40,7 @@ class N3Client {
40
40
  static signerFromLedger(ledger) {
41
41
  return {
42
42
  scriptHash: ledger.scriptHash,
43
- sign: (txn, networkMagic = neon_core_next_1.CONST.MAGIC_NUMBER.MainNet, k) => __awaiter(this, void 0, void 0, function* () {
43
+ sign: (txn, networkMagic = neon_core_next_1.CONST.MAGIC_NUMBER.MainNet) => __awaiter(this, void 0, void 0, function* () {
44
44
  const signature = yield ledger.sign(txn.serialize(false), networkMagic);
45
45
  const encodedPublicKey = neon_core_next_1.wallet.getPublicKeyEncoded(ledger.publicKey);
46
46
  txn.addWitness(neon_core_next_1.tx.Witness.fromSignature(signature, encodedPublicKey));
@@ -149,7 +149,7 @@ class N3Client {
149
149
  }
150
150
  lockO3Deposit(params) {
151
151
  return __awaiter(this, void 0, void 0, function* () {
152
- const { feeAmount, toAddressHex, amount, token, o3Wallet, signCompleteCallback } = params;
152
+ const { feeAmount, toAddressHex, amount, token, o3Wallet } = params;
153
153
  if (!o3Wallet.isConnected()) {
154
154
  throw new Error("O3 wallet not connected. Please reconnect and try again.");
155
155
  }
@@ -187,7 +187,7 @@ class N3Client {
187
187
  }
188
188
  lockLedgerDeposit(params) {
189
189
  return __awaiter(this, void 0, void 0, function* () {
190
- const { feeAmount, toAddressHex, amount, token, ledger, signCompleteCallback } = params;
190
+ const { feeAmount, toAddressHex, amount, token, ledger } = params;
191
191
  const scriptHash = neon_core_next_1.u.reverseHex(token.bridgeAddress);
192
192
  const tokenScriptHash = neon_core_next_1.u.reverseHex(token.tokenAddress);
193
193
  const fromAddressHex = ledger.displayAddress;
@@ -76,7 +76,7 @@ class NEOClient {
76
76
  // the gas limit on the RPC node and error out otherwise
77
77
  const promises = lodash_1.chunk(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
78
78
  var _a, _b, _c;
79
- let acc = {};
79
+ const acc = {};
80
80
  for (const token of partition) {
81
81
  if (whitelistDenoms && !whitelistDenoms.includes(token.denom))
82
82
  continue;
@@ -151,7 +151,7 @@ class NEOClient {
151
151
  }
152
152
  lockO3Deposit(params) {
153
153
  return __awaiter(this, void 0, void 0, function* () {
154
- const { feeAmount, address, amount, token, o3Wallet, signCompleteCallback } = params;
154
+ const { feeAmount, address, amount, token, o3Wallet } = params;
155
155
  if (!o3Wallet.isConnected()) {
156
156
  throw new Error("O3 wallet not connected. Please reconnect and try again.");
157
157
  }
@@ -113,7 +113,7 @@ class TokenClient {
113
113
  getBlockchainV2(denom) {
114
114
  if (!denom)
115
115
  return undefined;
116
- let token = this.tokens[denom];
116
+ const token = this.tokens[denom];
117
117
  if (this.isNativeToken(denom) || this.isNativeStablecoin(denom) || TokenClient.isPoolToken(denom) || TokenClient.isCdpToken(denom) || this.isGroupedToken(denom)) {
118
118
  // native denoms "swth" and "usc" should be native.
119
119
  // pool and cdp tokens are on the Native blockchain, hence 0
@@ -164,9 +164,9 @@ class TokenClient {
164
164
  const requestOptions = {
165
165
  method: 'POST',
166
166
  headers: {
167
- 'Content-Type': 'application/json'
167
+ 'Content-Type': 'application/json',
168
168
  },
169
- body: JSON.stringify({})
169
+ body: JSON.stringify({}),
170
170
  };
171
171
  const result = yield util_1.FetchUtils.fetch(url, requestOptions).then((res) => res.json());
172
172
  return result;
@@ -181,7 +181,7 @@ class TokenClient {
181
181
  }
182
182
  const symbol = this.getSymbol(denom);
183
183
  if (TokenClient.isPoolTokenLegacy(denom)) {
184
- const match = symbol.match(/^([a-z\d.-\/]+)-(\d+)-([a-z\d.-\/]+)-(\d+)-lp\d+$/i);
184
+ const match = symbol.match(/^([a-z\d.-/]+)-(\d+)-([a-z\d.-/]+)-(\d+)-lp\d+$/i);
185
185
  // inconsistent implementation of isPoolToken, exit
186
186
  if (match === null)
187
187
  return symbol;
@@ -210,7 +210,7 @@ class TokenClient {
210
210
  return "";
211
211
  denom = denom.toLowerCase();
212
212
  if (TokenClient.isPoolTokenLegacy(denom)) {
213
- const match = denom.match(/^([a-z\d.-\/]+)-(\d+)-([a-z\d.-\/]+)-(\d+)-lp\d+$/i);
213
+ const match = denom.match(/^([a-z\d.-/]+)-(\d+)-([a-z\d.-/]+)-(\d+)-lp\d+$/i);
214
214
  // inconsistent implementation of isPoolToken, exit
215
215
  if (match === null)
216
216
  return this.getSymbol(denom);
@@ -429,7 +429,7 @@ class TokenClient {
429
429
  }, []);
430
430
  Object.assign(this.bridges, {
431
431
  polynetwork: polynetworkBridges,
432
- ibc: ibcBridges
432
+ ibc: ibcBridges,
433
433
  });
434
434
  return this.bridges;
435
435
  });
@@ -484,8 +484,8 @@ class TokenClient {
484
484
  chainMap[chainId] = bridge.chainName;
485
485
  }
486
486
  }
487
- return newBridges;
488
487
  }
488
+ return newBridges;
489
489
  });
490
490
  }
491
491
  getIbcBlockchainNames() {
@@ -661,13 +661,11 @@ class TokenClient {
661
661
  try {
662
662
  const response = yield insights.DenomToGeckoIdMap();
663
663
  tokens = response.result.gecko;
664
+ return tokens;
664
665
  }
665
666
  catch (err) {
666
667
  throw new Error((_a = err.message) !== null && _a !== void 0 ? _a : "Unknown gecko query error");
667
668
  }
668
- finally {
669
- return tokens;
670
- }
671
669
  });
672
670
  }
673
671
  setCommonAssetConfig() {
@@ -1805,40 +1805,6 @@ exports.EIP712Types = {
1805
1805
  }
1806
1806
  ]
1807
1807
  },
1808
- "/cosmos.base.query.v1beta1": {
1809
- "PageRequest": [
1810
- {
1811
- "name": "key",
1812
- "type": "uint8[]"
1813
- },
1814
- {
1815
- "name": "offset",
1816
- "type": "uint64"
1817
- },
1818
- {
1819
- "name": "limit",
1820
- "type": "uint64"
1821
- },
1822
- {
1823
- "name": "count_total",
1824
- "type": "bool"
1825
- },
1826
- {
1827
- "name": "reverse",
1828
- "type": "bool"
1829
- }
1830
- ],
1831
- "PageResponse": [
1832
- {
1833
- "name": "next_key",
1834
- "type": "uint8[]"
1835
- },
1836
- {
1837
- "name": "total",
1838
- "type": "uint64"
1839
- }
1840
- ]
1841
- },
1842
1808
  "/cosmos_proto": {
1843
1809
  "InterfaceDescriptor": [
1844
1810
  {
@@ -2641,6 +2607,40 @@ exports.EIP712Types = {
2641
2607
  }
2642
2608
  ]
2643
2609
  },
2610
+ "/cosmos.base.query.v1beta1": {
2611
+ "PageRequest": [
2612
+ {
2613
+ "name": "key",
2614
+ "type": "uint8[]"
2615
+ },
2616
+ {
2617
+ "name": "offset",
2618
+ "type": "uint64"
2619
+ },
2620
+ {
2621
+ "name": "limit",
2622
+ "type": "uint64"
2623
+ },
2624
+ {
2625
+ "name": "count_total",
2626
+ "type": "bool"
2627
+ },
2628
+ {
2629
+ "name": "reverse",
2630
+ "type": "bool"
2631
+ }
2632
+ ],
2633
+ "PageResponse": [
2634
+ {
2635
+ "name": "next_key",
2636
+ "type": "uint8[]"
2637
+ },
2638
+ {
2639
+ "name": "total",
2640
+ "type": "uint64"
2641
+ }
2642
+ ]
2643
+ },
2644
2644
  "/Switcheo.carbon.bank": {
2645
2645
  "CoinSpent": [
2646
2646
  {
@@ -21374,6 +21374,32 @@ exports.EIP712Types = {
21374
21374
  "type": "string"
21375
21375
  }
21376
21376
  ],
21377
+ "RewardCurveChangeEvent": [
21378
+ {
21379
+ "name": "start_time",
21380
+ "type": "string"
21381
+ },
21382
+ {
21383
+ "name": "initial_reward_bps",
21384
+ "type": "uint32"
21385
+ },
21386
+ {
21387
+ "name": "reduction_multiplier_bps",
21388
+ "type": "uint32"
21389
+ },
21390
+ {
21391
+ "name": "reduction_interval_seconds",
21392
+ "type": "uint64"
21393
+ },
21394
+ {
21395
+ "name": "reductions",
21396
+ "type": "uint32"
21397
+ },
21398
+ {
21399
+ "name": "final_reward_bps",
21400
+ "type": "uint32"
21401
+ }
21402
+ ],
21377
21403
  "CommitmentCurveEvent": [
21378
21404
  {
21379
21405
  "name": "commitment_curve",
@@ -19,6 +19,14 @@ export interface RewardsWeightChangeEvent {
19
19
  poolId: Long;
20
20
  rewardsWeight: string;
21
21
  }
22
+ export interface RewardCurveChangeEvent {
23
+ startTime?: Date;
24
+ initialRewardBps: number;
25
+ reductionMultiplierBps: number;
26
+ reductionIntervalSeconds: Long;
27
+ reductions: number;
28
+ finalRewardBps: number;
29
+ }
22
30
  export interface CommitmentCurveEvent {
23
31
  commitmentCurve?: CommitmentCurve;
24
32
  }
@@ -97,6 +105,13 @@ export declare const RewardsWeightChangeEvent: {
97
105
  toJSON(message: RewardsWeightChangeEvent): unknown;
98
106
  fromPartial(object: DeepPartial<RewardsWeightChangeEvent>): RewardsWeightChangeEvent;
99
107
  };
108
+ export declare const RewardCurveChangeEvent: {
109
+ encode(message: RewardCurveChangeEvent, writer?: _m0.Writer): _m0.Writer;
110
+ decode(input: _m0.Reader | Uint8Array, length?: number | undefined): RewardCurveChangeEvent;
111
+ fromJSON(object: any): RewardCurveChangeEvent;
112
+ toJSON(message: RewardCurveChangeEvent): unknown;
113
+ fromPartial(object: DeepPartial<RewardCurveChangeEvent>): RewardCurveChangeEvent;
114
+ };
100
115
  export declare const CommitmentCurveEvent: {
101
116
  encode(message: CommitmentCurveEvent, writer?: _m0.Writer): _m0.Writer;
102
117
  decode(input: _m0.Reader | Uint8Array, length?: number | undefined): CommitmentCurveEvent;
@@ -3,12 +3,13 @@ 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.ClaimEvent = exports.RewardsAccumulatedEvent = exports.UnstakePoolTokenEvent = exports.StakePoolTokenEvent = exports.WithdrawFromPoolEvent = exports.DepositToPoolEvent = exports.SwapEvent = exports.CommitmentEvent = exports.CommitmentCurveEvent = exports.RewardsWeightChangeEvent = exports.TotalCommitmentChangeEvent = exports.PoolEvent = exports.protobufPackage = void 0;
6
+ exports.ClaimEvent = exports.RewardsAccumulatedEvent = exports.UnstakePoolTokenEvent = exports.StakePoolTokenEvent = exports.WithdrawFromPoolEvent = exports.DepositToPoolEvent = exports.SwapEvent = exports.CommitmentEvent = exports.CommitmentCurveEvent = exports.RewardCurveChangeEvent = exports.RewardsWeightChangeEvent = exports.TotalCommitmentChangeEvent = exports.PoolEvent = 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"));
10
10
  const liquiditypool_1 = require("./liquiditypool");
11
11
  const reward_1 = require("./reward");
12
+ const timestamp_1 = require("../google/protobuf/timestamp");
12
13
  const coin_1 = require("../cosmos/base/v1beta1/coin");
13
14
  exports.protobufPackage = "Switcheo.carbon.liquiditypool";
14
15
  const basePoolEvent = {
@@ -248,6 +249,128 @@ exports.RewardsWeightChangeEvent = {
248
249
  return message;
249
250
  },
250
251
  };
252
+ const baseRewardCurveChangeEvent = {
253
+ initialRewardBps: 0,
254
+ reductionMultiplierBps: 0,
255
+ reductionIntervalSeconds: long_1.default.UZERO,
256
+ reductions: 0,
257
+ finalRewardBps: 0,
258
+ };
259
+ exports.RewardCurveChangeEvent = {
260
+ encode(message, writer = minimal_1.default.Writer.create()) {
261
+ if (message.startTime !== undefined) {
262
+ timestamp_1.Timestamp.encode(toTimestamp(message.startTime), writer.uint32(10).fork()).ldelim();
263
+ }
264
+ if (message.initialRewardBps !== 0) {
265
+ writer.uint32(16).uint32(message.initialRewardBps);
266
+ }
267
+ if (message.reductionMultiplierBps !== 0) {
268
+ writer.uint32(24).uint32(message.reductionMultiplierBps);
269
+ }
270
+ if (!message.reductionIntervalSeconds.isZero()) {
271
+ writer.uint32(32).uint64(message.reductionIntervalSeconds);
272
+ }
273
+ if (message.reductions !== 0) {
274
+ writer.uint32(40).uint32(message.reductions);
275
+ }
276
+ if (message.finalRewardBps !== 0) {
277
+ writer.uint32(48).uint32(message.finalRewardBps);
278
+ }
279
+ return writer;
280
+ },
281
+ decode(input, length) {
282
+ const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
283
+ let end = length === undefined ? reader.len : reader.pos + length;
284
+ const message = Object.assign({}, baseRewardCurveChangeEvent);
285
+ while (reader.pos < end) {
286
+ const tag = reader.uint32();
287
+ switch (tag >>> 3) {
288
+ case 1:
289
+ message.startTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
290
+ break;
291
+ case 2:
292
+ message.initialRewardBps = reader.uint32();
293
+ break;
294
+ case 3:
295
+ message.reductionMultiplierBps = reader.uint32();
296
+ break;
297
+ case 4:
298
+ message.reductionIntervalSeconds = reader.uint64();
299
+ break;
300
+ case 5:
301
+ message.reductions = reader.uint32();
302
+ break;
303
+ case 6:
304
+ message.finalRewardBps = reader.uint32();
305
+ break;
306
+ default:
307
+ reader.skipType(tag & 7);
308
+ break;
309
+ }
310
+ }
311
+ return message;
312
+ },
313
+ fromJSON(object) {
314
+ const message = Object.assign({}, baseRewardCurveChangeEvent);
315
+ message.startTime =
316
+ object.startTime !== undefined && object.startTime !== null
317
+ ? fromJsonTimestamp(object.startTime)
318
+ : undefined;
319
+ message.initialRewardBps =
320
+ object.initialRewardBps !== undefined && object.initialRewardBps !== null
321
+ ? Number(object.initialRewardBps)
322
+ : 0;
323
+ message.reductionMultiplierBps =
324
+ object.reductionMultiplierBps !== undefined &&
325
+ object.reductionMultiplierBps !== null
326
+ ? Number(object.reductionMultiplierBps)
327
+ : 0;
328
+ message.reductionIntervalSeconds =
329
+ object.reductionIntervalSeconds !== undefined &&
330
+ object.reductionIntervalSeconds !== null
331
+ ? long_1.default.fromString(object.reductionIntervalSeconds)
332
+ : long_1.default.UZERO;
333
+ message.reductions =
334
+ object.reductions !== undefined && object.reductions !== null
335
+ ? Number(object.reductions)
336
+ : 0;
337
+ message.finalRewardBps =
338
+ object.finalRewardBps !== undefined && object.finalRewardBps !== null
339
+ ? Number(object.finalRewardBps)
340
+ : 0;
341
+ return message;
342
+ },
343
+ toJSON(message) {
344
+ const obj = {};
345
+ message.startTime !== undefined &&
346
+ (obj.startTime = message.startTime.toISOString());
347
+ message.initialRewardBps !== undefined &&
348
+ (obj.initialRewardBps = message.initialRewardBps);
349
+ message.reductionMultiplierBps !== undefined &&
350
+ (obj.reductionMultiplierBps = message.reductionMultiplierBps);
351
+ message.reductionIntervalSeconds !== undefined &&
352
+ (obj.reductionIntervalSeconds = (message.reductionIntervalSeconds || long_1.default.UZERO).toString());
353
+ message.reductions !== undefined && (obj.reductions = message.reductions);
354
+ message.finalRewardBps !== undefined &&
355
+ (obj.finalRewardBps = message.finalRewardBps);
356
+ return obj;
357
+ },
358
+ fromPartial(object) {
359
+ var _a, _b, _c, _d, _e;
360
+ const message = Object.assign({}, baseRewardCurveChangeEvent);
361
+ message.startTime = (_a = object.startTime) !== null && _a !== void 0 ? _a : undefined;
362
+ message.initialRewardBps = (_b = object.initialRewardBps) !== null && _b !== void 0 ? _b : 0;
363
+ message.reductionMultiplierBps = (_c = object.reductionMultiplierBps) !== null && _c !== void 0 ? _c : 0;
364
+ message.reductionIntervalSeconds =
365
+ object.reductionIntervalSeconds !== undefined &&
366
+ object.reductionIntervalSeconds !== null
367
+ ? long_1.default.fromValue(object.reductionIntervalSeconds)
368
+ : long_1.default.UZERO;
369
+ message.reductions = (_d = object.reductions) !== null && _d !== void 0 ? _d : 0;
370
+ message.finalRewardBps = (_e = object.finalRewardBps) !== null && _e !== void 0 ? _e : 0;
371
+ return message;
372
+ },
373
+ };
251
374
  const baseCommitmentCurveEvent = {};
252
375
  exports.CommitmentCurveEvent = {
253
376
  encode(message, writer = minimal_1.default.Writer.create()) {
@@ -1115,6 +1238,30 @@ exports.ClaimEvent = {
1115
1238
  return message;
1116
1239
  },
1117
1240
  };
1241
+ function toTimestamp(date) {
1242
+ const seconds = numberToLong(date.getTime() / 1000);
1243
+ const nanos = (date.getTime() % 1000) * 1000000;
1244
+ return { seconds, nanos };
1245
+ }
1246
+ function fromTimestamp(t) {
1247
+ let millis = t.seconds.toNumber() * 1000;
1248
+ millis += t.nanos / 1000000;
1249
+ return new Date(millis);
1250
+ }
1251
+ function fromJsonTimestamp(o) {
1252
+ if (o instanceof Date) {
1253
+ return o;
1254
+ }
1255
+ else if (typeof o === "string") {
1256
+ return new Date(o);
1257
+ }
1258
+ else {
1259
+ return fromTimestamp(timestamp_1.Timestamp.fromJSON(o));
1260
+ }
1261
+ }
1262
+ function numberToLong(number) {
1263
+ return long_1.default.fromNumber(number);
1264
+ }
1118
1265
  if (minimal_1.default.util.Long !== long_1.default) {
1119
1266
  minimal_1.default.util.Long = long_1.default;
1120
1267
  minimal_1.default.configure();
@@ -1,4 +1,4 @@
1
- export { PoolEvent, TotalCommitmentChangeEvent, RewardsWeightChangeEvent, CommitmentCurveEvent, CommitmentEvent, SwapEvent, DepositToPoolEvent, WithdrawFromPoolEvent, StakePoolTokenEvent, UnstakePoolTokenEvent, RewardsAccumulatedEvent, ClaimEvent } from "./event";
1
+ export { PoolEvent, TotalCommitmentChangeEvent, RewardsWeightChangeEvent, RewardCurveChangeEvent, CommitmentCurveEvent, CommitmentEvent, SwapEvent, DepositToPoolEvent, WithdrawFromPoolEvent, StakePoolTokenEvent, UnstakePoolTokenEvent, RewardsAccumulatedEvent, ClaimEvent } from "./event";
2
2
  export { Params, Pool, Pools, PoolRoute, AddLiquidity, AddLiquidities, RemoveLiquidity, RemoveLiquidities, RemovePoolRoutes, PoolReserve } from "./liquiditypool";
3
3
  export { LinkPoolProposal, UnlinkPoolProposal, SetRewardCurveProposal, SetCommitmentCurveProposal, SetRewardsWeightsProposal, UpdatePoolProposal, CreatePoolRouteProposal, RemovePoolRouteProposal, UpdatePoolRouteProposal } from "./proposal";
4
4
  export { QueryGetPoolRequest, QueryGetPoolResponse, QueryAllPoolRequest, QueryAllPoolResponse, QueryAllPoolAddressRequest, QueryAllPoolAddressResponse, QueryAllPoolAddressResponse_AddressesEntry, ExtendedPool, QueryCommitmentRequest, QueryCommitmentResponse, QueryAllCommitmentRequest, QueryAllCommitmentResponse, QueryCommitmentCurveRequest, QueryCommitmentCurveResponse, QueryRewardCurveRequest, QueryRewardCurveResponse, QueryTotalCommitmentRequest, QueryTotalCommitmentResponse, QueryAllTotalCommitmentRequest, QueryAllTotalCommitmentResponse, QueryClaimableRewardsRequest, QueryClaimableRewardsResponse, QueryParamsRequest, QueryParamsResponse, QueryAllPoolRouteRequest, QueryAllPoolRouteResponse, QueryAllPoolRouteAddressRequest, QueryAllPoolRouteAddressResponse, QueryAllPoolRouteAddressResponse_AddressesEntry } from "./query";
@@ -1,12 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.QueryAllTotalCommitmentRequest = exports.QueryTotalCommitmentResponse = exports.QueryTotalCommitmentRequest = exports.QueryRewardCurveResponse = exports.QueryRewardCurveRequest = exports.QueryCommitmentCurveResponse = exports.QueryCommitmentCurveRequest = exports.QueryAllCommitmentResponse = exports.QueryAllCommitmentRequest = exports.QueryCommitmentResponse = exports.QueryCommitmentRequest = exports.ExtendedPool = exports.QueryAllPoolAddressResponse_AddressesEntry = exports.QueryAllPoolAddressResponse = exports.QueryAllPoolAddressRequest = exports.QueryAllPoolResponse = exports.QueryAllPoolRequest = exports.QueryGetPoolResponse = exports.QueryGetPoolRequest = exports.UpdatePoolRouteProposal = exports.RemovePoolRouteProposal = exports.CreatePoolRouteProposal = exports.UpdatePoolProposal = exports.SetRewardsWeightsProposal = exports.SetCommitmentCurveProposal = exports.SetRewardCurveProposal = exports.UnlinkPoolProposal = exports.LinkPoolProposal = exports.PoolReserve = exports.RemovePoolRoutes = exports.RemoveLiquidities = exports.RemoveLiquidity = exports.AddLiquidities = exports.AddLiquidity = exports.PoolRoute = exports.Pools = exports.Pool = exports.Params = exports.ClaimEvent = exports.RewardsAccumulatedEvent = exports.UnstakePoolTokenEvent = exports.StakePoolTokenEvent = exports.WithdrawFromPoolEvent = exports.DepositToPoolEvent = exports.SwapEvent = exports.CommitmentEvent = exports.CommitmentCurveEvent = exports.RewardsWeightChangeEvent = exports.TotalCommitmentChangeEvent = exports.PoolEvent = void 0;
4
- exports.SetCommitmentCurveParams = exports.MsgSetCommitmentCurve = exports.MsgSetRewardCurveResponse = exports.SetRewardCurveParams = exports.MsgSetRewardCurve = exports.MsgClaimPoolRewardsResponse = exports.MsgClaimPoolRewards = exports.MsgUnstakePoolTokenResponse = exports.MsgUnstakePoolToken = exports.MsgStakePoolTokenResponse = exports.MsgStakePoolToken = exports.MsgSetRewardsWeightsResponse = exports.SetRewardsWeightsParams = exports.MsgSetRewardsWeights = exports.UnlinkPoolParams = exports.LinkPoolParams = exports.MsgRemoveLiquidityResponse = exports.MsgRemoveLiquidity = exports.MsgAddLiquidityResponse = exports.MsgAddLiquidity = exports.MsgCreatePoolWithLiquidityResponse = exports.MsgCreatePoolWithLiquidity = exports.MsgCreatePoolResponse = exports.MsgCreatePool = exports.AllocatedRewards = exports.CommitmentExpiriesRecord = exports.CommitmentExpiries = exports.CommitmentExpiry = exports.AccumulatedRewardsRecord = exports.AccumulatedRewards = exports.RewardHistory = exports.CommitmentResponse = exports.TotalCommitmentRecord = exports.TotalCommitment = exports.CommitmentRecord = exports.Commitment = exports.RewardWeights = exports.RewardWeight = exports.CommitmentCurve = exports.RewardCurve = exports.QueryAllPoolRouteAddressResponse_AddressesEntry = exports.QueryAllPoolRouteAddressResponse = exports.QueryAllPoolRouteAddressRequest = exports.QueryAllPoolRouteResponse = exports.QueryAllPoolRouteRequest = exports.QueryParamsResponse = exports.QueryParamsRequest = exports.QueryClaimableRewardsResponse = exports.QueryClaimableRewardsRequest = exports.QueryAllTotalCommitmentResponse = void 0;
5
- exports.UpdatePoolRouteParams = exports.MsgUpdatePoolRouteResponse = exports.MsgUpdatePoolRoute = exports.RemovePoolRouteParams = exports.MsgRemovePoolRouteResponse = exports.MsgRemovePoolRoute = exports.CreatePoolRouteParams = exports.MsgCreatePoolRouteResponse = exports.MsgCreatePoolRoute = exports.MsgUpdatePoolResponse = exports.UpdatePoolParams = exports.MsgUpdatePool = exports.MsgSetCommitmentCurveResponse = void 0;
3
+ exports.QueryTotalCommitmentResponse = exports.QueryTotalCommitmentRequest = exports.QueryRewardCurveResponse = exports.QueryRewardCurveRequest = exports.QueryCommitmentCurveResponse = exports.QueryCommitmentCurveRequest = exports.QueryAllCommitmentResponse = exports.QueryAllCommitmentRequest = exports.QueryCommitmentResponse = exports.QueryCommitmentRequest = exports.ExtendedPool = exports.QueryAllPoolAddressResponse_AddressesEntry = exports.QueryAllPoolAddressResponse = exports.QueryAllPoolAddressRequest = exports.QueryAllPoolResponse = exports.QueryAllPoolRequest = exports.QueryGetPoolResponse = exports.QueryGetPoolRequest = exports.UpdatePoolRouteProposal = exports.RemovePoolRouteProposal = exports.CreatePoolRouteProposal = exports.UpdatePoolProposal = exports.SetRewardsWeightsProposal = exports.SetCommitmentCurveProposal = exports.SetRewardCurveProposal = exports.UnlinkPoolProposal = exports.LinkPoolProposal = exports.PoolReserve = exports.RemovePoolRoutes = exports.RemoveLiquidities = exports.RemoveLiquidity = exports.AddLiquidities = exports.AddLiquidity = exports.PoolRoute = exports.Pools = exports.Pool = exports.Params = exports.ClaimEvent = exports.RewardsAccumulatedEvent = exports.UnstakePoolTokenEvent = exports.StakePoolTokenEvent = exports.WithdrawFromPoolEvent = exports.DepositToPoolEvent = exports.SwapEvent = exports.CommitmentEvent = exports.CommitmentCurveEvent = exports.RewardCurveChangeEvent = exports.RewardsWeightChangeEvent = exports.TotalCommitmentChangeEvent = exports.PoolEvent = void 0;
4
+ exports.MsgSetCommitmentCurve = exports.MsgSetRewardCurveResponse = exports.SetRewardCurveParams = exports.MsgSetRewardCurve = exports.MsgClaimPoolRewardsResponse = exports.MsgClaimPoolRewards = exports.MsgUnstakePoolTokenResponse = exports.MsgUnstakePoolToken = exports.MsgStakePoolTokenResponse = exports.MsgStakePoolToken = exports.MsgSetRewardsWeightsResponse = exports.SetRewardsWeightsParams = exports.MsgSetRewardsWeights = exports.UnlinkPoolParams = exports.LinkPoolParams = exports.MsgRemoveLiquidityResponse = exports.MsgRemoveLiquidity = exports.MsgAddLiquidityResponse = exports.MsgAddLiquidity = exports.MsgCreatePoolWithLiquidityResponse = exports.MsgCreatePoolWithLiquidity = exports.MsgCreatePoolResponse = exports.MsgCreatePool = exports.AllocatedRewards = exports.CommitmentExpiriesRecord = exports.CommitmentExpiries = exports.CommitmentExpiry = exports.AccumulatedRewardsRecord = exports.AccumulatedRewards = exports.RewardHistory = exports.CommitmentResponse = exports.TotalCommitmentRecord = exports.TotalCommitment = exports.CommitmentRecord = exports.Commitment = exports.RewardWeights = exports.RewardWeight = exports.CommitmentCurve = exports.RewardCurve = exports.QueryAllPoolRouteAddressResponse_AddressesEntry = exports.QueryAllPoolRouteAddressResponse = exports.QueryAllPoolRouteAddressRequest = exports.QueryAllPoolRouteResponse = exports.QueryAllPoolRouteRequest = exports.QueryParamsResponse = exports.QueryParamsRequest = exports.QueryClaimableRewardsResponse = exports.QueryClaimableRewardsRequest = exports.QueryAllTotalCommitmentResponse = exports.QueryAllTotalCommitmentRequest = void 0;
5
+ exports.UpdatePoolRouteParams = exports.MsgUpdatePoolRouteResponse = exports.MsgUpdatePoolRoute = exports.RemovePoolRouteParams = exports.MsgRemovePoolRouteResponse = exports.MsgRemovePoolRoute = exports.CreatePoolRouteParams = exports.MsgCreatePoolRouteResponse = exports.MsgCreatePoolRoute = exports.MsgUpdatePoolResponse = exports.UpdatePoolParams = exports.MsgUpdatePool = exports.MsgSetCommitmentCurveResponse = exports.SetCommitmentCurveParams = void 0;
6
6
  var event_1 = require("./event");
7
7
  Object.defineProperty(exports, "PoolEvent", { enumerable: true, get: function () { return event_1.PoolEvent; } });
8
8
  Object.defineProperty(exports, "TotalCommitmentChangeEvent", { enumerable: true, get: function () { return event_1.TotalCommitmentChangeEvent; } });
9
9
  Object.defineProperty(exports, "RewardsWeightChangeEvent", { enumerable: true, get: function () { return event_1.RewardsWeightChangeEvent; } });
10
+ Object.defineProperty(exports, "RewardCurveChangeEvent", { enumerable: true, get: function () { return event_1.RewardCurveChangeEvent; } });
10
11
  Object.defineProperty(exports, "CommitmentCurveEvent", { enumerable: true, get: function () { return event_1.CommitmentCurveEvent; } });
11
12
  Object.defineProperty(exports, "CommitmentEvent", { enumerable: true, get: function () { return event_1.CommitmentEvent; } });
12
13
  Object.defineProperty(exports, "SwapEvent", { enumerable: true, get: function () { return event_1.SwapEvent; } });
@@ -35,67 +35,67 @@ exports.DEFAULT_EIP712_TYPES = {
35
35
  Coin: [
36
36
  {
37
37
  name: 'denom',
38
- type: 'string'
38
+ type: 'string',
39
39
  },
40
40
  {
41
41
  name: 'amount',
42
- type: 'string'
43
- }
42
+ type: 'string',
43
+ },
44
44
  ],
45
45
  EIP712Domain: [
46
46
  {
47
47
  name: 'name',
48
- type: 'string'
48
+ type: 'string',
49
49
  },
50
50
  {
51
51
  name: 'version',
52
- type: 'string'
52
+ type: 'string',
53
53
  },
54
54
  {
55
55
  name: 'chainId',
56
- type: 'uint256'
56
+ type: 'uint256',
57
57
  },
58
58
  {
59
59
  name: 'verifyingContract',
60
- type: 'string'
60
+ type: 'string',
61
61
  },
62
62
  {
63
63
  name: 'salt',
64
- type: 'string'
65
- }
64
+ type: 'string',
65
+ },
66
66
  ],
67
67
  Fee: [
68
68
  {
69
69
  name: 'amount',
70
- type: 'Coin[]'
70
+ type: 'Coin[]',
71
71
  },
72
72
  {
73
73
  name: 'gas',
74
- type: 'string'
75
- }
74
+ type: 'string',
75
+ },
76
76
  ],
77
77
  Tx: [
78
78
  {
79
79
  name: 'account_number',
80
- type: 'string'
80
+ type: 'string',
81
81
  },
82
82
  {
83
83
  name: 'chain_id',
84
- type: 'string'
84
+ type: 'string',
85
85
  },
86
86
  {
87
87
  name: 'fee',
88
- type: 'Fee'
88
+ type: 'Fee',
89
89
  },
90
90
  {
91
91
  name: 'memo',
92
- type: 'string'
92
+ type: 'string',
93
93
  },
94
94
  {
95
95
  name: 'sequence',
96
- type: 'string'
96
+ type: 'string',
97
97
  },
98
- ]
98
+ ],
99
99
  };
100
100
  // Note that the chainId field is delibrately omitted because it is dynamic
101
101
  exports.DEFAULT_CARBON_DOMAIN_FIELDS = {