curvance 4.0.3 → 4.1.0
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/README.md +595 -59
- package/dist/chains/arbitrum.d.ts.map +1 -1
- package/dist/chains/arbitrum.js +4 -2
- package/dist/chains/arbitrum.js.map +1 -1
- package/dist/chains/index.d.ts +4 -0
- package/dist/chains/index.d.ts.map +1 -1
- package/dist/chains/index.js +15 -0
- package/dist/chains/index.js.map +1 -1
- package/dist/chains/monad.d.ts.map +1 -1
- package/dist/chains/monad.js +4 -2
- package/dist/chains/monad.js.map +1 -1
- package/dist/chains/rpc.d.ts +57 -0
- package/dist/chains/rpc.d.ts.map +1 -0
- package/dist/chains/rpc.js +47 -0
- package/dist/chains/rpc.js.map +1 -0
- package/dist/classes/Api.d.ts +4 -3
- package/dist/classes/Api.d.ts.map +1 -1
- package/dist/classes/Api.js +7 -7
- package/dist/classes/Api.js.map +1 -1
- package/dist/classes/BorrowableCToken.d.ts +3 -2
- package/dist/classes/BorrowableCToken.d.ts.map +1 -1
- package/dist/classes/BorrowableCToken.js +6 -5
- package/dist/classes/BorrowableCToken.js.map +1 -1
- package/dist/classes/CToken.d.ts +11 -3
- package/dist/classes/CToken.d.ts.map +1 -1
- package/dist/classes/CToken.js +168 -116
- package/dist/classes/CToken.js.map +1 -1
- package/dist/classes/Calldata.d.ts +2 -2
- package/dist/classes/Calldata.d.ts.map +1 -1
- package/dist/classes/Calldata.js +2 -2
- package/dist/classes/Calldata.js.map +1 -1
- package/dist/classes/DexAggregators/IDexAgg.d.ts +2 -2
- package/dist/classes/DexAggregators/IDexAgg.d.ts.map +1 -1
- package/dist/classes/DexAggregators/Kuru.d.ts +2 -2
- package/dist/classes/DexAggregators/Kuru.d.ts.map +1 -1
- package/dist/classes/DexAggregators/Kuru.js +3 -4
- package/dist/classes/DexAggregators/Kuru.js.map +1 -1
- package/dist/classes/DexAggregators/KyberSwap.d.ts +2 -2
- package/dist/classes/DexAggregators/KyberSwap.d.ts.map +1 -1
- package/dist/classes/DexAggregators/KyberSwap.js +88 -9
- package/dist/classes/DexAggregators/KyberSwap.js.map +1 -1
- package/dist/classes/DexAggregators/MultiDexAgg.d.ts +2 -2
- package/dist/classes/DexAggregators/MultiDexAgg.d.ts.map +1 -1
- package/dist/classes/DexAggregators/MultiDexAgg.js +3 -3
- package/dist/classes/DexAggregators/MultiDexAgg.js.map +1 -1
- package/dist/classes/ERC20.d.ts +5 -3
- package/dist/classes/ERC20.d.ts.map +1 -1
- package/dist/classes/ERC20.js +20 -14
- package/dist/classes/ERC20.js.map +1 -1
- package/dist/classes/ERC4626.d.ts.map +1 -1
- package/dist/classes/ERC4626.js +3 -1
- package/dist/classes/ERC4626.js.map +1 -1
- package/dist/classes/Market.d.ts +13 -4
- package/dist/classes/Market.d.ts.map +1 -1
- package/dist/classes/Market.js +86 -28
- package/dist/classes/Market.js.map +1 -1
- package/dist/classes/NativeToken.d.ts +6 -3
- package/dist/classes/NativeToken.d.ts.map +1 -1
- package/dist/classes/NativeToken.js +11 -16
- package/dist/classes/NativeToken.js.map +1 -1
- package/dist/classes/OptimizerReader.d.ts +3 -3
- package/dist/classes/OptimizerReader.d.ts.map +1 -1
- package/dist/classes/OptimizerReader.js +1 -1
- package/dist/classes/OptimizerReader.js.map +1 -1
- package/dist/classes/OracleManager.d.ts +3 -3
- package/dist/classes/OracleManager.d.ts.map +1 -1
- package/dist/classes/OracleManager.js +1 -1
- package/dist/classes/OracleManager.js.map +1 -1
- package/dist/classes/PositionManager.d.ts +2 -2
- package/dist/classes/PositionManager.d.ts.map +1 -1
- package/dist/classes/PositionManager.js +4 -4
- package/dist/classes/PositionManager.js.map +1 -1
- package/dist/classes/ProtocolReader.d.ts +18 -4
- package/dist/classes/ProtocolReader.d.ts.map +1 -1
- package/dist/classes/ProtocolReader.js +177 -55
- package/dist/classes/ProtocolReader.js.map +1 -1
- package/dist/classes/Redstone.d.ts.map +1 -1
- package/dist/classes/Redstone.js +1 -2
- package/dist/classes/Redstone.js.map +1 -1
- package/dist/classes/Zapper.d.ts +4 -2
- package/dist/classes/Zapper.d.ts.map +1 -1
- package/dist/classes/Zapper.js +16 -14
- package/dist/classes/Zapper.js.map +1 -1
- package/dist/classes/index.d.ts +1 -1
- package/dist/classes/index.d.ts.map +1 -1
- package/dist/classes/index.js +6 -1
- package/dist/classes/index.js.map +1 -1
- package/dist/contracts/monad-mainnet.json +1 -1
- package/dist/feePolicy.d.ts +27 -1
- package/dist/feePolicy.d.ts.map +1 -1
- package/dist/feePolicy.js +10 -2
- package/dist/feePolicy.js.map +1 -1
- package/dist/helpers.d.ts +3 -1
- package/dist/helpers.d.ts.map +1 -1
- package/dist/helpers.js +34 -4
- package/dist/helpers.js.map +1 -1
- package/dist/integrations/snapshot.d.ts.map +1 -1
- package/dist/integrations/snapshot.js +4 -18
- package/dist/integrations/snapshot.js.map +1 -1
- package/dist/retry-provider.d.ts +81 -6
- package/dist/retry-provider.d.ts.map +1 -1
- package/dist/retry-provider.js +491 -37
- package/dist/retry-provider.js.map +1 -1
- package/dist/setup.d.ts +14 -3
- package/dist/setup.d.ts.map +1 -1
- package/dist/setup.js +56 -20
- package/dist/setup.js.map +1 -1
- package/dist/types.d.ts +2 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +3 -1
|
@@ -14,25 +14,165 @@ exports.AdaptorTypes = {
|
|
|
14
14
|
REDSTONE_CORE: 2n,
|
|
15
15
|
MOCK: 1337n
|
|
16
16
|
};
|
|
17
|
+
const PROTOCOL_READER_EXTRA_ABI = [
|
|
18
|
+
"function getMarketStates(address[] markets, address account) view returns ((address _address,(address _address,uint256 totalSupply,uint256 exchangeRate,uint256 totalAssets,uint256 collateral,uint256 debt,uint256 sharePrice,uint256 assetPrice,uint256 sharePriceLower,uint256 assetPriceLower,uint256 borrowRate,uint256 predictedBorrowRate,uint256 utilizationRate,uint256 supplyRate,uint256 liquidity)[] tokens)[] dynamicMarkets,(address _address,uint256 collateral,uint256 maxDebt,uint256 debt,uint256 positionHealth,uint256 cooldown,bool errorCodeHit,(address _address,uint256 userAssetBalance,uint256 userShareBalance,uint256 userUnderlyingBalance,uint256 userCollateral,uint256 userDebt,uint256 liquidationPrice)[] tokens)[] userMarkets)",
|
|
19
|
+
];
|
|
20
|
+
const GET_MARKET_STATES_SELECTOR = "0xaa78b4d4";
|
|
21
|
+
function normalizeDynamicMarketData(data) {
|
|
22
|
+
return data.map((market) => ({
|
|
23
|
+
address: market._address,
|
|
24
|
+
tokens: market.tokens.map((token) => ({
|
|
25
|
+
address: token._address,
|
|
26
|
+
totalSupply: BigInt(token.totalSupply),
|
|
27
|
+
totalAssets: BigInt(token.totalAssets),
|
|
28
|
+
exchangeRate: BigInt(token.exchangeRate),
|
|
29
|
+
collateral: BigInt(token.collateral),
|
|
30
|
+
debt: BigInt(token.debt),
|
|
31
|
+
sharePrice: BigInt(token.sharePrice),
|
|
32
|
+
assetPrice: BigInt(token.assetPrice),
|
|
33
|
+
sharePriceLower: BigInt(token.sharePriceLower),
|
|
34
|
+
assetPriceLower: BigInt(token.assetPriceLower),
|
|
35
|
+
borrowRate: BigInt(token.borrowRate),
|
|
36
|
+
predictedBorrowRate: BigInt(token.predictedBorrowRate),
|
|
37
|
+
utilizationRate: BigInt(token.utilizationRate),
|
|
38
|
+
supplyRate: BigInt(token.supplyRate),
|
|
39
|
+
liquidity: BigInt(token.liquidity),
|
|
40
|
+
})),
|
|
41
|
+
}));
|
|
42
|
+
}
|
|
43
|
+
function normalizeUserMarkets(data) {
|
|
44
|
+
return data.map((market) => ({
|
|
45
|
+
address: market._address,
|
|
46
|
+
collateral: BigInt(market.collateral),
|
|
47
|
+
maxDebt: BigInt(market.maxDebt),
|
|
48
|
+
debt: BigInt(market.debt),
|
|
49
|
+
positionHealth: BigInt(market.positionHealth),
|
|
50
|
+
cooldown: BigInt(market.cooldown),
|
|
51
|
+
// ABI names this field `errorCodeHit`; older SDK code/context call it `priceStale`.
|
|
52
|
+
priceStale: Boolean(market.priceStale ?? market.errorCodeHit),
|
|
53
|
+
tokens: market.tokens.map((token) => ({
|
|
54
|
+
address: token._address,
|
|
55
|
+
userAssetBalance: BigInt(token.userAssetBalance),
|
|
56
|
+
userShareBalance: BigInt(token.userShareBalance),
|
|
57
|
+
userUnderlyingBalance: BigInt(token.userUnderlyingBalance),
|
|
58
|
+
userCollateral: BigInt(token.userCollateral),
|
|
59
|
+
userDebt: BigInt(token.userDebt),
|
|
60
|
+
liquidationPrice: BigInt(token.liquidationPrice),
|
|
61
|
+
})),
|
|
62
|
+
}));
|
|
63
|
+
}
|
|
64
|
+
function normalizeUserData(data) {
|
|
65
|
+
return {
|
|
66
|
+
locks: (data?.locks ?? []).map((lock) => ({
|
|
67
|
+
lockIndex: BigInt(lock.lockIndex),
|
|
68
|
+
amount: BigInt(lock.amount),
|
|
69
|
+
unlockTime: BigInt(lock.unlockTime),
|
|
70
|
+
})),
|
|
71
|
+
markets: normalizeUserMarkets(data?.markets ?? []),
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
function createEmptyUserData(staticMarkets) {
|
|
75
|
+
return {
|
|
76
|
+
locks: [],
|
|
77
|
+
markets: staticMarkets.map((market) => ({
|
|
78
|
+
address: market.address,
|
|
79
|
+
collateral: 0n,
|
|
80
|
+
maxDebt: 0n,
|
|
81
|
+
debt: 0n,
|
|
82
|
+
positionHealth: helpers_1.UINT256_MAX,
|
|
83
|
+
cooldown: market.cooldownLength,
|
|
84
|
+
priceStale: false,
|
|
85
|
+
tokens: market.tokens.map((token) => ({
|
|
86
|
+
address: token.address,
|
|
87
|
+
userAssetBalance: 0n,
|
|
88
|
+
userShareBalance: 0n,
|
|
89
|
+
userUnderlyingBalance: 0n,
|
|
90
|
+
userCollateral: 0n,
|
|
91
|
+
userDebt: 0n,
|
|
92
|
+
liquidationPrice: helpers_1.UINT256_MAX,
|
|
93
|
+
})),
|
|
94
|
+
})),
|
|
95
|
+
};
|
|
96
|
+
}
|
|
17
97
|
class ProtocolReader {
|
|
18
98
|
provider;
|
|
19
99
|
address;
|
|
20
100
|
contract;
|
|
21
|
-
|
|
101
|
+
supportsGetMarketStates = null;
|
|
102
|
+
hasWarnedAboutMarketStatesFallback = false;
|
|
103
|
+
constructor(address, provider = setup_1.setup_config.readProvider) {
|
|
22
104
|
this.provider = provider;
|
|
23
105
|
this.address = address;
|
|
24
|
-
this.contract = (0, helpers_1.contractSetup)(provider, address, ProtocolReader_json_1.default);
|
|
106
|
+
this.contract = (0, helpers_1.contractSetup)(provider, address, [...ProtocolReader_json_1.default, ...PROTOCOL_READER_EXTRA_ABI]);
|
|
25
107
|
}
|
|
26
|
-
|
|
27
|
-
const
|
|
108
|
+
isMissingGetMarketStates(error) {
|
|
109
|
+
const message = String(error?.message ?? "").toLowerCase();
|
|
110
|
+
const shortMessage = String(error?.shortMessage ?? "").toLowerCase();
|
|
111
|
+
const revertReason = String(error?.reason ?? "").toLowerCase();
|
|
112
|
+
const txData = String(error?.transaction?.data ?? "").toLowerCase();
|
|
113
|
+
const looksLikeSelectorMiss = txData.startsWith(GET_MARKET_STATES_SELECTOR) &&
|
|
114
|
+
(shortMessage.includes("no data present") ||
|
|
115
|
+
shortMessage.includes("missing revert data") ||
|
|
116
|
+
message.includes("no data present") ||
|
|
117
|
+
message.includes("missing revert data") ||
|
|
118
|
+
revertReason === "require(false)");
|
|
119
|
+
return looksLikeSelectorMiss;
|
|
120
|
+
}
|
|
121
|
+
async getMarketStatesFallback(markets, account) {
|
|
122
|
+
// Compatibility fallback: keep this path until every environment that
|
|
123
|
+
// runs the SDK (main deployment, staging, forks, local Anvil) has a
|
|
124
|
+
// ProtocolReader with getMarketStates deployed. Removing it right after
|
|
125
|
+
// a single deployment upgrade will break older forks and stale test envs.
|
|
126
|
+
if (!this.hasWarnedAboutMarketStatesFallback) {
|
|
127
|
+
this.hasWarnedAboutMarketStatesFallback = true;
|
|
128
|
+
console.warn("[ProtocolReader] getMarketStates is not available on this deployment yet. " +
|
|
129
|
+
"Falling back to getDynamicMarketData + getUserData for targeted refreshes.");
|
|
130
|
+
}
|
|
131
|
+
const [allDynamicMarkets, userData] = await Promise.all([
|
|
132
|
+
this.getDynamicMarketData(),
|
|
133
|
+
this.getUserData(account),
|
|
134
|
+
]);
|
|
135
|
+
const dynamicByAddress = new Map(allDynamicMarkets.map((market) => [market.address, market]));
|
|
136
|
+
const userByAddress = new Map(userData.markets.map((market) => [market.address, market]));
|
|
137
|
+
const dynamicMarkets = markets.map((marketAddress) => {
|
|
138
|
+
const dynamicMarket = dynamicByAddress.get(marketAddress);
|
|
139
|
+
if (!dynamicMarket) {
|
|
140
|
+
throw new Error(`Fallback could not find dynamic market state for ${marketAddress}.`);
|
|
141
|
+
}
|
|
142
|
+
return dynamicMarket;
|
|
143
|
+
});
|
|
144
|
+
const userMarkets = markets.map((marketAddress) => {
|
|
145
|
+
const userMarket = userByAddress.get(marketAddress);
|
|
146
|
+
if (!userMarket) {
|
|
147
|
+
throw new Error(`Fallback could not find user market state for ${marketAddress}.`);
|
|
148
|
+
}
|
|
149
|
+
return userMarket;
|
|
150
|
+
});
|
|
151
|
+
return {
|
|
152
|
+
dynamicMarkets,
|
|
153
|
+
userMarkets,
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
async getAllMarketData(account = null, use_api = true) {
|
|
157
|
+
if (account == null || account === helpers_1.EMPTY_ADDRESS) {
|
|
158
|
+
const [staticMarket, dynamicMarket] = await Promise.all([
|
|
159
|
+
this.getStaticMarketData(use_api),
|
|
160
|
+
this.getDynamicMarketData(use_api),
|
|
161
|
+
]);
|
|
162
|
+
return {
|
|
163
|
+
staticMarket,
|
|
164
|
+
dynamicMarket,
|
|
165
|
+
userData: createEmptyUserData(staticMarket),
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
const [staticMarket, { dynamicMarket, userData }] = await Promise.all([
|
|
28
169
|
this.getStaticMarketData(use_api),
|
|
29
|
-
this.
|
|
30
|
-
this.getUserData(account)
|
|
170
|
+
this.getAllDynamicState(account),
|
|
31
171
|
]);
|
|
32
172
|
return {
|
|
33
|
-
staticMarket
|
|
34
|
-
dynamicMarket
|
|
35
|
-
userData
|
|
173
|
+
staticMarket,
|
|
174
|
+
dynamicMarket,
|
|
175
|
+
userData,
|
|
36
176
|
};
|
|
37
177
|
}
|
|
38
178
|
async maxRedemptionOf(account, ctoken, bufferTime = 0n) {
|
|
@@ -71,56 +211,38 @@ class ProtocolReader {
|
|
|
71
211
|
async getDynamicMarketData(use_api = true) {
|
|
72
212
|
// TODO: Implement API call
|
|
73
213
|
const data = await this.contract.getDynamicMarketData();
|
|
74
|
-
|
|
75
|
-
address: market._address,
|
|
76
|
-
tokens: market.tokens.map((token) => ({
|
|
77
|
-
address: token._address,
|
|
78
|
-
totalSupply: BigInt(token.totalSupply),
|
|
79
|
-
totalAssets: BigInt(token.totalAssets),
|
|
80
|
-
exchangeRate: BigInt(token.exchangeRate),
|
|
81
|
-
collateral: BigInt(token.collateral),
|
|
82
|
-
debt: BigInt(token.debt),
|
|
83
|
-
sharePrice: BigInt(token.sharePrice),
|
|
84
|
-
assetPrice: BigInt(token.assetPrice),
|
|
85
|
-
sharePriceLower: BigInt(token.sharePriceLower),
|
|
86
|
-
assetPriceLower: BigInt(token.assetPriceLower),
|
|
87
|
-
borrowRate: BigInt(token.borrowRate),
|
|
88
|
-
predictedBorrowRate: BigInt(token.predictedBorrowRate),
|
|
89
|
-
utilizationRate: BigInt(token.utilizationRate),
|
|
90
|
-
supplyRate: BigInt(token.supplyRate),
|
|
91
|
-
liquidity: BigInt(token.liquidity)
|
|
92
|
-
}))
|
|
93
|
-
}));
|
|
94
|
-
return typedData;
|
|
214
|
+
return normalizeDynamicMarketData(data);
|
|
95
215
|
}
|
|
96
216
|
async getUserData(account) {
|
|
97
217
|
const data = await this.contract.getUserData(account);
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
address: market._address,
|
|
106
|
-
collateral: BigInt(market.collateral),
|
|
107
|
-
maxDebt: BigInt(market.maxDebt),
|
|
108
|
-
debt: BigInt(market.debt),
|
|
109
|
-
positionHealth: BigInt(market.positionHealth),
|
|
110
|
-
cooldown: BigInt(market.cooldown),
|
|
111
|
-
priceStale: market.priceStale,
|
|
112
|
-
tokens: market.tokens.map((token) => ({
|
|
113
|
-
address: token._address,
|
|
114
|
-
userAssetBalance: BigInt(token.userAssetBalance),
|
|
115
|
-
userShareBalance: BigInt(token.userShareBalance),
|
|
116
|
-
userUnderlyingBalance: BigInt(token.userUnderlyingBalance),
|
|
117
|
-
userCollateral: BigInt(token.userCollateral),
|
|
118
|
-
userDebt: BigInt(token.userDebt),
|
|
119
|
-
liquidationPrice: BigInt(token.liquidationPrice)
|
|
120
|
-
}))
|
|
121
|
-
}))
|
|
218
|
+
return normalizeUserData(data);
|
|
219
|
+
}
|
|
220
|
+
async getAllDynamicState(account) {
|
|
221
|
+
const data = await this.contract.getAllDynamicState(account);
|
|
222
|
+
return {
|
|
223
|
+
dynamicMarket: normalizeDynamicMarketData(data.market ?? data[0] ?? []),
|
|
224
|
+
userData: normalizeUserData(data.user ?? data[1] ?? { locks: [], markets: [] }),
|
|
122
225
|
};
|
|
123
|
-
|
|
226
|
+
}
|
|
227
|
+
async getMarketStates(markets, account) {
|
|
228
|
+
if (this.supportsGetMarketStates === false) {
|
|
229
|
+
return this.getMarketStatesFallback(markets, account);
|
|
230
|
+
}
|
|
231
|
+
try {
|
|
232
|
+
const data = await this.contract.getMarketStates(markets, account);
|
|
233
|
+
this.supportsGetMarketStates = true;
|
|
234
|
+
return {
|
|
235
|
+
dynamicMarkets: normalizeDynamicMarketData(data.dynamicMarkets ?? data[0] ?? []),
|
|
236
|
+
userMarkets: normalizeUserMarkets(data.userMarkets ?? data[1] ?? []),
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
catch (error) {
|
|
240
|
+
if (!this.isMissingGetMarketStates(error)) {
|
|
241
|
+
throw error;
|
|
242
|
+
}
|
|
243
|
+
this.supportsGetMarketStates = false;
|
|
244
|
+
return this.getMarketStatesFallback(markets, account);
|
|
245
|
+
}
|
|
124
246
|
}
|
|
125
247
|
async previewAssetImpact(user, collateral_ctoken, debt_ctoken, deposit_amount, borrow_amount) {
|
|
126
248
|
const data = await this.contract.previewAssetImpact(user, collateral_ctoken, debt_ctoken, deposit_amount, borrow_amount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProtocolReader.js","sourceRoot":"","sources":["../../src/classes/ProtocolReader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ProtocolReader.js","sourceRoot":"","sources":["../../src/classes/ProtocolReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Redstone.d.ts","sourceRoot":"","sources":["../../src/classes/Redstone.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Redstone.d.ts","sourceRoot":"","sources":["../../src/classes/Redstone.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,WAAW,oBAAoB;IACjC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACvG;AAED,qBAAa,QAAQ;WACJ,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,GAAE,OAAe;iBAyBzB,KAAK;;;WAM3B,oBAAoB,CAAC,MAAM,EAAE,WAAW;CAkBxD"}
|
package/dist/classes/Redstone.js
CHANGED
|
@@ -8,7 +8,6 @@ const sdk_1 = require("@redstone-finance/sdk");
|
|
|
8
8
|
const helpers_1 = require("../helpers");
|
|
9
9
|
const ethers_1 = require("ethers");
|
|
10
10
|
const RedstoneCoreAdaptor_json_1 = __importDefault(require("../abis/RedstoneCoreAdaptor.json"));
|
|
11
|
-
const setup_1 = require("../setup");
|
|
12
11
|
class Redstone {
|
|
13
12
|
static async getPayload(symbol, log = false) {
|
|
14
13
|
let payload_params = {
|
|
@@ -37,7 +36,7 @@ class Redstone {
|
|
|
37
36
|
};
|
|
38
37
|
}
|
|
39
38
|
static async buildMultiCallAction(ctoken) {
|
|
40
|
-
const adaptor =
|
|
39
|
+
const adaptor = ctoken.market.setup.contracts.adaptors.RedstoneCoreAdaptor;
|
|
41
40
|
const contract = (0, helpers_1.contractSetup)(ctoken.provider, adaptor, RedstoneCoreAdaptor_json_1.default);
|
|
42
41
|
const { payload, timestamp } = await Redstone.getPayload(ctoken.asset.symbol);
|
|
43
42
|
const writePrice = contract.interface.encodeFunctionData("writePrice", [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Redstone.js","sourceRoot":"","sources":["../../src/classes/Redstone.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA+G;AAE/G,wCAA2C;AAC3C,mCAA6D;AAE7D,gGAAmD;
|
|
1
|
+
{"version":3,"file":"Redstone.js","sourceRoot":"","sources":["../../src/classes/Redstone.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA+G;AAE/G,wCAA2C;AAC3C,mCAA6D;AAE7D,gGAAmD;AAOnD,MAAa,QAAQ;IACjB,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,MAAe,KAAK;QACxD,IAAI,cAAc,GAAG;YACjB,aAAa,EAAE,uBAAuB;YACtC,eAAe,EAAE,CAAC,MAAM,CAAC;YACzB,kBAAkB,EAAE,CAAC;YACrB,iBAAiB,EAAE;gBACf,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;aAC/C;SACJ,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAmB,EAAC,cAAc,CAAC,CAAC;QAC3D,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC3C,IAAA,iCAA2B,EAAC,QAAQ,CAAC;YACrC,IAAA,0BAAoB,EAAC,QAAQ,CAAC;SACjC,CAAC,CAAC;QAEH,IAAG,GAAG,EAAE,CAAC;YACL,MAAM,IAAI,GAAG,MAAM,IAAA,iCAA2B,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACjE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;QAED,OAAO;YACH,OAAO,EAAE,KAAK,OAAO,EAAW;YAChC,SAAS;SACZ,CAAC;IAEN,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAmB;QACjD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAA8B,CAAC;QACtF,MAAM,QAAQ,GAAG,IAAA,uBAAa,EAAuB,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,kCAAG,CAAC,CAAC;QACpF,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE9E,MAAM,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,kBAAkB,CAAC,YAAY,EAAE;YACnE,MAAM,CAAC,KAAK,CAAC,OAAO;YACpB,IAAI;YACJ,SAAS;SACZ,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAG,IAAA,uBAAc,EAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QAEpF,OAAO;YACH,MAAM,EAAE,OAAO;YACf,aAAa,EAAE,IAAI;YACnB,IAAI,EAAE,iBAAiB;SACP,CAAC;IACzB,CAAC;CACJ;AAlDD,4BAkDC"}
|
package/dist/classes/Zapper.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { address, bytes, curvance_signer } from "../types";
|
|
|
3
3
|
import { CToken } from "./CToken";
|
|
4
4
|
import { Calldata } from "./Calldata";
|
|
5
5
|
import { Zappers } from "./Market";
|
|
6
|
+
import { type SetupConfigSnapshot } from "../setup";
|
|
6
7
|
export interface Swap {
|
|
7
8
|
inputToken: address;
|
|
8
9
|
inputAmount: bigint;
|
|
@@ -17,11 +18,12 @@ export interface IZapper {
|
|
|
17
18
|
swapAndDeposit(ctoken: address, depositAsWrappedNative: boolean, swapAction: Swap, expectedShares: bigint, collateralizeFor: boolean, receiver: address): Promise<TransactionResponse>;
|
|
18
19
|
}
|
|
19
20
|
export declare class Zapper extends Calldata<IZapper> {
|
|
20
|
-
|
|
21
|
+
signer: curvance_signer;
|
|
21
22
|
contract: Contract & IZapper;
|
|
22
23
|
address: address;
|
|
23
24
|
type: ZapperTypes;
|
|
24
|
-
|
|
25
|
+
setup: SetupConfigSnapshot;
|
|
26
|
+
constructor(address: address, signer: curvance_signer, type: ZapperTypes, setup: SetupConfigSnapshot);
|
|
25
27
|
nativeZap(ctoken: CToken, amount: bigint, collateralize: boolean): Promise<TransactionResponse>;
|
|
26
28
|
simpleZap(ctoken: CToken, inputToken: address, outputToken: address, amount: bigint, collateralize: boolean, slippage: bigint): Promise<TransactionResponse>;
|
|
27
29
|
getSimpleZapCalldata(ctoken: CToken, inputToken: address, outputToken: address, amount: bigint, collateralize: boolean, slippage: bigint): Promise<`0x${string}`>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Zapper.d.ts","sourceRoot":"","sources":["../../src/classes/Zapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAK,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Zapper.d.ts","sourceRoot":"","sources":["../../src/classes/Zapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAK,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAGpD,MAAM,WAAW,IAAI;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,KAAK,CAAA;CACd;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,eAAe,CAAC;AACzF,eAAO,MAAM,gBAAgB,iCAK3B,CAAC;AAEH,MAAM,WAAW,OAAO;IACpB,cAAc,CACV,MAAM,EAAE,OAAO,EACf,sBAAsB,EAAE,OAAO,EAC/B,UAAU,EAAE,IAAI,EAChB,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,OAAO,EACzB,QAAQ,EAAE,OAAO,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAClC;AAED,qBAAa,MAAO,SAAQ,QAAQ,CAAC,OAAO,CAAC;IACzC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,mBAAmB,CAAC;gBAEf,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAS9F,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO;IAKhE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAG,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;IAK9H,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;IAyExI,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,GAAE,OAAe;IAsBpG,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAW9C,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,GAAE,OAAe;CAyB9G"}
|
package/dist/classes/Zapper.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.Zapper = exports.zapperTypeToName = void 0;
|
|
|
7
7
|
const helpers_1 = require("../helpers");
|
|
8
8
|
const Calldata_1 = require("./Calldata");
|
|
9
9
|
const SimpleZapper_json_1 = __importDefault(require("../abis/SimpleZapper.json"));
|
|
10
|
-
const
|
|
10
|
+
const FormatConverter_1 = __importDefault(require("./FormatConverter"));
|
|
11
11
|
;
|
|
12
12
|
exports.zapperTypeToName = new Map([
|
|
13
13
|
['native-vault', 'nativeVaultZapper'],
|
|
@@ -16,16 +16,18 @@ exports.zapperTypeToName = new Map([
|
|
|
16
16
|
['native-simple', 'simpleZapper'],
|
|
17
17
|
]);
|
|
18
18
|
class Zapper extends Calldata_1.Calldata {
|
|
19
|
-
|
|
19
|
+
signer;
|
|
20
20
|
contract;
|
|
21
21
|
address;
|
|
22
22
|
type;
|
|
23
|
-
|
|
23
|
+
setup;
|
|
24
|
+
constructor(address, signer, type, setup) {
|
|
24
25
|
super();
|
|
25
26
|
this.address = address;
|
|
26
|
-
this.
|
|
27
|
+
this.signer = signer;
|
|
27
28
|
this.type = type;
|
|
28
|
-
this.
|
|
29
|
+
this.setup = setup;
|
|
30
|
+
this.contract = (0, helpers_1.contractSetup)(signer, address, SimpleZapper_json_1.default);
|
|
29
31
|
}
|
|
30
32
|
async nativeZap(ctoken, amount, collateralize) {
|
|
31
33
|
const calldata = await this.getNativeZapCalldata(ctoken, amount, collateralize);
|
|
@@ -37,7 +39,7 @@ class Zapper extends Calldata_1.Calldata {
|
|
|
37
39
|
}
|
|
38
40
|
async getSimpleZapCalldata(ctoken, inputToken, outputToken, amount, collateralize, slippage) {
|
|
39
41
|
const isNative = inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase();
|
|
40
|
-
const config = (0, helpers_1.getChainConfig)();
|
|
42
|
+
const config = (0, helpers_1.getChainConfig)(this.setup.chain);
|
|
41
43
|
// For native MON: if the deposit token IS wrapped native, just wrap (no swap needed)
|
|
42
44
|
if (isNative && outputToken.toLowerCase() === config.wrapped_native.toLowerCase()) {
|
|
43
45
|
return this.getNativeZapCalldata(ctoken, amount, collateralize, true);
|
|
@@ -65,13 +67,13 @@ class Zapper extends Calldata_1.Calldata {
|
|
|
65
67
|
swap,
|
|
66
68
|
expected_shares,
|
|
67
69
|
collateralize,
|
|
68
|
-
this.
|
|
70
|
+
this.signer.address
|
|
69
71
|
]);
|
|
70
72
|
}
|
|
71
73
|
// Resolve fee from policy. The policy already exempts no-ops via
|
|
72
74
|
// same-token + native↔wrapped checks, so the only way feeBps > 0 here
|
|
73
75
|
// is for a real swap.
|
|
74
|
-
const feeBps =
|
|
76
|
+
const feeBps = this.setup.feePolicy.getFeeBps({
|
|
75
77
|
operation: 'zap',
|
|
76
78
|
inputToken: isNative ? helpers_1.NATIVE_ADDRESS : inputToken,
|
|
77
79
|
outputToken: outputToken,
|
|
@@ -79,14 +81,14 @@ class Zapper extends Calldata_1.Calldata {
|
|
|
79
81
|
currentLeverage: null,
|
|
80
82
|
targetLeverage: null,
|
|
81
83
|
});
|
|
82
|
-
const feeReceiver = feeBps > 0n ?
|
|
84
|
+
const feeReceiver = feeBps > 0n ? this.setup.feePolicy.feeReceiver : undefined;
|
|
83
85
|
const quote = await config.dexAgg.quote(this.address, swapInputToken, outputToken, amount, slippage, feeBps, feeReceiver);
|
|
84
86
|
const swap = {
|
|
85
87
|
inputToken: isNative ? helpers_1.NATIVE_ADDRESS : inputToken,
|
|
86
88
|
inputAmount: amount,
|
|
87
89
|
outputToken: outputToken,
|
|
88
90
|
target: quote.to,
|
|
89
|
-
slippage: slippage,
|
|
91
|
+
slippage: FormatConverter_1.default.bpsToBpsWad(slippage),
|
|
90
92
|
call: quote.calldata
|
|
91
93
|
};
|
|
92
94
|
const expected_shares = await ctoken.convertToShares(BigInt(quote.min_out));
|
|
@@ -96,7 +98,7 @@ class Zapper extends Calldata_1.Calldata {
|
|
|
96
98
|
swap,
|
|
97
99
|
expected_shares,
|
|
98
100
|
collateralize,
|
|
99
|
-
this.
|
|
101
|
+
this.signer.address
|
|
100
102
|
]);
|
|
101
103
|
}
|
|
102
104
|
async getVaultZapCalldata(ctoken, amount, collateralize, wrapped = false) {
|
|
@@ -115,7 +117,7 @@ class Zapper extends Calldata_1.Calldata {
|
|
|
115
117
|
swap,
|
|
116
118
|
expected_shares,
|
|
117
119
|
collateralize,
|
|
118
|
-
this.
|
|
120
|
+
this.signer.address
|
|
119
121
|
]);
|
|
120
122
|
}
|
|
121
123
|
async getZapVaultData(ctoken, amount) {
|
|
@@ -132,7 +134,7 @@ class Zapper extends Calldata_1.Calldata {
|
|
|
132
134
|
? await ctoken.getUnderlyingVault().previewDeposit(amount)
|
|
133
135
|
: amount;
|
|
134
136
|
const expected_shares = await ctoken.convertToShares(vaultAssets);
|
|
135
|
-
const config = (0, helpers_1.getChainConfig)();
|
|
137
|
+
const config = (0, helpers_1.getChainConfig)(this.setup.chain);
|
|
136
138
|
const swap = {
|
|
137
139
|
inputToken: helpers_1.NATIVE_ADDRESS,
|
|
138
140
|
inputAmount: amount,
|
|
@@ -147,7 +149,7 @@ class Zapper extends Calldata_1.Calldata {
|
|
|
147
149
|
swap,
|
|
148
150
|
expected_shares,
|
|
149
151
|
collateralize,
|
|
150
|
-
this.
|
|
152
|
+
this.signer.address
|
|
151
153
|
]);
|
|
152
154
|
}
|
|
153
155
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Zapper.js","sourceRoot":"","sources":["../../src/classes/Zapper.ts"],"names":[],"mappings":";;;;;;AAEA,wCAAuG;AAEvG,yCAAsC;AACtC,kFAA4C;
|
|
1
|
+
{"version":3,"file":"Zapper.js","sourceRoot":"","sources":["../../src/classes/Zapper.ts"],"names":[],"mappings":";;;;;;AAEA,wCAAuG;AAEvG,yCAAsC;AACtC,kFAA4C;AAG5C,wEAAgD;AAS/C,CAAC;AAGW,QAAA,gBAAgB,GAAG,IAAI,GAAG,CAA6B;IAChE,CAAC,cAAc,EAAE,mBAAmB,CAAC;IACrC,CAAC,OAAO,EAAE,aAAa,CAAC;IACxB,CAAC,QAAQ,EAAE,cAAc,CAAC;IAC1B,CAAC,eAAe,EAAE,cAAc,CAAC;CACpC,CAAC,CAAC;AAaH,MAAa,MAAO,SAAQ,mBAAiB;IACzC,MAAM,CAAkB;IACxB,QAAQ,CAAqB;IAC7B,OAAO,CAAU;IACjB,IAAI,CAAc;IAClB,KAAK,CAAsB;IAE3B,YAAY,OAAgB,EAAE,MAAuB,EAAE,IAAiB,EAAE,KAA0B;QAChG,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAA,uBAAa,EAAU,MAAM,EAAE,OAAO,EAAE,2BAAG,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAc,EAAE,MAAc,EAAE,aAAsB;QAClE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAc,EAAE,UAAmB,EAAE,WAAoB,EAAG,MAAc,EAAE,aAAsB,EAAE,QAAgB;QAChI,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QACnH,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,MAAc,EAAE,UAAmB,EAAE,WAAoB,EAAE,MAAc,EAAE,aAAsB,EAAE,QAAgB;QAC1I,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,EAAE,KAAK,wBAAc,CAAC,WAAW,EAAE,CAAC;QAC3E,MAAM,MAAM,GAAG,IAAA,wBAAc,EAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEhD,qFAAqF;QACrF,IAAI,QAAQ,IAAI,WAAW,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;YAChF,OAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QAC1E,CAAC;QAED,2EAA2E;QAC3E,iEAAiE;QACjE,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,cAAyB,CAAC,CAAC,CAAC,UAAU,CAAC;QAEhF,sEAAsE;QACtE,iEAAiE;QACjE,sEAAsE;QACtE,+DAA+D;QAC/D,IAAI,cAAc,CAAC,WAAW,EAAE,KAAK,WAAW,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7D,MAAM,IAAI,GAAS;gBACf,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,wBAAc,CAAC,CAAC,CAAC,UAAU;gBAClD,WAAW,EAAE,MAAM;gBACnB,WAAW,EAAE,WAAW;gBACxB,MAAM,EAAE,uBAAa;gBACrB,QAAQ,EAAE,EAAE;gBACZ,IAAI,EAAE,qBAAW;aACpB,CAAC;YACF,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE;gBACtC,MAAM,CAAC,OAAO;gBACd,QAAQ;gBACR,IAAI;gBACJ,eAAe;gBACf,aAAa;gBACb,IAAI,CAAC,MAAM,CAAC,OAAkB;aACjC,CAAC,CAAC;QACP,CAAC;QAED,iEAAiE;QACjE,sEAAsE;QACtE,sBAAsB;QACtB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC;YAC1C,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,wBAAyB,CAAC,CAAC,CAAC,UAAU;YAC7D,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,MAAM;YACnB,eAAe,EAAE,IAAI;YACrB,cAAc,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QAE/E,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QAE1H,MAAM,IAAI,GAAS;YACf,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,wBAAc,CAAC,CAAC,CAAC,UAAU;YAClD,WAAW,EAAE,MAAM;YACnB,WAAW,EAAE,WAAW;YACxB,MAAM,EAAE,KAAK,CAAC,EAAE;YAChB,QAAQ,EAAE,yBAAe,CAAC,WAAW,CAAC,QAAQ,CAAC;YAC/C,IAAI,EAAE,KAAK,CAAC,QAAQ;SACvB,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAE5E,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE;YACtC,MAAM,CAAC,OAAO;YACd,QAAQ;YACR,IAAI;YACJ,eAAe;YACf,aAAa;YACb,IAAI,CAAC,MAAM,CAAC,OAAkB;SACjC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAc,EAAE,MAAc,EAAE,aAAsB,EAAE,UAAmB,KAAK;QACtG,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE3F,MAAM,IAAI,GAAS;YACf,UAAU,EAAE,kBAAkB;YAC9B,WAAW,EAAE,MAAM;YACnB,WAAW,EAAE,kBAAkB;YAC/B,MAAM,EAAE,uBAAa;YACrB,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,qBAAW;SACpB,CAAC;QAEF,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE;YACtC,MAAM,CAAC,OAAO;YACd,OAAO;YACP,IAAI;YACJ,eAAe;YACf,aAAa;YACb,IAAI,CAAC,MAAM,CAAC,OAAkB;SACjC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc,EAAE,MAAc;QAChD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;QAEzF,OAAO;YACH,kBAAkB,EAAE,gBAAgB;YACpC,eAAe,EAAE,eAAe;SACnC,CAAA;IACL,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,MAAc,EAAE,MAAc,EAAE,aAAsB,EAAE,UAAmB,KAAK;QACvG,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,aAAa,CAAC;YACxD,CAAC,CAAC,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC;YAC1D,CAAC,CAAC,MAAM,CAAC;QACb,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,IAAA,wBAAc,EAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAS;YACf,UAAU,EAAE,wBAAc;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,wBAAc;YAC7D,MAAM,EAAE,uBAAa;YACrB,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,qBAAW;SACpB,CAAC;QAEF,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE;YACtC,MAAM,CAAC,OAAO;YACd,OAAO;YACP,IAAI;YACJ,eAAe;YACf,aAAa;YACb,IAAI,CAAC,MAAM,CAAC,OAAkB;SACjC,CAAC,CAAC;IACP,CAAC;CACJ;AA7JD,wBA6JC"}
|
package/dist/classes/index.d.ts
CHANGED
|
@@ -11,5 +11,5 @@ export * from './BorrowableCToken';
|
|
|
11
11
|
export * from './NativeToken';
|
|
12
12
|
export * from './PositionManager';
|
|
13
13
|
export * from './DexAggregators';
|
|
14
|
-
export
|
|
14
|
+
export { default as FormatConverter } from './FormatConverter';
|
|
15
15
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC"}
|
package/dist/classes/index.js
CHANGED
|
@@ -13,7 +13,11 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
13
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
17
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
|
+
};
|
|
16
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
+
exports.FormatConverter = void 0;
|
|
17
21
|
__exportStar(require("./ProtocolReader"), exports);
|
|
18
22
|
__exportStar(require("./OptimizerReader"), exports);
|
|
19
23
|
__exportStar(require("./OracleManager"), exports);
|
|
@@ -27,5 +31,6 @@ __exportStar(require("./BorrowableCToken"), exports);
|
|
|
27
31
|
__exportStar(require("./NativeToken"), exports);
|
|
28
32
|
__exportStar(require("./PositionManager"), exports);
|
|
29
33
|
__exportStar(require("./DexAggregators"), exports);
|
|
30
|
-
|
|
34
|
+
var FormatConverter_1 = require("./FormatConverter");
|
|
35
|
+
Object.defineProperty(exports, "FormatConverter", { enumerable: true, get: function () { return __importDefault(FormatConverter_1).default; } });
|
|
31
36
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,oDAAkC;AAClC,kDAAgC;AAChC,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,6CAA2B;AAC3B,6CAA2B;AAC3B,qDAAmC;AACnC,gDAA8B;AAC9B,oDAAkC;AAClC,mDAAiC;AACjC,qDAA+D;AAAtD,mIAAA,OAAO,OAAmB"}
|
|
@@ -236,7 +236,7 @@
|
|
|
236
236
|
"WBTC-DynamicIRM": "0x95B961B9aD06dB25831FcdA3c7A79b1EB7c3AFA8"
|
|
237
237
|
}
|
|
238
238
|
},
|
|
239
|
-
"ProtocolReader": "
|
|
239
|
+
"ProtocolReader": "0x1FB5Cb39ED27ADcE0e0Fb1fcd17B1d35Fa5eA756",
|
|
240
240
|
"CombinedAggregator-ezETH": "0xd5F84C4497621768f3F08b65ad7019BdF183b1fd",
|
|
241
241
|
"CombinedAggregator-earnAUSD": "0xf80CC9965d260d7cD96E41b9734F031279dCDf2f",
|
|
242
242
|
"DAOTimelock": "0x2677738657F27e1A3591E00AD7E5a78807688C08",
|
package/dist/feePolicy.d.ts
CHANGED
|
@@ -32,6 +32,15 @@ import { ChainRpcPrefix } from "./helpers";
|
|
|
32
32
|
* to prevent dust debt. The fee compensation is applied at the call site,
|
|
33
33
|
* not in the policy itself.
|
|
34
34
|
*
|
|
35
|
+
* - **protocolLeverageFee must remain 0 while SDK fees are active.**
|
|
36
|
+
* On-chain _validateInputsAndApplyFee mutates action.borrowAssets before
|
|
37
|
+
* the swap callback, causing swapAction.inputAmount != action.borrowAssets
|
|
38
|
+
* in SimplePositionManager (revert). Additionally, users would be double-
|
|
39
|
+
* charged (protocol fee on collateral/borrow + SDK fee on swap input).
|
|
40
|
+
* If protocolLeverageFee needs activation, the SDK must first query the
|
|
41
|
+
* fee from centralRegistry, subtract it from swapAction.inputAmount, and
|
|
42
|
+
* quote KyberSwap for the reduced amount.
|
|
43
|
+
*
|
|
35
44
|
* Future functionality (not yet implemented)
|
|
36
45
|
* ------------------------------------------
|
|
37
46
|
* - **SDK-native token classification.** Currently, stable/volatile classification
|
|
@@ -46,6 +55,15 @@ import { ChainRpcPrefix } from "./helpers";
|
|
|
46
55
|
* would let the protocol, integrators, and a referral program co-receive
|
|
47
56
|
* fees in one swap call.
|
|
48
57
|
*
|
|
58
|
+
* - **Dynamic DAO address from chain.** `CURVANCE_DAO_FEE_RECEIVER` is
|
|
59
|
+
* hardcoded. The on-chain KyberSwapChecker validates against
|
|
60
|
+
* `centralRegistry.daoAddress()` dynamically. If DAO permissions transfer
|
|
61
|
+
* via `transferDaoPermissions()`, the checker validates against the new
|
|
62
|
+
* address but the SDK still sends the old one — every swap reverts.
|
|
63
|
+
* Fix: read `daoAddress` at setupChain time via
|
|
64
|
+
* `protocolReader.centralRegistry()` → `centralRegistry.daoAddress()`,
|
|
65
|
+
* store in setup_config, and use at runtime instead of the constant.
|
|
66
|
+
*
|
|
49
67
|
* - **Per-user fee tiers / discounts.** The current policy is global (one
|
|
50
68
|
* policy per setupChain). To support staker discounts, volume tiers, or
|
|
51
69
|
* referral codes, the policy would need to be invoked with per-call user
|
|
@@ -90,8 +108,16 @@ export interface FeePolicy {
|
|
|
90
108
|
* multi-receiver lists if extended in the future. */
|
|
91
109
|
feeReceiver: address;
|
|
92
110
|
}
|
|
111
|
+
/** Fee BPS charged on all DEX swaps via KyberSwap's `feeAmount` parameter.
|
|
112
|
+
* Must match the on-chain KyberSwapChecker.FEE_BPS constant — if they
|
|
113
|
+
* diverge, every swap reverts (checker enforces exact match).
|
|
114
|
+
* To change the fee: update this constant AND redeploy the checker. */
|
|
115
|
+
export declare const CURVANCE_FEE_BPS = 4n;
|
|
93
116
|
/** Curvance DAO fee receiver — same wallet used for protocol interest fees
|
|
94
|
-
* and existing Kuru aggregator referrer fees.
|
|
117
|
+
* and existing Kuru aggregator referrer fees. Must match
|
|
118
|
+
* centralRegistry.daoAddress() — the on-chain checker validates
|
|
119
|
+
* dynamically per-swap. If DAO permissions transfer on-chain without
|
|
120
|
+
* updating this constant, every swap reverts. */
|
|
95
121
|
export declare const CURVANCE_DAO_FEE_RECEIVER: address;
|
|
96
122
|
/** Token classification used by the optional category-tier override.
|
|
97
123
|
* Consumers provide their own classifier — the SDK does not currently
|
package/dist/feePolicy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feePolicy.d.ts","sourceRoot":"","sources":["../src/feePolicy.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG3C
|
|
1
|
+
{"version":3,"file":"feePolicy.d.ts","sourceRoot":"","sources":["../src/feePolicy.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoFG;AAEH,MAAM,MAAM,YAAY,GAClB,aAAa,GACb,eAAe,GACf,sBAAsB,GACtB,KAAK,CAAC;AAEZ,MAAM,WAAW,gBAAgB;IAC7B,iDAAiD;IACjD,SAAS,EAAE,YAAY,CAAC;IACxB,wEAAwE;IACxE,UAAU,EAAE,OAAO,CAAC;IACpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IACrB,mFAAmF;IACnF,WAAW,EAAE,MAAM,CAAC;IACpB,+DAA+D;IAC/D,eAAe,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,qCAAqC;IACrC,cAAc,EAAE,OAAO,GAAG,IAAI,CAAC;CAClC;AAED,MAAM,WAAW,SAAS;IACtB,uEAAuE;IACvE,SAAS,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,CAAC;IACzC;0DACsD;IACtD,WAAW,EAAE,OAAO,CAAC;CACxB;AAED;;;wEAGwE;AACxE,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;kDAIkD;AAClD,eAAO,MAAM,yBAAyB,EAAE,OACQ,CAAC;AAEjD;;sDAEsD;AACtD,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAChC,+DAA+D;IAC/D,GAAG,EAAE,MAAM,CAAC;IACZ,qCAAqC;IACrC,WAAW,EAAE,OAAO,CAAC;IACrB;gEAC4D;IAC5D,KAAK,EAAE,cAAc,CAAC;IACtB;;wCAEoC;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;6EAGyE;IACzE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,UAAU,GAAG,IAAI,CAAC;CACpD;AAID;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,SAAS,CA2DpE;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,EAAE,SAG1B,CAAC"}
|