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

Always use DFB in asset-swapper (#2542)

Browse Source 
* Always use DFB in asset-swapper

* Clean up
This commit is contained in:
Jacob Evans
2020-04-09 15:52:15 +10:00
committed by GitHub
parent a80d1f861c
commit 0e196a59d9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/asset-swapper/src/utils/market_operation_utils/orders.ts
View File

@@ -169,7 +169,8 @@ export function createOrdersFromPath(path: Fill[], opts: CreateOrderFromPathOpts
} }
contiguousBridgeFills.push(collapsedPath[j]); contiguousBridgeFills.push(collapsedPath[j]);
} }
if (contiguousBridgeFills.length === 1 || !opts.shouldBatchBridgeOrders) { // Always use DexForwarderBridge unless configured not to
if (!opts.shouldBatchBridgeOrders) {
orders.push(createBridgeOrder(contiguousBridgeFills[0], opts)); orders.push(createBridgeOrder(contiguousBridgeFills[0], opts));
i += 1; i += 1;
} else { } else {

6
packages/asset-swapper/test/market_operation_utils_test.ts
View File

@@ -69,7 +69,11 @@ describe('MarketOperationUtils tests', () => {
if (assetData.length === 74) { if (assetData.length === 74) {
return ERC20BridgeSource.Native; return ERC20BridgeSource.Native;
} }
const bridgeAddress = hexUtils.slice(assetData, 48, 68).toLowerCase(); const bridgeData = assetDataUtils.decodeAssetDataOrThrow(assetData);
if (!assetDataUtils.isERC20BridgeAssetData(bridgeData)) {
throw new Error('AssetData is not ERC20BridgeAssetData');
}
const { bridgeAddress } = bridgeData;
switch (bridgeAddress) { switch (bridgeAddress) {
case KYBER_BRIDGE_ADDRESS.toLowerCase(): case KYBER_BRIDGE_ADDRESS.toLowerCase():
return ERC20BridgeSource.Kyber; return ERC20BridgeSource.Kyber;