@allbridge/bridge-core-sdk 3.15.0-alpha.2 → 3.15.0-alpha.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.
- package/dist/browser/index.js +2 -2
- package/dist/browser/index.js.map +2 -2
- package/dist/cjs/index.js +2 -2
- package/dist/cjs/index.js.map +2 -2
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +2 -2
- package/dist/src/services/liquidity-pool/evm/index.d.ts +1 -2
- package/dist/src/services/liquidity-pool/evm/index.js +9 -12
- package/dist/src/services/liquidity-pool/evm/index.js.map +1 -1
- package/dist/src/version.d.ts +1 -1
- package/dist/src/version.js +1 -1
- package/package.json +1 -1
|
@@ -3,8 +3,7 @@ import { ChainType } from "../../../chains";
|
|
|
3
3
|
import { AllbridgeCoreClient } from "../../../client/core-api";
|
|
4
4
|
import { PoolInfo, TokenWithChainDetails } from "../../../tokens-info";
|
|
5
5
|
import { RawTransaction } from "../../models";
|
|
6
|
-
import { LiquidityPoolsParams, LiquidityPoolsParamsWithAmount, UserBalanceInfo } from "../models";
|
|
7
|
-
import { ChainPoolService } from "../models/pool";
|
|
6
|
+
import { ChainPoolService, LiquidityPoolsParams, LiquidityPoolsParamsWithAmount, UserBalanceInfo } from "../models";
|
|
8
7
|
export declare class EvmPoolService extends ChainPoolService {
|
|
9
8
|
web3: Web3;
|
|
10
9
|
api: AllbridgeCoreClient;
|
|
@@ -10,8 +10,7 @@ const utils_1 = require("../../../utils/utils");
|
|
|
10
10
|
const Pool_json_1 = __importDefault(require("../../models/abi/Pool.json"));
|
|
11
11
|
const utils_2 = require("../../utils");
|
|
12
12
|
const models_1 = require("../models");
|
|
13
|
-
|
|
14
|
-
class EvmPoolService extends pool_1.ChainPoolService {
|
|
13
|
+
class EvmPoolService extends models_1.ChainPoolService {
|
|
15
14
|
constructor(web3, api) {
|
|
16
15
|
super();
|
|
17
16
|
this.web3 = web3;
|
|
@@ -25,7 +24,7 @@ class EvmPoolService extends pool_1.ChainPoolService {
|
|
|
25
24
|
userBalanceInfo = await (0, utils_1.promiseWithTimeout)(this.getUserBalanceInfoByBatch(accountAddress, token), `Cannot get UserBalanceInfo for ${token.name} on ${token.chainSymbol}`, 5000);
|
|
26
25
|
}
|
|
27
26
|
catch (err) {
|
|
28
|
-
userBalanceInfo = await (0, utils_1.promiseWithTimeoutAndRetries)(() => this.getUserBalanceInfoPerProperty(accountAddress, token), `Cannot get UserBalanceInfo for ${token.name} on ${token.chainSymbol}`,
|
|
27
|
+
userBalanceInfo = await (0, utils_1.promiseWithTimeoutAndRetries)(() => this.getUserBalanceInfoPerProperty(accountAddress, token), `Cannot get UserBalanceInfo for ${token.name} on ${token.chainSymbol}`, 5, 2000);
|
|
29
28
|
}
|
|
30
29
|
return userBalanceInfo;
|
|
31
30
|
}
|
|
@@ -48,7 +47,7 @@ class EvmPoolService extends pool_1.ChainPoolService {
|
|
|
48
47
|
poolInfo = await (0, utils_1.promiseWithTimeout)(this.getPoolInfoByBatch(token), `Cannot get PoolInfo for ${token.name} on ${token.chainSymbol}`, 5000);
|
|
49
48
|
}
|
|
50
49
|
catch (err) {
|
|
51
|
-
poolInfo = await (0, utils_1.promiseWithTimeoutAndRetries)(() => this.getPoolInfoPerProperty(token), `Cannot get PoolInfo for ${token.name} on ${token.chainSymbol}`,
|
|
50
|
+
poolInfo = await (0, utils_1.promiseWithTimeoutAndRetries)(() => this.getPoolInfoPerProperty(token), `Cannot get PoolInfo for ${token.name} on ${token.chainSymbol}`, 5, 2000);
|
|
52
51
|
}
|
|
53
52
|
return poolInfo;
|
|
54
53
|
}
|
|
@@ -74,14 +73,12 @@ class EvmPoolService extends pool_1.ChainPoolService {
|
|
|
74
73
|
}
|
|
75
74
|
async getPoolInfoPerProperty(token) {
|
|
76
75
|
const poolContract = this.getPoolContract(token.poolAddress);
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
poolContract.methods.accRewardPerShareP().call(),
|
|
84
|
-
]);
|
|
76
|
+
const aValue = await poolContract.methods.a().call();
|
|
77
|
+
const dValue = await poolContract.methods.d().call();
|
|
78
|
+
const tokenBalance = await poolContract.methods.tokenBalance().call();
|
|
79
|
+
const vUsdBalance = await poolContract.methods.vUsdBalance().call();
|
|
80
|
+
const totalLpAmount = await poolContract.methods.totalSupply().call();
|
|
81
|
+
const accRewardPerShareP = await poolContract.methods.accRewardPerShareP().call();
|
|
85
82
|
const imbalance = (0, calculation_1.calculatePoolInfoImbalance)({ tokenBalance, vUsdBalance });
|
|
86
83
|
return {
|
|
87
84
|
aValue,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/services/liquidity-pool/evm/index.ts"],"names":[],"mappings":";;;;;;AAEA,4CAA4C;AAG5C,4DAAwE;AACxE,gDAAwF;AAExF,2EAAiD;AAGjD,uCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/services/liquidity-pool/evm/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const VERSION = "3.15.0-alpha.
|
|
1
|
+
export declare const VERSION = "3.15.0-alpha.4";
|
package/dist/src/version.js
CHANGED