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

4
contracts/asset-proxy/tsconfig.json
View File

@@ -36,7 +36,11 @@
"test/generated-artifacts/IDyDx.json",
=======
"test/generated-artifacts/IDydx.json",
<<<<<<< HEAD
>>>>>>> ee82a0f67... Consistent capitalization for "dydx"`
=======
"test/generated-artifacts/IDydxBridge.json",
>>>>>>> 5e2de489d... Updating bridge to work w/o MAP
"test/generated-artifacts/IERC20Bridge.json",
"test/generated-artifacts/IEth2Dai.json",
"test/generated-artifacts/IKyberNetworkProxy.json",