Merge pull request #2220 from 0xProject/feat/erc20-bridge/hello-world

ERC20BridgeProxy
2019-09-30 20:52:36 -04:00
parent 1b5fa15c8c 6da48be1a4
commit 2c8f7fac0e
18 changed files with 734 additions and 2 deletions
--- a/packages/types/CHANGELOG.json
+++ b/packages/types/CHANGELOG.json
@@ -13,6 +13,10 @@
            {
                "note": "Add status types for Staking contracts",
                "pr": 1910
+            },
+            {
+                "note": "Add `ERC20Bridge` to `AssetProxyId`",
+                "pr": 2220
            }
        ]
    },
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -158,6 +158,7 @@ export enum AssetProxyId {
    MultiAsset = '0x94cfcdd7',
    ERC1155 = '0xa7cb5fb7',
    StaticCall = '0xc339d10a',
+    ERC20Bridge = '0xdc1600f3',
 }

 export interface ERC20AssetData {