@toruslabs/ethereum-controllers 8.6.1 → 8.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/ethereumControllers.umd.min.js +1 -1
  2. package/dist/lib.cjs/Gas/gasUtil.js +27 -11
  3. package/dist/lib.esm/Gas/gasUtil.js +27 -11
  4. package/package.json +2 -2
package/dist/lib.cjs/Gas/gasUtil.js CHANGED
@@ -43,18 +43,34 @@ async function fetchGasEstimatesViaEthFeeHistory(provider) {
43
43
  const finalBaseFeePerGas = feeHistory.baseFeePerGas[feeHistory.baseFeePerGas.length - 1];
44
44
  // this is in hex wei
45
45
  const rewardList = feeHistory.reward.filter(reward => reward[0] !== "0x0" || reward[1] !== "0x0" || reward[2] !== "0x0");
46
- const numberOfRewards = rewardList.length || 1;
47
- const priorityFeeCalcs = rewardList.reduce((acc, curr) => {
48
- return {
49
- slow: acc.slow.plus(new bignumber_js.BigNumber(curr[0], 16)),
50
- average: acc.average.plus(new bignumber_js.BigNumber(curr[1], 16)),
51
- fast: acc.fast.plus(new bignumber_js.BigNumber(curr[2], 16))
46
+ let priorityFeeCalcs;
47
+ let numberOfRewards;
48
+ if (rewardList.length > 0) {
49
+ priorityFeeCalcs = rewardList.reduce((acc, curr) => {
50
+ return {
51
+ slow: acc.slow.plus(new bignumber_js.BigNumber(curr[0], 16)),
52
+ average: acc.average.plus(new bignumber_js.BigNumber(curr[1], 16)),
53
+ fast: acc.fast.plus(new bignumber_js.BigNumber(curr[2], 16))
54
+ };
55
+ }, {
56
+ slow: new bignumber_js.BigNumber(0),
57
+ average: new bignumber_js.BigNumber(0),
58
+ fast: new bignumber_js.BigNumber(0)
59
+ });
60
+ numberOfRewards = rewardList.length;
61
+ } else {
62
+ // fallback to eth_maxPriorityFeePerGas if there are no rewards
63
+ const maxPriorityFeePerGasResult = await provider.request({
64
+ method: "eth_maxPriorityFeePerGas"
65
+ });
66
+ const maxPriorityFeePerGas = new bignumber_js.BigNumber(maxPriorityFeePerGasResult, 16);
67
+ priorityFeeCalcs = {
68
+ slow: maxPriorityFeePerGas,
69
+ average: maxPriorityFeePerGas.multipliedBy(1.1),
70
+ fast: maxPriorityFeePerGas.multipliedBy(1.5)
52
71
  };
53
- }, {
54
- slow: new bignumber_js.BigNumber(0),
55
- average: new bignumber_js.BigNumber(0),
56
- fast: new bignumber_js.BigNumber(0)
57
- });
72
+ numberOfRewards = 1;
73
+ }
58
74
  return {
59
75
  estimatedBaseFee: conversionUtils.hexWEIToDecGWEI(finalBaseFeePerGas).toString(10),
60
76
  high: {
package/dist/lib.esm/Gas/gasUtil.js CHANGED
@@ -41,18 +41,34 @@ async function fetchGasEstimatesViaEthFeeHistory(provider) {
41
41
  const finalBaseFeePerGas = feeHistory.baseFeePerGas[feeHistory.baseFeePerGas.length - 1];
42
42
  // this is in hex wei
43
43
  const rewardList = feeHistory.reward.filter(reward => reward[0] !== "0x0" || reward[1] !== "0x0" || reward[2] !== "0x0");
44
- const numberOfRewards = rewardList.length || 1;
45
- const priorityFeeCalcs = rewardList.reduce((acc, curr) => {
46
- return {
47
- slow: acc.slow.plus(new BigNumber(curr[0], 16)),
48
- average: acc.average.plus(new BigNumber(curr[1], 16)),
49
- fast: acc.fast.plus(new BigNumber(curr[2], 16))
44
+ let priorityFeeCalcs;
45
+ let numberOfRewards;
46
+ if (rewardList.length > 0) {
47
+ priorityFeeCalcs = rewardList.reduce((acc, curr) => {
48
+ return {
49
+ slow: acc.slow.plus(new BigNumber(curr[0], 16)),
50
+ average: acc.average.plus(new BigNumber(curr[1], 16)),
51
+ fast: acc.fast.plus(new BigNumber(curr[2], 16))
52
+ };
53
+ }, {
54
+ slow: new BigNumber(0),
55
+ average: new BigNumber(0),
56
+ fast: new BigNumber(0)
57
+ });
58
+ numberOfRewards = rewardList.length;
59
+ } else {
60
+ // fallback to eth_maxPriorityFeePerGas if there are no rewards
61
+ const maxPriorityFeePerGasResult = await provider.request({
62
+ method: "eth_maxPriorityFeePerGas"
63
+ });
64
+ const maxPriorityFeePerGas = new BigNumber(maxPriorityFeePerGasResult, 16);
65
+ priorityFeeCalcs = {
66
+ slow: maxPriorityFeePerGas,
67
+ average: maxPriorityFeePerGas.multipliedBy(1.1),
68
+ fast: maxPriorityFeePerGas.multipliedBy(1.5)
50
69
  };
51
- }, {
52
- slow: new BigNumber(0),
53
- average: new BigNumber(0),
54
- fast: new BigNumber(0)
55
- });
70
+ numberOfRewards = 1;
71
+ }
56
72
  return {
57
73
  estimatedBaseFee: hexWEIToDecGWEI(finalBaseFeePerGas).toString(10),
58
74
  high: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@toruslabs/ethereum-controllers",
3
- "version": "8.6.1",
3
+ "version": "8.6.2",
4
4
  "homepage": "https://github.com/torusresearch/controllers#readme",
5
5
  "license": "ISC",
6
6
  "sideEffects": false,
@@ -63,7 +63,7 @@
63
63
  "publishConfig": {
64
64
  "access": "public"
65
65
  },
66
- "gitHead": "3c0222a78ac35199fe816969468de34f593670b2",
66
+ "gitHead": "beebbf356d173fa11937386e597a632b92282217",
67
67
  "devDependencies": {
68
68
  "@typechain/ethers-v6": "^0.5.1",
69
69
  "typechain": "^8.3.2"