crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'testftm' into ftm

Browse Source
This commit is contained in:
shawnxin89
2021-10-08 11:30:55 -07:00
parent 23571a0b84 eb464f0cef
commit 225907b359
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts
View File

@@ -392,9 +392,14 @@ export function getCurveLikeInfosForPair(
| ERC20BridgeSource.ACryptos, | ERC20BridgeSource.ACryptos,
): CurveDetailedInfo[] { ): CurveDetailedInfo[] {
let pools: CurveInfo[] = []; let pools: CurveInfo[] = [];
console.log("Inside 2", source);
switch (source) { switch (source) {
case ERC20BridgeSource.Curve: case ERC20BridgeSource.Curve:
pools = getCurveInfosForPair(chainId, takerToken, makerToken); pools = getCurveInfosForPair(chainId, takerToken, makerToken);
console.log("Inside 2 chainId", chainId);
console.log("Inside 2 pools", pools);
console.log("Inside 2 takerToken", takerToken);
console.log("Inside 2 makerToken", makerToken);
break; break;
case ERC20BridgeSource.CurveV2: case ERC20BridgeSource.CurveV2:
pools = getCurveV2InfosForPair(chainId, takerToken, makerToken); pools = getCurveV2InfosForPair(chainId, takerToken, makerToken);

22
packages/asset-swapper/src/utils/market_operation_utils/constants.ts
View File

@@ -450,12 +450,12 @@ export const AVALANCHE_TOKENS = {
export const FANTOM_TOKENS = { export const FANTOM_TOKENS = {
WFTM: '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83', WFTM: '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83',
WETH: '0x74b23882a30290451A17c44f4F05243b6b58C76d', WETH: '0x74b23882a30290451a17c44f4f05243b6b58c76d',
USDC: '0x04068DA6C83AFCFA0e13ba15A6696662335D5B75', USDC: '0x04068da6c83afcfa0e13ba15a6696662335d5b75',
DAI: '0x8d11ec38a3eb5e956b052f67da8bdc9bef8abf3e', DAI: '0x8d11ec38a3eb5e956b052f67da8bdc9bef8abf3e',
fUSDT: '0x049d68029688eabf473097a2fc38ef61633a3c7a', fUSDT: '0x049d68029688eabf473097a2fc38ef61633a3c7a',
WBTC: '0x321162Cd933E2Be498Cd2267a90534A804051b11', WBTC: '0x321162cd933e2be498cd2267a90534a804051b11',
renBTC: '0xDBf31dF14B66535aF65AaC99C32e9eA844e14501', renBTC: '0xdbf31df14b66535af65aac99c32e9ea844e14501',
}; };
export const CURVE_POOLS = { export const CURVE_POOLS = {
@@ -1002,20 +1002,20 @@ export const CURVE_V2_POLYGON_INFOS: { [name: string]: CurveInfo } = {
// TODO: modify gasSchedule // TODO: modify gasSchedule
export const CURVE_FANTOM_INFOS: { [name: string]: CurveInfo } = { export const CURVE_FANTOM_INFOS: { [name: string]: CurveInfo } = {
[CURVE_FANTOM_POOLS.ren]: createCurveExchangePool({ [CURVE_FANTOM_POOLS.ren]: createCurveExchangePool({
tokens: [FANTOM_TOKENS.renBTC, FANTOM_TOKENS.WBTC], tokens: [FANTOM_TOKENS.WBTC, FANTOM_TOKENS.renBTC],
pool: CURVE_FANTOM_POOLS.ren, pool: CURVE_FANTOM_POOLS.ren,
gasSchedule: 171e3, gasSchedule: 171e3,
}), }),
[CURVE_FANTOM_POOLS.twoPool]: createCurveExchangeUnderlyingPool({ [CURVE_FANTOM_POOLS.twoPool]: createCurveExchangePool({
tokens: [FANTOM_TOKENS.DAI, FANTOM_TOKENS.USDC], tokens: [FANTOM_TOKENS.DAI, FANTOM_TOKENS.USDC],
pool: CURVE_FANTOM_POOLS.twoPool, pool: CURVE_FANTOM_POOLS.twoPool,
gasSchedule: 587e3,
}),
[CURVE_FANTOM_POOLS.fUSDT]: createCurveExchangePool({
tokens: [FANTOM_TOKENS.DAI, FANTOM_TOKENS.USDC, FANTOM_TOKENS.fUSDT],
pool: CURVE_FANTOM_POOLS.fUSDT,
gasSchedule: 176e3, gasSchedule: 176e3,
}), }),
[CURVE_FANTOM_POOLS.fUSDT]: createCurveExchangeUnderlyingPool({
tokens: [FANTOM_TOKENS.fUSDT, FANTOM_TOKENS.DAI, FANTOM_TOKENS.USDC],
pool: CURVE_FANTOM_POOLS.fUSDT,
gasSchedule: 587e3,
}),
} }
export const CURVE_V2_FANTOM_INFOS: { [name: string]: CurveInfo } = { export const CURVE_V2_FANTOM_INFOS: { [name: string]: CurveInfo } = {

6
packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts
View File

@@ -1084,6 +1084,7 @@ export class SamplerOperations {
return this._createBatch( return this._createBatch(
subOps, subOps,
(samples: BigNumber[][]) => { (samples: BigNumber[][]) => {
console.log("Median", samples);
if (samples.length === 0) { if (samples.length === 0) {
return ZERO_AMOUNT; return ZERO_AMOUNT;
} }
@@ -1108,9 +1109,13 @@ export class SamplerOperations {
takerFillAmounts: BigNumber[], takerFillAmounts: BigNumber[],
): BatchedOperation<DexSample[][]> { ): BatchedOperation<DexSample[][]> {
const subOps = this._getSellQuoteOperations(sources, makerToken, takerToken, takerFillAmounts); const subOps = this._getSellQuoteOperations(sources, makerToken, takerToken, takerFillAmounts);
console.log(sources);
console.log(takerFillAmounts);
console.log("subOps", subOps);
return this._createBatch( return this._createBatch(
subOps, subOps,
(samples: BigNumber[][]) => { (samples: BigNumber[][]) => {
console.log("Sell", samples);
return subOps.map((op, i) => { return subOps.map((op, i) => {
return samples[i].map((output, j) => ({ return samples[i].map((output, j) => ({
source: op.source, source: op.source,
@@ -1166,6 +1171,7 @@ export class SamplerOperations {
if (isBadTokenForSource(makerToken, source) || isBadTokenForSource(takerToken, source)) { if (isBadTokenForSource(makerToken, source) || isBadTokenForSource(takerToken, source)) {
return []; return [];
} }
console.log("Inside", source);
switch (source) { switch (source) {
case ERC20BridgeSource.Eth2Dai: case ERC20BridgeSource.Eth2Dai:
return []; return [];

16
packages/contract-addresses/addresses.json
View File

@@ -406,17 +406,17 @@
"maximumGasPrice": "0x0000000000000000000000000000000000000000", "maximumGasPrice": "0x0000000000000000000000000000000000000000",
"dexForwarderBridge": "0x0000000000000000000000000000000000000000", "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
"exchangeProxyGovernor": "0xca7bab1b2d1ec7d81710b7f9e2ab4e6788930588", "exchangeProxyGovernor": "0xca7bab1b2d1ec7d81710b7f9e2ab4e6788930588",
"exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxy": "0xDEf1520C89538d9e43Aa273b7803a16F871d21e3",
"exchangeProxyTransformerDeployer": "0xa60b57833dce6260f4f2411c811755dd980bc0a7", "exchangeProxyTransformerDeployer": "0x47F01db18a38261E4cB153bAe6db7d3743AcB33c",
"exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498", "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
"exchangeProxyLiquidityProviderSandbox": "0x8953c63d0858d286cc407cd6f8e26b9cbd02a511", "exchangeProxyLiquidityProviderSandbox": "0xcA64D4225804F2Ae069760CB5fF2F1D8BaC1C2f9",
"zrxTreasury": "0x0000000000000000000000000000000000000000", "zrxTreasury": "0x0000000000000000000000000000000000000000",
"transformers": { "transformers": {
"wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c", "wethTransformer": "0x9b6aA8f26A92108e7d1F66373d757Bb955112703",
"payTakerTransformer": "0x898c6fde239d646c73f0a57e3570b6f86a3d62a3", "payTakerTransformer": "0x32dF54951D33D7460e15Fa59B1fCc262183ce4C2",
"affiliateFeeTransformer": "0x34617b855411e52fbc05899435f44cbd0503022c", "affiliateFeeTransformer": "0x67EfA679a4b56C38713d478e649C88247F4F8E88",
"fillQuoteTransformer": "0x8a5417dd7ffde61ec61e11b45797e16686e1d6b9", "fillQuoteTransformer": "0xa21ab090bE8BDE78dAB8FA47988aBbEDF361327A",
"positiveSlippageFeeTransformer": "0x470ba89da18a6db6e8a0567b3c9214b960861857" "positiveSlippageFeeTransformer": "0xe87D69b285005CC82b53B844322652C49ED64600"
} }
} }
} }