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

Updating bridge to work w/o MultiAssetProxy

Browse Source
This commit is contained in:
Greg Hysen
2019-12-03 15:25:07 -08:00
parent 444125a7e1
commit f19f4310f4
6 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/asset-proxy/test/artifacts.ts
View File

@@ -25,7 +25,11 @@ import * as IChai from '../test/generated-artifacts/IChai.json';
import * as IDyDx from '../test/generated-artifacts/IDyDx.json';
=======
import * as IDydx from '../test/generated-artifacts/IDydx.json';
<<<<<<< HEAD
>>>>>>> ee82a0f67... Consistent capitalization for "dydx"`
=======
import * as IDydxBridge from '../test/generated-artifacts/IDydxBridge.json';
>>>>>>> 5e2de489d... Updating bridge to work w/o MAP
import * as IERC20Bridge from '../test/generated-artifacts/IERC20Bridge.json';
import * as IEth2Dai from '../test/generated-artifacts/IEth2Dai.json';
import * as IKyberNetworkProxy from '../test/generated-artifacts/IKyberNetworkProxy.json';
@@ -72,7 +76,11 @@ export const artifacts = {
IDyDx: IDyDx as ContractArtifact,
=======
IDydx: IDydx as ContractArtifact,
<<<<<<< HEAD
>>>>>>> ee82a0f67... Consistent capitalization for "dydx"`
=======
IDydxBridge: IDydxBridge as ContractArtifact,
>>>>>>> 5e2de489d... Updating bridge to work w/o MAP
IERC20Bridge: IERC20Bridge as ContractArtifact,
IEth2Dai: IEth2Dai as ContractArtifact,
IKyberNetworkProxy: IKyberNetworkProxy as ContractArtifact,

4
contracts/asset-proxy/test/wrappers.ts
View File

@@ -23,7 +23,11 @@ export * from '../test/generated-wrappers/i_chai';
export * from '../test/generated-wrappers/i_dy_dx';
=======
export * from '../test/generated-wrappers/i_dydx';
<<<<<<< HEAD
>>>>>>> ee82a0f67... Consistent capitalization for "dydx"`
=======
export * from '../test/generated-wrappers/i_dydx_bridge';
>>>>>>> 5e2de489d... Updating bridge to work w/o MAP
export * from '../test/generated-wrappers/i_erc20_bridge';
export * from '../test/generated-wrappers/i_eth2_dai';
export * from '../test/generated-wrappers/i_kyber_network_proxy';