@curvefi/api 2.58.6 → 2.58.8

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 (3) hide show
  1. package/lib/curve.js +38 -32
  2. package/lib/utils.js +0 -3
  3. package/package.json +2 -2
package/lib/curve.js CHANGED
@@ -112,7 +112,7 @@ import { lowerCasePoolDataAddresses, extractDecimals, extractGauges } from "./co
112
112
  import { _getAllGauges, _getHiddenPools } from "./external-api.js";
113
113
  import { L2Networks } from "./constants/L2Networks.js";
114
114
  import { getTwocryptoFactoryPoolData } from "./factory/factory-twocrypto.js";
115
- import { memoizedContract, memoizedMulticallContract } from "./utils.js";
115
+ import { getGasInfoForL2, memoizedContract, memoizedMulticallContract } from "./utils.js";
116
116
  var _killGauges = function (poolsData) { return __awaiter(void 0, void 0, void 0, function () {
117
117
  var gaugeData, isKilled, gaugeStatuses, poolId;
118
118
  return __generator(this, function (_a) {
@@ -903,9 +903,9 @@ var Curve = /** @class */ (function () {
903
903
  var _a;
904
904
  if (options === void 0) { options = {}; }
905
905
  return __awaiter(this, void 0, void 0, function () {
906
- var jsonRpcApiProviderOptions, _b, e_1, _c, network, poolId, _d, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _e, err_1, _i, _f, pool, _g, _h, coinAddr, _j, _k, coinAddr, _l, _m, coinAddr, _gaugeFactoryABI, factoryContract, _o, curveInstance_1, originalEstimate_1, oldEstimate, newEstimate;
907
- return __generator(this, function (_p) {
908
- switch (_p.label) {
906
+ var jsonRpcApiProviderOptions, _b, e_1, _c, network, poolId, _d, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _e, err_1, _f, _i, _g, pool, _h, _j, coinAddr, _k, _l, coinAddr, _m, _o, coinAddr, _gaugeFactoryABI, factoryContract, _p, curveInstance_1, originalEstimate_1, oldEstimate, newEstimate;
907
+ return __generator(this, function (_q) {
908
+ switch (_q.label) {
909
909
  case 0:
910
910
  // @ts-ignore
911
911
  this.provider = null;
@@ -960,16 +960,16 @@ var Curve = /** @class */ (function () {
960
960
  return [3 /*break*/, 5];
961
961
  case 1:
962
962
  if (!!((_a = providerSettings.url) === null || _a === void 0 ? void 0 : _a.startsWith("https://rpc.gnosischain.com"))) return [3 /*break*/, 5];
963
- _p.label = 2;
963
+ _q.label = 2;
964
964
  case 2:
965
- _p.trys.push([2, 4, , 5]);
965
+ _q.trys.push([2, 4, , 5]);
966
966
  _b = this;
967
967
  return [4 /*yield*/, this.provider.getSigner()];
968
968
  case 3:
969
- _b.signer = _p.sent();
969
+ _b.signer = _q.sent();
970
970
  return [3 /*break*/, 5];
971
971
  case 4:
972
- e_1 = _p.sent();
972
+ e_1 = _q.sent();
973
973
  this.signer = null;
974
974
  return [3 /*break*/, 5];
975
975
  case 5: return [3 /*break*/, 9];
@@ -980,7 +980,7 @@ var Curve = /** @class */ (function () {
980
980
  _c = this;
981
981
  return [4 /*yield*/, this.provider.getSigner()];
982
982
  case 7:
983
- _c.signer = _p.sent();
983
+ _c.signer = _q.sent();
984
984
  return [3 /*break*/, 9];
985
985
  case 8:
986
986
  if (providerType.toLowerCase() === 'Infura'.toLowerCase()) {
@@ -997,10 +997,10 @@ var Curve = /** @class */ (function () {
997
997
  else {
998
998
  throw Error('Wrong providerType');
999
999
  }
1000
- _p.label = 9;
1000
+ _q.label = 9;
1001
1001
  case 9: return [4 /*yield*/, this.provider.getNetwork()];
1002
1002
  case 10:
1003
- network = _p.sent();
1003
+ network = _q.sent();
1004
1004
  console.log("CURVE-JS IS CONNECTED TO NETWORK:", { name: network.name.toUpperCase(), chainId: Number(network.chainId) });
1005
1005
  this.chainId = Number(network.chainId) === 133 || Number(network.chainId) === 31337 ? 1 : Number(network.chainId);
1006
1006
  this.constants.NATIVE_TOKEN = NATIVE_TOKENS[this.chainId];
@@ -1027,29 +1027,35 @@ var Curve = /** @class */ (function () {
1027
1027
  customAbiTokens = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], cTokens, true), yTokens, true), ycTokens, true), aTokens, true);
1028
1028
  this.multicallProvider = new MulticallProvider(this.chainId, this.provider);
1029
1029
  if (!this.signer) return [3 /*break*/, 15];
1030
- _p.label = 11;
1030
+ _q.label = 11;
1031
1031
  case 11:
1032
- _p.trys.push([11, 13, , 14]);
1032
+ _q.trys.push([11, 13, , 14]);
1033
1033
  _e = this;
1034
1034
  return [4 /*yield*/, this.signer.getAddress()];
1035
1035
  case 12:
1036
- _e.signerAddress = _p.sent();
1036
+ _e.signerAddress = _q.sent();
1037
1037
  return [3 /*break*/, 14];
1038
1038
  case 13:
1039
- err_1 = _p.sent();
1039
+ err_1 = _q.sent();
1040
1040
  this.signer = null;
1041
1041
  return [3 /*break*/, 14];
1042
1042
  case 14: return [3 /*break*/, 16];
1043
1043
  case 15:
1044
1044
  this.signerAddress = '';
1045
- _p.label = 16;
1045
+ _q.label = 16;
1046
1046
  case 16:
1047
1047
  this.feeData = { gasPrice: options.gasPrice, maxFeePerGas: options.maxFeePerGas, maxPriorityFeePerGas: options.maxPriorityFeePerGas };
1048
- return [4 /*yield*/, this.updateFeeData()];
1048
+ if (!(this.chainId === 196)) return [3 /*break*/, 18];
1049
+ _f = this.setCustomFeeData;
1050
+ return [4 /*yield*/, getGasInfoForL2()];
1049
1051
  case 17:
1050
- _p.sent();
1051
- for (_i = 0, _f = Object.values(__assign(__assign({}, this.constants.POOLS_DATA), this.constants.LLAMMAS_DATA)); _i < _f.length; _i++) {
1052
- pool = _f[_i];
1052
+ _f.apply(this, [_q.sent()]);
1053
+ _q.label = 18;
1054
+ case 18: return [4 /*yield*/, this.updateFeeData()];
1055
+ case 19:
1056
+ _q.sent();
1057
+ for (_i = 0, _g = Object.values(__assign(__assign({}, this.constants.POOLS_DATA), this.constants.LLAMMAS_DATA)); _i < _g.length; _i++) {
1058
+ pool = _g[_i];
1053
1059
  this.setContract(pool.swap_address, pool.swap_abi);
1054
1060
  if (pool.token_address !== pool.swap_address) {
1055
1061
  this.setContract(pool.token_address, ERC20Abi);
@@ -1060,12 +1066,12 @@ var Curve = /** @class */ (function () {
1060
1066
  if (pool.deposit_address && !this.contracts[pool.deposit_address]) {
1061
1067
  this.setContract(pool.deposit_address, pool.deposit_abi);
1062
1068
  }
1063
- for (_g = 0, _h = pool.underlying_coin_addresses; _g < _h.length; _g++) {
1064
- coinAddr = _h[_g];
1069
+ for (_h = 0, _j = pool.underlying_coin_addresses; _h < _j.length; _h++) {
1070
+ coinAddr = _j[_h];
1065
1071
  this.setContract(coinAddr, ERC20Abi);
1066
1072
  }
1067
- for (_j = 0, _k = pool.wrapped_coin_addresses; _j < _k.length; _j++) {
1068
- coinAddr = _k[_j];
1073
+ for (_k = 0, _l = pool.wrapped_coin_addresses; _k < _l.length; _k++) {
1074
+ coinAddr = _l[_k];
1069
1075
  if (customAbiTokens.includes(coinAddr))
1070
1076
  continue;
1071
1077
  if (coinAddr in this.contracts)
@@ -1073,8 +1079,8 @@ var Curve = /** @class */ (function () {
1073
1079
  this.setContract(coinAddr, ERC20Abi);
1074
1080
  }
1075
1081
  // TODO add all coins
1076
- for (_l = 0, _m = pool.wrapped_coin_addresses; _l < _m.length; _l++) {
1077
- coinAddr = _m[_l];
1082
+ for (_m = 0, _o = pool.wrapped_coin_addresses; _m < _o.length; _m++) {
1083
+ coinAddr = _o[_m];
1078
1084
  if (cTokens.includes(coinAddr)) {
1079
1085
  this.setContract(coinAddr, cERC20Abi);
1080
1086
  }
@@ -1114,15 +1120,15 @@ var Curve = /** @class */ (function () {
1114
1120
  this.setContract(this.constants.ALIASES.crypto_calc, cryptoCalcZapABI);
1115
1121
  this.setContract(this.constants.ALIASES.stable_calc, StableCalcZapABI);
1116
1122
  this.setContract(this.constants.ALIASES.factory, factoryABI);
1117
- if (!(this.chainId !== 1313161554 && this.chainId !== 252 && this.chainId !== 196)) return [3 /*break*/, 19];
1123
+ if (!(this.chainId !== 1313161554 && this.chainId !== 252 && this.chainId !== 196)) return [3 /*break*/, 21];
1118
1124
  factoryContract = this.contracts[this.constants.ALIASES.factory].contract;
1119
- _o = this.constants.ALIASES;
1125
+ _p = this.constants.ALIASES;
1120
1126
  return [4 /*yield*/, factoryContract.admin(this.constantOptions)];
1121
- case 18:
1122
- _o.factory_admin = (_p.sent()).toLowerCase();
1127
+ case 20:
1128
+ _p.factory_admin = (_q.sent()).toLowerCase();
1123
1129
  this.setContract(this.constants.ALIASES.factory_admin, factoryAdminABI);
1124
- _p.label = 19;
1125
- case 19:
1130
+ _q.label = 21;
1131
+ case 21:
1126
1132
  this.setContract(this.constants.ALIASES.crvusd_factory, factoryABI);
1127
1133
  this.setContract(this.constants.ALIASES.eywa_factory, factoryEywaABI);
1128
1134
  this.setContract(this.constants.ALIASES.crypto_factory, cryptoFactoryABI);
package/lib/utils.js CHANGED
@@ -758,7 +758,6 @@ export var getGasPriceByLastTransactions = function () { return __awaiter(void 0
758
758
  return [4 /*yield*/, provider.getTransaction(txHash)];
759
759
  case 5:
760
760
  tx = _b.sent();
761
- console.log(tx, tx === null || tx === void 0 ? void 0 : tx.gasPrice);
762
761
  if (!tx)
763
762
  return [3 /*break*/, 6];
764
763
  totalGasPrice = totalGasPrice + Number(tx.gasPrice);
@@ -829,8 +828,6 @@ export var getGasInfoForL2 = function () { return __awaiter(void 0, void 0, void
829
828
  gasPrice = _a.sent();
830
829
  return [2 /*return*/, {
831
830
  gasPrice: gasPrice,
832
- maxFeePerGas: null,
833
- maxPriorityFeePerGas: null,
834
831
  }];
835
832
  case 4: throw Error("This method exists only for L2 networks");
836
833
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@curvefi/api",
3
- "version": "2.58.6",
3
+ "version": "2.58.8",
4
4
  "description": "JavaScript library for curve.fi",
5
5
  "main": "lib/index.js",
6
6
  "author": "Macket",
@@ -34,7 +34,7 @@
34
34
  "dependencies": {
35
35
  "axios": "^0.21.1",
36
36
  "bignumber.js": "^9.0.1",
37
- "ethcall": "6.0.5",
37
+ "ethcall": "6.0.6",
38
38
  "ethers": "^6.11.0",
39
39
  "memoizee": "^0.4.15"
40
40
  }