Publish

- @0x/contracts-erc20@3.3.29
 - @0x/contracts-test-utils@5.4.20
 - @0x/contracts-treasury@1.4.12
 - @0x/contracts-utils@4.8.10
 - @0x/contracts-zero-ex@0.32.0
 - @0x/asset-swapper@16.57.0
 - @0x/contract-addresses@6.13.0
 - @0x/contract-wrappers@13.20.1
 - @0x/migrations@8.1.18
 - @0x/protocol-utils@11.12.0

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
     build:
         resource_class: xlarge
         docker:
-            - image: node:12
+            - image: node:16
         environment:
             NODE_OPTIONS: '--max-old-space-size=16384'
         working_directory: ~/repo
@@ -19,7 +19,6 @@ jobs:
                   command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
             - setup_remote_docker
             - run: yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci
-            - run: yarn build:ts || yarn build:ts || yarn build:ts || yarn build:ts || yarn build:ts || yarn build:ts
             - save_cache:
                   key: repo-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
@@ -31,7 +30,7 @@ jobs:
     test-exchange-ganache:
         resource_class: medium+
         docker:
-            - image: node:12
+            - image: node:16
         working_directory: ~/repo
         steps:
             - restore_cache:
@@ -41,7 +40,7 @@ jobs:
     test-integrations-ganache:
         resource_class: medium+
         docker:
-            - image: node:12
+            - image: node:16
         working_directory: ~/repo
         steps:
             - restore_cache:
@@ -51,7 +50,7 @@ jobs:
     test-contracts-staking-ganache:
         resource_class: medium+
         docker:
-            - image: node:12
+            - image: node:16
         working_directory: ~/repo
         steps:
             - restore_cache:
@@ -61,7 +60,7 @@ jobs:
     test-contracts-extra-ganache:
         resource_class: medium+
         docker:
-            - image: node:12
+            - image: node:16
         working_directory: ~/repo
         steps:
             - restore_cache:
@@ -71,7 +70,7 @@ jobs:
     test-contracts-rest-ganache:
         resource_class: medium+
         docker:
-            - image: node:12
+            - image: node:16
         working_directory: ~/repo
         steps:
             - restore_cache:
@@ -83,7 +82,7 @@ jobs:
         environment:
             NODE_OPTIONS: '--max-old-space-size=6442'
         docker:
-            - image: node:12
+            - image: node:16
             - image: 0xorg/verdaccio
         working_directory: ~/repo
         steps:
@@ -97,7 +96,7 @@ jobs:
                   path: ~/.npm/_logs
     test-doc-generation:
         docker:
-            - image: node:12
+            - image: node:16
         working_directory: ~/repo
         steps:
             - restore_cache:
@@ -108,8 +107,10 @@ jobs:
                   no_output_timeout: 1200
     test-rest:
         docker:
-            - image: node:12
+            - image: node:16
         working_directory: ~/repo
+        environment:
+            RUST_ROUTER: "true"
         steps:
             - restore_cache:
                   keys:
@@ -136,7 +137,7 @@ jobs:
         resource_class: large
         working_directory: ~/repo
         docker:
-            - image: node:12
+            - image: node:16
         steps:
             - restore_cache:
                   keys:
@@ -147,7 +148,7 @@ jobs:
             - run: yarn diff_md_docs:ci
     submit-coverage:
         docker:
-            - image: node:12
+            - image: node:16
         working_directory: ~/repo
         steps:
             - restore_cache:

.github/workflows/publish.yml

@@ -28,7 +28,7 @@ jobs:
                 fetch-depth: 0
             - uses: actions/setup-node@v1
               with:
-                node-version: 10
+                node-version: 16
             - uses: actions/setup-python@v2
             - name: 'configure git'
               run: |

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,58 @@
 [
+    {
+        "timestamp": 1650611093,
+        "version": "3.3.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1648739346,
+        "version": "3.3.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1646225739,
+        "version": "3.3.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1645569128,
+        "version": "3.3.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1640364306,
+        "version": "3.3.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1638390144,
+        "version": "3.3.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1637102971,
         "version": "3.3.23",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,30 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.3.29 - _April 22, 2022_
+
+    * Dependencies updated
+
+## v3.3.28 - _March 31, 2022_
+
+    * Dependencies updated
+
+## v3.3.27 - _March 2, 2022_
+
+    * Dependencies updated
+
+## v3.3.26 - _February 22, 2022_
+
+    * Dependencies updated
+
+## v3.3.25 - _December 24, 2021_
+
+    * Dependencies updated
+
+## v3.3.24 - _December 1, 2021_
+
+    * Dependencies updated
+
 ## v3.3.23 - _November 16, 2021_
 
     * Dependencies updated

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.3.23",
+    "version": "3.3.29",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,18 +51,18 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.6.2",
-        "@0x/contracts-gen": "^2.0.40",
-        "@0x/contracts-test-utils": "^5.4.14",
-        "@0x/contracts-utils": "^4.8.4",
-        "@0x/dev-utils": "^4.2.9",
-        "@0x/sol-compiler": "^4.7.5",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contracts-gen": "^2.0.46",
+        "@0x/contracts-test-utils": "^5.4.20",
+        "@0x/contracts-utils": "^4.8.10",
+        "@0x/dev-utils": "^4.2.14",
+        "@0x/sol-compiler": "^4.8.1",
         "@0x/ts-doc-gen": "^0.0.28",
         "@0x/tslint-config": "^4.1.4",
-        "@0x/types": "^3.3.4",
-        "@0x/typescript-typings": "^5.2.1",
-        "@0x/utils": "^6.4.4",
-        "@0x/web3-wrapper": "^7.6.0",
+        "@0x/types": "^3.3.6",
+        "@0x/typescript-typings": "^5.3.1",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -70,7 +70,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.6.0",
+        "ethereum-types": "^3.7.0",
         "lodash": "^4.17.11",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
@@ -79,10 +79,10 @@
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "4.2.2"
+        "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.4.2",
+        "@0x/base-contract": "^6.5.0",
         "ethers": "~4.0.4"
     },
     "publishConfig": {

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,58 @@
 [
+    {
+        "timestamp": 1650611093,
+        "version": "5.4.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1648739346,
+        "version": "5.4.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1646225739,
+        "version": "5.4.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1645569128,
+        "version": "5.4.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1640364306,
+        "version": "5.4.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1638390144,
+        "version": "5.4.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1637102971,
         "version": "5.4.14",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,30 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.4.20 - _April 22, 2022_
+
+    * Dependencies updated
+
+## v5.4.19 - _March 31, 2022_
+
+    * Dependencies updated
+
+## v5.4.18 - _March 2, 2022_
+
+    * Dependencies updated
+
+## v5.4.17 - _February 22, 2022_
+
+    * Dependencies updated
+
+## v5.4.16 - _December 24, 2021_
+
+    * Dependencies updated
+
+## v5.4.15 - _December 1, 2021_
+
+    * Dependencies updated
+
 ## v5.4.14 - _November 16, 2021_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.4.14",
+    "version": "5.4.20",
     "engines": {
         "node": ">=6.12"
     },
@@ -34,28 +34,28 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils",
     "devDependencies": {
-        "@0x/sol-compiler": "^4.7.5",
+        "@0x/sol-compiler": "^4.8.1",
         "@0x/tslint-config": "^4.1.4",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
-        "typescript": "4.2.2"
+        "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.29",
-        "@0x/base-contract": "^6.4.2",
-        "@0x/contract-addresses": "^6.9.0",
-        "@0x/dev-utils": "^4.2.9",
-        "@0x/json-schemas": "^6.3.0",
+        "@0x/assert": "^3.0.34",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/contract-addresses": "^6.13.0",
+        "@0x/dev-utils": "^4.2.14",
+        "@0x/json-schemas": "^6.4.4",
         "@0x/order-utils": "^10.4.28",
-        "@0x/sol-coverage": "^4.0.39",
-        "@0x/sol-profiler": "^4.1.29",
-        "@0x/sol-trace": "^3.0.39",
-        "@0x/subproviders": "^6.6.0",
-        "@0x/types": "^3.3.4",
-        "@0x/typescript-typings": "^5.2.1",
-        "@0x/utils": "^6.4.4",
-        "@0x/web3-wrapper": "^7.6.0",
+        "@0x/sol-coverage": "^4.0.45",
+        "@0x/sol-profiler": "^4.1.35",
+        "@0x/sol-trace": "^3.0.45",
+        "@0x/subproviders": "^6.6.5",
+        "@0x/types": "^3.3.6",
+        "@0x/typescript-typings": "^5.3.1",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
         "@types/bn.js": "^4.11.0",
         "@types/js-combinatorics": "^0.5.29",
         "@types/lodash": "4.14.104",
@@ -67,7 +67,7 @@
         "chai-bignumber": "^3.0.0",
         "decimal.js": "^10.2.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.6.0",
+        "ethereum-types": "^3.7.0",
         "ethereumjs-util": "^7.0.10",
         "ethers": "~4.0.4",
         "js-combinatorics": "^0.5.3",

contracts/treasury/CHANGELOG.json

@@ -1,4 +1,58 @@
 [
+    {
+        "timestamp": 1650611093,
+        "version": "1.4.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1648739346,
+        "version": "1.4.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1646225739,
+        "version": "1.4.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1645569128,
+        "version": "1.4.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1640364306,
+        "version": "1.4.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1638390144,
+        "version": "1.4.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1637102971,
         "version": "1.4.6",

contracts/treasury/CHANGELOG.md

@@ -5,6 +5,30 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.4.12 - _April 22, 2022_
+
+    * Dependencies updated
+
+## v1.4.11 - _March 31, 2022_
+
+    * Dependencies updated
+
+## v1.4.10 - _March 2, 2022_
+
+    * Dependencies updated
+
+## v1.4.9 - _February 22, 2022_
+
+    * Dependencies updated
+
+## v1.4.8 - _December 24, 2021_
+
+    * Dependencies updated
+
+## v1.4.7 - _December 1, 2021_
+
+    * Dependencies updated
+
 ## v1.4.6 - _November 16, 2021_
 
     * Dependencies updated

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.6",
+    "version": "1.4.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -46,14 +46,14 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
-        "@0x/abi-gen": "^5.6.2",
-        "@0x/contract-addresses": "^6.9.0",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contract-addresses": "^6.13.0",
         "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.23",
-        "@0x/contracts-gen": "^2.0.40",
+        "@0x/contracts-erc20": "^3.3.29",
+        "@0x/contracts-gen": "^2.0.46",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.14",
-        "@0x/sol-compiler": "^4.7.5",
+        "@0x/contracts-test-utils": "^5.4.20",
+        "@0x/sol-compiler": "^4.8.1",
         "@0x/ts-doc-gen": "^0.0.28",
         "@0x/tslint-config": "^4.1.4",
         "@types/isomorphic-fetch": "^0.0.35",
@@ -69,17 +69,17 @@
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "4.2.2"
+        "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.4.2",
-        "@0x/protocol-utils": "^1.9.5",
-        "@0x/subproviders": "^6.6.0",
-        "@0x/types": "^3.3.4",
-        "@0x/typescript-typings": "^5.2.1",
-        "@0x/utils": "^6.4.4",
-        "@0x/web3-wrapper": "^7.6.0",
-        "ethereum-types": "^3.6.0",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/protocol-utils": "^11.12.0",
+        "@0x/subproviders": "^6.6.5",
+        "@0x/types": "^3.3.6",
+        "@0x/typescript-typings": "^5.3.1",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
+        "ethereum-types": "^3.7.0",
         "ethereumjs-util": "^7.0.10"
     },
     "publishConfig": {

contracts/utils/CHANGELOG.json

@@ -1,4 +1,58 @@
 [
+    {
+        "timestamp": 1650611093,
+        "version": "4.8.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1648739346,
+        "version": "4.8.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1646225739,
+        "version": "4.8.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1645569128,
+        "version": "4.8.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1640364306,
+        "version": "4.8.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1638390144,
+        "version": "4.8.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1637102971,
         "version": "4.8.4",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,30 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.8.10 - _April 22, 2022_
+
+    * Dependencies updated
+
+## v4.8.9 - _March 31, 2022_
+
+    * Dependencies updated
+
+## v4.8.8 - _March 2, 2022_
+
+    * Dependencies updated
+
+## v4.8.7 - _February 22, 2022_
+
+    * Dependencies updated
+
+## v4.8.6 - _December 24, 2021_
+
+    * Dependencies updated
+
+## v4.8.5 - _December 1, 2021_
+
+    * Dependencies updated
+
 ## v4.8.4 - _November 16, 2021_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.8.4",
+    "version": "4.8.10",
     "engines": {
         "node": ">=6.12"
     },
@@ -50,15 +50,15 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
     "devDependencies": {
-        "@0x/abi-gen": "^5.6.2",
-        "@0x/contracts-gen": "^2.0.40",
-        "@0x/contracts-test-utils": "^5.4.14",
-        "@0x/dev-utils": "^4.2.9",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contracts-gen": "^2.0.46",
+        "@0x/contracts-test-utils": "^5.4.20",
+        "@0x/dev-utils": "^4.2.14",
         "@0x/order-utils": "^10.4.28",
-        "@0x/sol-compiler": "^4.7.5",
+        "@0x/sol-compiler": "^4.8.1",
         "@0x/tslint-config": "^4.1.4",
-        "@0x/types": "^3.3.4",
-        "@0x/web3-wrapper": "^7.6.0",
+        "@0x/types": "^3.3.6",
+        "@0x/web3-wrapper": "^7.6.5",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -76,14 +76,14 @@
         "solhint": "^1.4.1",
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
-        "typescript": "4.2.2"
+        "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.4.2",
-        "@0x/typescript-typings": "^5.2.1",
-        "@0x/utils": "^6.4.4",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/typescript-typings": "^5.3.1",
+        "@0x/utils": "^6.5.3",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^3.6.0"
+        "ethereum-types": "^3.7.0"
     },
     "publishConfig": {
         "access": "public"

contracts/zero-ex/CHANGELOG.json

@@ -1,4 +1,61 @@
 [
+    {
+        "version": "0.32.0",
+        "changes": [
+            {
+                "note": "Add support for `BalancerV2Batch` fills in FQT",
+                "pr": 462
+            }
+        ],
+        "timestamp": 1650611093
+    },
+    {
+        "timestamp": 1648739346,
+        "version": "0.31.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1646225739,
+        "version": "0.31.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.31.0",
+        "changes": [
+            {
+                "note": "Add ERC721OrdersFeature, ERC1155OrdersFeature, and ERC165Feature",
+                "pr": 429
+            }
+        ],
+        "timestamp": 1645569128
+    },
+    {
+        "timestamp": 1640364306,
+        "version": "0.30.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.30.0",
+        "changes": [
+            {
+                "note": "Add `AaveV2` and `Compound` deposit/withdrawal liquidity source",
+                "pr": 321
+            }
+        ],
+        "timestamp": 1638390144
+    },
     {
         "timestamp": 1637102971,
         "version": "0.29.5",

contracts/zero-ex/CHANGELOG.md

@@ -5,6 +5,30 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.32.0 - _April 22, 2022_
+
+    * Add support for `BalancerV2Batch` fills in FQT (#462)
+
+## v0.31.2 - _March 31, 2022_
+
+    * Dependencies updated
+
+## v0.31.1 - _March 2, 2022_
+
+    * Dependencies updated
+
+## v0.31.0 - _February 22, 2022_
+
+    * Add ERC721OrdersFeature, ERC1155OrdersFeature, and ERC165Feature (#429)
+
+## v0.30.1 - _December 24, 2021_
+
+    * Dependencies updated
+
+## v0.30.0 - _December 1, 2021_
+
+    * Add `AaveV2` and `Compound` deposit/withdrawal liquidity source (#321)
+
 ## v0.29.5 - _November 16, 2021_
 
     * Dependencies updated

contracts/zero-ex/contracts/src/IZeroEx.sol

@@ -34,6 +34,9 @@ import "./features/interfaces/IBatchFillNativeOrdersFeature.sol";
 import "./features/interfaces/IMultiplexFeature.sol";
 import "./features/interfaces/IOtcOrdersFeature.sol";
 import "./features/interfaces/IFundRecoveryFeature.sol";
+import "./features/interfaces/IERC721OrdersFeature.sol";
+import "./features/interfaces/IERC1155OrdersFeature.sol";
+import "./features/interfaces/IERC165Feature.sol";
 
 
 /// @dev Interface for a fully featured Exchange Proxy.
@@ -50,7 +53,10 @@ interface IZeroEx is
     IBatchFillNativeOrdersFeature,
     IMultiplexFeature,
     IOtcOrdersFeature,
-    IFundRecoveryFeature
+    IFundRecoveryFeature,
+    IERC721OrdersFeature,
+    IERC1155OrdersFeature,
+    IERC165Feature
 {
     // solhint-disable state-visibility
 

contracts/zero-ex/contracts/src/errors/LibNFTOrdersRichErrors.sol

@@ -0,0 +1,229 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+
+
+library LibNFTOrdersRichErrors {
+
+    // solhint-disable func-name-mixedcase
+
+    function OverspentEthError(
+        uint256 ethSpent,
+        uint256 ethAvailable
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OverspentEthError(uint256,uint256)")),
+            ethSpent,
+            ethAvailable
+        );
+    }
+
+    function InsufficientEthError(
+        uint256 ethAvailable,
+        uint256 orderAmount
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("InsufficientEthError(uint256,uint256)")),
+            ethAvailable,
+            orderAmount
+        );
+    }
+
+    function ERC721TokenMismatchError(
+        address token1,
+        address token2
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("ERC721TokenMismatchError(address,address)")),
+            token1,
+            token2
+        );
+    }
+
+    function ERC1155TokenMismatchError(
+        address token1,
+        address token2
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("ERC1155TokenMismatchError(address,address)")),
+            token1,
+            token2
+        );
+    }
+
+    function ERC20TokenMismatchError(
+        address token1,
+        address token2
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("ERC20TokenMismatchError(address,address)")),
+            token1,
+            token2
+        );
+    }
+
+    function NegativeSpreadError(
+        uint256 sellOrderAmount,
+        uint256 buyOrderAmount
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("NegativeSpreadError(uint256,uint256)")),
+            sellOrderAmount,
+            buyOrderAmount
+        );
+    }
+
+    function SellOrderFeesExceedSpreadError(
+        uint256 sellOrderFees,
+        uint256 spread
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("SellOrderFeesExceedSpreadError(uint256,uint256)")),
+            sellOrderFees,
+            spread
+        );
+    }
+
+    function OnlyTakerError(
+        address sender,
+        address taker
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OnlyTakerError(address,address)")),
+            sender,
+            taker
+        );
+    }
+
+    function InvalidSignerError(
+        address maker,
+        address signer
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("InvalidSignerError(address,address)")),
+            maker,
+            signer
+        );
+    }
+
+    function OrderNotFillableError(
+        address maker,
+        uint256 nonce,
+        uint8 orderStatus
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OrderNotFillableError(address,uint256,uint8)")),
+            maker,
+            nonce,
+            orderStatus
+        );
+    }
+
+    function TokenIdMismatchError(
+        uint256 tokenId,
+        uint256 orderTokenId
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("TokenIdMismatchError(uint256,uint256)")),
+            tokenId,
+            orderTokenId
+        );
+    }
+
+    function PropertyValidationFailedError(
+        address propertyValidator,
+        address token,
+        uint256 tokenId,
+        bytes memory propertyData,
+        bytes memory errorData
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("PropertyValidationFailedError(address,address,uint256,bytes,bytes)")),
+            propertyValidator,
+            token,
+            tokenId,
+            propertyData,
+            errorData
+        );
+    }
+
+    function ExceedsRemainingOrderAmount(
+        uint128 remainingOrderAmount,
+        uint128 fillAmount
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("ExceedsRemainingOrderAmount(uint128,uint128)")),
+            remainingOrderAmount,
+            fillAmount
+        );
+    }
+}

contracts/zero-ex/contracts/src/features/ERC165Feature.sol

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2022 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "../fixins/FixinCommon.sol";
+import "./interfaces/IFeature.sol";
+
+
+/// @dev Implements the ERC165 `supportsInterface` function
+contract ERC165Feature is
+    IFeature,
+    FixinCommon
+{
+    /// @dev Name of this feature.
+    string public constant override FEATURE_NAME = "ERC165";
+    /// @dev Version of this feature.
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 0);
+
+    /// @dev Indicates whether the 0x Exchange Proxy implements a particular
+    ///      ERC165 interface. This function should use at most 30,000 gas.
+    /// @param interfaceId The interface identifier, as specified in ERC165.
+    /// @return isSupported Whether the given interface is supported by the
+    ///         0x Exchange Proxy.
+    function supportInterface(bytes4 interfaceId)
+        external
+        pure
+        returns (bool isSupported)
+    {
+        return interfaceId == 0x01ffc9a7 || // ERC-165 support
+               interfaceId == 0x150b7a02 || // ERC-721 `ERC721TokenReceiver` support
+               interfaceId == 0x4e2312e0;   // ERC-1155 `ERC1155TokenReceiver` support
+    }
+}

contracts/zero-ex/contracts/src/features/OtcOrdersFeature.sol

@@ -311,7 +311,7 @@ contract OtcOrdersFeature is
         // Unwrap WETH
         WETH.withdraw(order.makerAmount);
         // Transfer ETH to taker
-        _transferEth(taker, order.makerAmount);
+        _transferEth(payable(taker), order.makerAmount);
 
         emit OtcOrderFilled(
             orderInfo.orderHash,
@@ -622,16 +622,4 @@ contract OtcOrdersFeature is
             [txOrigin]
             [nonceBucket];
     }
-
-    function _transferEth(address recipient, uint256 amount)
-        private
-    {
-        // Transfer ETH to recipient
-        (bool success, bytes memory revertData) =
-            recipient.call{value: amount}("");
-        // Revert on failure
-        if (!success) {
-            revertData.rrevert();
-        }
-    }
 }

contracts/zero-ex/contracts/src/features/interfaces/IERC1155OrdersFeature.sol

@@ -0,0 +1,242 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "../libs/LibNFTOrder.sol";
+import "../libs/LibSignature.sol";
+import "../../vendor/IERC1155Token.sol";
+
+
+/// @dev Feature for interacting with ERC1155 orders.
+interface IERC1155OrdersFeature {
+
+    /// @dev Emitted whenever an `ERC1155Order` is filled.
+    /// @param direction Whether the order is selling or
+    ///        buying the ERC1155 token.
+    /// @param maker The maker of the order.
+    /// @param taker The taker of the order.
+    /// @param nonce The unique maker nonce in the order.
+    /// @param erc20Token The address of the ERC20 token.
+    /// @param erc20FillAmount The amount of ERC20 token filled.
+    /// @param erc1155Token The address of the ERC1155 token.
+    /// @param erc1155TokenId The ID of the ERC1155 asset.
+    /// @param erc1155FillAmount The amount of ERC1155 asset filled.
+    /// @param matcher Currently unused.
+    event ERC1155OrderFilled(
+        LibNFTOrder.TradeDirection direction,
+        address maker,
+        address taker,
+        uint256 nonce,
+        IERC20TokenV06 erc20Token,
+        uint256 erc20FillAmount,
+        IERC1155Token erc1155Token,
+        uint256 erc1155TokenId,
+        uint128 erc1155FillAmount,
+        address matcher
+    );
+
+    /// @dev Emitted whenever an `ERC1155Order` is cancelled.
+    /// @param maker The maker of the order.
+    /// @param nonce The nonce of the order that was cancelled.
+    event ERC1155OrderCancelled(
+        address maker,
+        uint256 nonce
+    );
+
+    /// @dev Emitted when an `ERC1155Order` is pre-signed.
+    ///      Contains all the fields of the order.
+    event ERC1155OrderPreSigned(
+        LibNFTOrder.TradeDirection direction,
+        address maker,
+        address taker,
+        uint256 expiry,
+        uint256 nonce,
+        IERC20TokenV06 erc20Token,
+        uint256 erc20TokenAmount,
+        LibNFTOrder.Fee[] fees,
+        IERC1155Token erc1155Token,
+        uint256 erc1155TokenId,
+        LibNFTOrder.Property[] erc1155TokenProperties,
+        uint128 erc1155TokenAmount
+    );
+
+    /// @dev Sells an ERC1155 asset to fill the given order.
+    /// @param buyOrder The ERC1155 buy order.
+    /// @param signature The order signature from the maker.
+    /// @param erc1155TokenId The ID of the ERC1155 asset being
+    ///        sold. If the given order specifies properties,
+    ///        the asset must satisfy those properties. Otherwise,
+    ///        it must equal the tokenId in the order.
+    /// @param erc1155SellAmount The amount of the ERC1155 asset
+    ///        to sell.
+    /// @param unwrapNativeToken If this parameter is true and the
+    ///        ERC20 token of the order is e.g. WETH, unwraps the
+    ///        token before transferring it to the taker.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC1155OrderCallback` on `msg.sender` after
+    ///        the ERC20 tokens have been transferred to `msg.sender`
+    ///        but before transferring the ERC1155 asset to the buyer.
+    function sellERC1155(
+        LibNFTOrder.ERC1155Order calldata buyOrder,
+        LibSignature.Signature calldata signature,
+        uint256 erc1155TokenId,
+        uint128 erc1155SellAmount,
+        bool unwrapNativeToken,
+        bytes calldata callbackData
+    )
+        external;
+
+    /// @dev Buys an ERC1155 asset by filling the given order.
+    /// @param sellOrder The ERC1155 sell order.
+    /// @param signature The order signature.
+    /// @param erc1155BuyAmount The amount of the ERC1155 asset
+    ///        to buy.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC1155OrderCallback` on `msg.sender` after
+    ///        the ERC1155 asset has been transferred to `msg.sender`
+    ///        but before transferring the ERC20 tokens to the seller.
+    ///        Native tokens acquired during the callback can be used
+    ///        to fill the order.
+    function buyERC1155(
+        LibNFTOrder.ERC1155Order calldata sellOrder,
+        LibSignature.Signature calldata signature,
+        uint128 erc1155BuyAmount,
+        bytes calldata callbackData
+    )
+        external
+        payable;
+
+    /// @dev Cancel a single ERC1155 order by its nonce. The caller
+    ///      should be the maker of the order. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonce The order nonce.
+    function cancelERC1155Order(uint256 orderNonce)
+        external;
+
+    /// @dev Cancel multiple ERC1155 orders by their nonces. The caller
+    ///      should be the maker of the orders. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonces The order nonces.
+    function batchCancelERC1155Orders(uint256[] calldata orderNonces)
+        external;
+
+    /// @dev Buys multiple ERC1155 assets by filling the
+    ///      given orders.
+    /// @param sellOrders The ERC1155 sell orders.
+    /// @param signatures The order signatures.
+    /// @param erc1155TokenAmounts The amounts of the ERC1155 assets
+    ///        to buy for each order.
+    /// @param callbackData The data (if any) to pass to the taker
+    ///        callback for each order. Refer to the `callbackData`
+    ///        parameter to for `buyERC1155`.
+    /// @param revertIfIncomplete If true, reverts if this
+    ///        function fails to fill any individual order.
+    /// @return successes An array of booleans corresponding to whether
+    ///         each order in `orders` was successfully filled.
+    function batchBuyERC1155s(
+        LibNFTOrder.ERC1155Order[] calldata sellOrders,
+        LibSignature.Signature[] calldata signatures,
+        uint128[] calldata erc1155TokenAmounts,
+        bytes[] calldata callbackData,
+        bool revertIfIncomplete
+    )
+        external
+        payable
+        returns (bool[] memory successes);
+
+    /// @dev Callback for the ERC1155 `safeTransferFrom` function.
+    ///      This callback can be used to sell an ERC1155 asset if
+    ///      a valid ERC1155 order, signature and `unwrapNativeToken`
+    ///      are encoded in `data`. This allows takers to sell their
+    ///      ERC1155 asset without first calling `setApprovalForAll`.
+    /// @param operator The address which called `safeTransferFrom`.
+    /// @param from The address which previously owned the token.
+    /// @param tokenId The ID of the asset being transferred.
+    /// @param value The amount being transferred.
+    /// @param data Additional data with no specified format. If a
+    ///        valid ERC1155 order, signature and `unwrapNativeToken`
+    ///        are encoded in `data`, this function will try to fill
+    ///        the order using the received asset.
+    /// @return success The selector of this function (0xf23a6e61),
+    ///         indicating that the callback succeeded.
+    function onERC1155Received(
+        address operator,
+        address from,
+        uint256 tokenId,
+        uint256 value,
+        bytes calldata data
+    )
+        external
+        returns (bytes4 success);
+
+    /// @dev Approves an ERC1155 order on-chain. After pre-signing
+    ///      the order, the `PRESIGNED` signature type will become
+    ///      valid for that order and signer.
+    /// @param order An ERC1155 order.
+    function preSignERC1155Order(LibNFTOrder.ERC1155Order calldata order)
+        external;
+
+    /// @dev Checks whether the given signature is valid for the
+    ///      the given ERC1155 order. Reverts if not.
+    /// @param order The ERC1155 order.
+    /// @param signature The signature to validate.
+    function validateERC1155OrderSignature(
+        LibNFTOrder.ERC1155Order calldata order,
+        LibSignature.Signature calldata signature
+    )
+        external
+        view;
+
+    /// @dev If the given order is buying an ERC1155 asset, checks
+    ///      whether or not the given token ID satisfies the required
+    ///      properties specified in the order. If the order does not
+    ///      specify any properties, this function instead checks
+    ///      whether the given token ID matches the ID in the order.
+    ///      Reverts if any checks fail, or if the order is selling
+    ///      an ERC1155 asset.
+    /// @param order The ERC1155 order.
+    /// @param erc1155TokenId The ID of the ERC1155 asset.
+    function validateERC1155OrderProperties(
+        LibNFTOrder.ERC1155Order calldata order,
+        uint256 erc1155TokenId
+    )
+        external
+        view;
+
+    /// @dev Get the order info for an ERC1155 order.
+    /// @param order The ERC1155 order.
+    /// @return orderInfo Infor about the order.
+    function getERC1155OrderInfo(LibNFTOrder.ERC1155Order calldata order)
+        external
+        view
+        returns (LibNFTOrder.OrderInfo memory orderInfo);
+
+    /// @dev Get the EIP-712 hash of an ERC1155 order.
+    /// @param order The ERC1155 order.
+    /// @return orderHash The order hash.
+    function getERC1155OrderHash(LibNFTOrder.ERC1155Order calldata order)
+        external
+        view
+        returns (bytes32 orderHash);
+}

contracts/zero-ex/contracts/src/features/interfaces/IERC165Feature.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2022 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+
+/// @dev Implements the ERC165 `supportsInterface` function
+interface IERC165Feature {
+
+    /// @dev Indicates whether the 0x Exchange Proxy implements a particular
+    ///      ERC165 interface. This function should use at most 30,000 gas.
+    /// @param interfaceId The interface identifier, as specified in ERC165.
+    /// @return isSupported Whether the given interface is supported by the
+    ///         0x Exchange Proxy.
+    function supportInterface(bytes4 interfaceId)
+        external
+        pure
+        returns (bool isSupported);
+}

contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol

@@ -0,0 +1,286 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "../libs/LibNFTOrder.sol";
+import "../libs/LibSignature.sol";
+import "../../vendor/IERC721Token.sol";
+
+
+/// @dev Feature for interacting with ERC721 orders.
+interface IERC721OrdersFeature {
+
+    /// @dev Emitted whenever an `ERC721Order` is filled.
+    /// @param direction Whether the order is selling or
+    ///        buying the ERC721 token.
+    /// @param maker The maker of the order.
+    /// @param taker The taker of the order.
+    /// @param nonce The unique maker nonce in the order.
+    /// @param erc20Token The address of the ERC20 token.
+    /// @param erc20TokenAmount The amount of ERC20 token
+    ///        to sell or buy.
+    /// @param erc721Token The address of the ERC721 token.
+    /// @param erc721TokenId The ID of the ERC721 asset.
+    /// @param matcher If this order was matched with another using `matchERC721Orders()`,
+    ///                this will be the address of the caller. If not, this will be `address(0)`.
+    event ERC721OrderFilled(
+        LibNFTOrder.TradeDirection direction,
+        address maker,
+        address taker,
+        uint256 nonce,
+        IERC20TokenV06 erc20Token,
+        uint256 erc20TokenAmount,
+        IERC721Token erc721Token,
+        uint256 erc721TokenId,
+        address matcher
+    );
+
+    /// @dev Emitted whenever an `ERC721Order` is cancelled.
+    /// @param maker The maker of the order.
+    /// @param nonce The nonce of the order that was cancelled.
+    event ERC721OrderCancelled(
+        address maker,
+        uint256 nonce
+    );
+
+    /// @dev Emitted when an `ERC721Order` is pre-signed.
+    ///      Contains all the fields of the order.
+    event ERC721OrderPreSigned(
+        LibNFTOrder.TradeDirection direction,
+        address maker,
+        address taker,
+        uint256 expiry,
+        uint256 nonce,
+        IERC20TokenV06 erc20Token,
+        uint256 erc20TokenAmount,
+        LibNFTOrder.Fee[] fees,
+        IERC721Token erc721Token,
+        uint256 erc721TokenId,
+        LibNFTOrder.Property[] erc721TokenProperties
+    );
+
+    /// @dev Sells an ERC721 asset to fill the given order.
+    /// @param buyOrder The ERC721 buy order.
+    /// @param signature The order signature from the maker.
+    /// @param erc721TokenId The ID of the ERC721 asset being
+    ///        sold. If the given order specifies properties,
+    ///        the asset must satisfy those properties. Otherwise,
+    ///        it must equal the tokenId in the order.
+    /// @param unwrapNativeToken If this parameter is true and the
+    ///        ERC20 token of the order is e.g. WETH, unwraps the
+    ///        token before transferring it to the taker.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC721OrderCallback` on `msg.sender` after
+    ///        the ERC20 tokens have been transferred to `msg.sender`
+    ///        but before transferring the ERC721 asset to the buyer.
+    function sellERC721(
+        LibNFTOrder.ERC721Order calldata buyOrder,
+        LibSignature.Signature calldata signature,
+        uint256 erc721TokenId,
+        bool unwrapNativeToken,
+        bytes calldata callbackData
+    )
+        external;
+
+    /// @dev Buys an ERC721 asset by filling the given order.
+    /// @param sellOrder The ERC721 sell order.
+    /// @param signature The order signature.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC721OrderCallback` on `msg.sender` after
+    ///        the ERC721 asset has been transferred to `msg.sender`
+    ///        but before transferring the ERC20 tokens to the seller.
+    ///        Native tokens acquired during the callback can be used
+    ///        to fill the order.
+    function buyERC721(
+        LibNFTOrder.ERC721Order calldata sellOrder,
+        LibSignature.Signature calldata signature,
+        bytes calldata callbackData
+    )
+        external
+        payable;
+
+    /// @dev Cancel a single ERC721 order by its nonce. The caller
+    ///      should be the maker of the order. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonce The order nonce.
+    function cancelERC721Order(uint256 orderNonce)
+        external;
+
+    /// @dev Cancel multiple ERC721 orders by their nonces. The caller
+    ///      should be the maker of the orders. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonces The order nonces.
+    function batchCancelERC721Orders(uint256[] calldata orderNonces)
+        external;
+
+    /// @dev Buys multiple ERC721 assets by filling the
+    ///      given orders.
+    /// @param sellOrders The ERC721 sell orders.
+    /// @param signatures The order signatures.
+    /// @param callbackData The data (if any) to pass to the taker
+    ///        callback for each order. Refer to the `callbackData`
+    ///        parameter to for `buyERC721`.
+    /// @param revertIfIncomplete If true, reverts if this
+    ///        function fails to fill any individual order.
+    /// @return successes An array of booleans corresponding to whether
+    ///         each order in `orders` was successfully filled.
+    function batchBuyERC721s(
+        LibNFTOrder.ERC721Order[] calldata sellOrders,
+        LibSignature.Signature[] calldata signatures,
+        bytes[] calldata callbackData,
+        bool revertIfIncomplete
+    )
+        external
+        payable
+        returns (bool[] memory successes);
+
+    /// @dev Matches a pair of complementary orders that have
+    ///      a non-negative spread. Each order is filled at
+    ///      their respective price, and the matcher receives
+    ///      a profit denominated in the ERC20 token.
+    /// @param sellOrder Order selling an ERC721 asset.
+    /// @param buyOrder Order buying an ERC721 asset.
+    /// @param sellOrderSignature Signature for the sell order.
+    /// @param buyOrderSignature Signature for the buy order.
+    /// @return profit The amount of profit earned by the caller
+    ///         of this function (denominated in the ERC20 token
+    ///         of the matched orders).
+    function matchERC721Orders(
+        LibNFTOrder.ERC721Order calldata sellOrder,
+        LibNFTOrder.ERC721Order calldata buyOrder,
+        LibSignature.Signature calldata sellOrderSignature,
+        LibSignature.Signature calldata buyOrderSignature
+    )
+        external
+        returns (uint256 profit);
+
+    /// @dev Matches pairs of complementary orders that have
+    ///      non-negative spreads. Each order is filled at
+    ///      their respective price, and the matcher receives
+    ///      a profit denominated in the ERC20 token.
+    /// @param sellOrders Orders selling ERC721 assets.
+    /// @param buyOrders Orders buying ERC721 assets.
+    /// @param sellOrderSignatures Signatures for the sell orders.
+    /// @param buyOrderSignatures Signatures for the buy orders.
+    /// @return profits The amount of profit earned by the caller
+    ///         of this function for each pair of matched orders
+    ///         (denominated in the ERC20 token of the order pair).
+    /// @return successes An array of booleans corresponding to
+    ///         whether each pair of orders was successfully matched.
+    function batchMatchERC721Orders(
+        LibNFTOrder.ERC721Order[] calldata sellOrders,
+        LibNFTOrder.ERC721Order[] calldata buyOrders,
+        LibSignature.Signature[] calldata sellOrderSignatures,
+        LibSignature.Signature[] calldata buyOrderSignatures
+    )
+        external
+        returns (uint256[] memory profits, bool[] memory successes);
+
+    /// @dev Callback for the ERC721 `safeTransferFrom` function.
+    ///      This callback can be used to sell an ERC721 asset if
+    ///      a valid ERC721 order, signature and `unwrapNativeToken`
+    ///      are encoded in `data`. This allows takers to sell their
+    ///      ERC721 asset without first calling `setApprovalForAll`.
+    /// @param operator The address which called `safeTransferFrom`.
+    /// @param from The address which previously owned the token.
+    /// @param tokenId The ID of the asset being transferred.
+    /// @param data Additional data with no specified format. If a
+    ///        valid ERC721 order, signature and `unwrapNativeToken`
+    ///        are encoded in `data`, this function will try to fill
+    ///        the order using the received asset.
+    /// @return success The selector of this function (0x150b7a02),
+    ///         indicating that the callback succeeded.
+    function onERC721Received(
+        address operator,
+        address from,
+        uint256 tokenId,
+        bytes calldata data
+    )
+        external
+        returns (bytes4 success);
+
+    /// @dev Approves an ERC721 order on-chain. After pre-signing
+    ///      the order, the `PRESIGNED` signature type will become
+    ///      valid for that order and signer.
+    /// @param order An ERC721 order.
+    function preSignERC721Order(LibNFTOrder.ERC721Order calldata order)
+        external;
+
+    /// @dev Checks whether the given signature is valid for the
+    ///      the given ERC721 order. Reverts if not.
+    /// @param order The ERC721 order.
+    /// @param signature The signature to validate.
+    function validateERC721OrderSignature(
+        LibNFTOrder.ERC721Order calldata order,
+        LibSignature.Signature calldata signature
+    )
+        external
+        view;
+
+    /// @dev If the given order is buying an ERC721 asset, checks
+    ///      whether or not the given token ID satisfies the required
+    ///      properties specified in the order. If the order does not
+    ///      specify any properties, this function instead checks
+    ///      whether the given token ID matches the ID in the order.
+    ///      Reverts if any checks fail, or if the order is selling
+    ///      an ERC721 asset.
+    /// @param order The ERC721 order.
+    /// @param erc721TokenId The ID of the ERC721 asset.
+    function validateERC721OrderProperties(
+        LibNFTOrder.ERC721Order calldata order,
+        uint256 erc721TokenId
+    )
+        external
+        view;
+
+    /// @dev Get the current status of an ERC721 order.
+    /// @param order The ERC721 order.
+    /// @return status The status of the order.
+    function getERC721OrderStatus(LibNFTOrder.ERC721Order calldata order)
+        external
+        view
+        returns (LibNFTOrder.OrderStatus status);
+
+    /// @dev Get the EIP-712 hash of an ERC721 order.
+    /// @param order The ERC721 order.
+    /// @return orderHash The order hash.
+    function getERC721OrderHash(LibNFTOrder.ERC721Order calldata order)
+        external
+        view
+        returns (bytes32 orderHash);
+
+    /// @dev Get the order status bit vector for the given
+    ///      maker address and nonce range.
+    /// @param maker The maker of the order.
+    /// @param nonceRange Order status bit vectors are indexed
+    ///        by maker address and the upper 248 bits of the
+    ///        order nonce. We define `nonceRange` to be these
+    ///        248 bits.
+    /// @return bitVector The order status bit vector for the
+    ///         given maker and nonce range.
+    function getERC721OrderStatusBitVector(address maker, uint248 nonceRange)
+        external
+        view
+        returns (uint256 bitVector);
+}

contracts/zero-ex/contracts/src/features/libs/LibNFTOrder.sol

@@ -0,0 +1,459 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "../../vendor/IERC1155Token.sol";
+import "../../vendor/IERC721Token.sol";
+import "../../vendor/IPropertyValidator.sol";
+
+
+/// @dev A library for common NFT order operations.
+library LibNFTOrder {
+
+    enum OrderStatus {
+        INVALID,
+        FILLABLE,
+        UNFILLABLE,
+        EXPIRED
+    }
+
+    enum TradeDirection {
+        SELL_NFT,
+        BUY_NFT
+    }
+
+    struct Property {
+        IPropertyValidator propertyValidator;
+        bytes propertyData;
+    }
+
+    struct Fee {
+        address recipient;
+        uint256 amount;
+        bytes feeData;
+    }
+
+    // "Base struct" for ERC721Order and ERC1155, used
+    // by the abstract contract `NFTOrders`.
+    struct NFTOrder {
+        TradeDirection direction;
+        address maker;
+        address taker;
+        uint256 expiry;
+        uint256 nonce;
+        IERC20TokenV06 erc20Token;
+        uint256 erc20TokenAmount;
+        Fee[] fees;
+        address nft;
+        uint256 nftId;
+        Property[] nftProperties;
+    }
+
+    // All fields align with those of NFTOrder
+    struct ERC721Order {
+        TradeDirection direction;
+        address maker;
+        address taker;
+        uint256 expiry;
+        uint256 nonce;
+        IERC20TokenV06 erc20Token;
+        uint256 erc20TokenAmount;
+        Fee[] fees;
+        IERC721Token erc721Token;
+        uint256 erc721TokenId;
+        Property[] erc721TokenProperties;
+    }
+
+    // All fields except `erc1155TokenAmount` align
+    // with those of NFTOrder
+    struct ERC1155Order {
+        TradeDirection direction;
+        address maker;
+        address taker;
+        uint256 expiry;
+        uint256 nonce;
+        IERC20TokenV06 erc20Token;
+        uint256 erc20TokenAmount;
+        Fee[] fees;
+        IERC1155Token erc1155Token;
+        uint256 erc1155TokenId;
+        Property[] erc1155TokenProperties;
+        // End of fields shared with NFTOrder
+        uint128 erc1155TokenAmount;
+    }
+
+    struct OrderInfo {
+        bytes32 orderHash;
+        OrderStatus status;
+        // `orderAmount` is 1 for all ERC721Orders, and
+        // `erc1155TokenAmount` for ERC1155Orders.
+        uint128 orderAmount;
+        // The remaining amount of the ERC721/ERC1155 asset
+        // that can be filled for the order.
+        uint128 remainingAmount;
+    }
+
+    // The type hash for ERC721 orders, which is:
+    // keccak256(abi.encodePacked(
+    //     "ERC721Order(",
+    //       "uint8 direction,",
+    //       "address maker,",
+    //       "address taker,",
+    //       "uint256 expiry,",
+    //       "uint256 nonce,",
+    //       "address erc20Token,",
+    //       "uint256 erc20TokenAmount,",
+    //       "Fee[] fees,",
+    //       "address erc721Token,",
+    //       "uint256 erc721TokenId,",
+    //       "Property[] erc721TokenProperties",
+    //     ")",
+    //     "Fee(",
+    //       "address recipient,",
+    //       "uint256 amount,",
+    //       "bytes feeData",
+    //     ")",
+    //     "Property(",
+    //       "address propertyValidator,",
+    //       "bytes propertyData",
+    //     ")"
+    // ))
+    uint256 private constant _ERC_721_ORDER_TYPEHASH =
+        0x2de32b2b090da7d8ab83ca4c85ba2eb6957bc7f6c50cb4ae1995e87560d808ed;
+
+    // The type hash for ERC1155 orders, which is:
+    // keccak256(abi.encodePacked(
+    //     "ERC1155Order(",
+    //       "uint8 direction,",
+    //       "address maker,",
+    //       "address taker,",
+    //       "uint256 expiry,",
+    //       "uint256 nonce,",
+    //       "address erc20Token,",
+    //       "uint256 erc20TokenAmount,",
+    //       "Fee[] fees,",
+    //       "address erc1155Token,",
+    //       "uint256 erc1155TokenId,",
+    //       "Property[] erc1155TokenProperties,",
+    //       "uint128 erc1155TokenAmount",
+    //     ")",
+    //     "Fee(",
+    //       "address recipient,",
+    //       "uint256 amount,",
+    //       "bytes feeData",
+    //     ")",
+    //     "Property(",
+    //       "address propertyValidator,",
+    //       "bytes propertyData",
+    //     ")"
+    // ))
+    uint256 private constant _ERC_1155_ORDER_TYPEHASH =
+        0x930490b1bcedd2e5139e22c761fafd52e533960197c2283f3922c7fd8c880be9;
+
+    // keccak256(abi.encodePacked(
+    //     "Fee(",
+    //       "address recipient,",
+    //       "uint256 amount,",
+    //       "bytes feeData",
+    //     ")"
+    // ))
+    uint256 private constant _FEE_TYPEHASH =
+        0xe68c29f1b4e8cce0bbcac76eb1334bdc1dc1f293a517c90e9e532340e1e94115;
+
+    // keccak256(abi.encodePacked(
+    //     "Property(",
+    //       "address propertyValidator,",
+    //       "bytes propertyData",
+    //     ")"
+    // ))
+    uint256 private constant _PROPERTY_TYPEHASH =
+        0x6292cf854241cb36887e639065eca63b3af9f7f70270cebeda4c29b6d3bc65e8;
+
+    // keccak256("");
+    bytes32 private constant _EMPTY_ARRAY_KECCAK256 =
+        0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470;
+
+    // keccak256(abi.encodePacked(keccak256(abi.encode(
+    //     _PROPERTY_TYPEHASH,
+    //     address(0),
+    //     keccak256("")
+    // ))));
+    bytes32 private constant _NULL_PROPERTY_STRUCT_HASH =
+        0x720ee400a9024f6a49768142c339bf09d2dd9056ab52d20fbe7165faba6e142d;
+
+    uint256 private constant ADDRESS_MASK = (1 << 160) - 1;
+
+    // ERC721Order and NFTOrder fields are aligned, so
+    // we can safely cast an ERC721Order to an NFTOrder.
+    function asNFTOrder(ERC721Order memory erc721Order)
+        internal
+        pure
+        returns (NFTOrder memory nftOrder)
+    {
+        assembly {
+            nftOrder := erc721Order
+        }
+    }
+
+    // ERC1155Order and NFTOrder fields are aligned with
+    // the exception of the last field `erc1155TokenAmount`
+    // in ERC1155Order, so we can safely cast an ERC1155Order
+    // to an NFTOrder.
+    function asNFTOrder(ERC1155Order memory erc1155Order)
+        internal
+        pure
+        returns (NFTOrder memory nftOrder)
+    {
+        assembly {
+            nftOrder := erc1155Order
+        }
+    }
+
+    // ERC721Order and NFTOrder fields are aligned, so
+    // we can safely cast an MFTOrder to an ERC721Order.
+    function asERC721Order(NFTOrder memory nftOrder)
+        internal
+        pure
+        returns (ERC721Order memory erc721Order)
+    {
+        assembly {
+            erc721Order := nftOrder
+        }
+    }
+
+    // NOTE: This is only safe if `nftOrder` was previously
+    // cast from an `ERC1155Order` and the original
+    // `erc1155TokenAmount` memory word has not been corrupted!
+    function asERC1155Order(
+        NFTOrder memory nftOrder
+    )
+        internal
+        pure
+        returns (ERC1155Order memory erc1155Order)
+    {
+        assembly {
+            erc1155Order := nftOrder
+        }
+    }
+
+    /// @dev Get the struct hash of an ERC721 order.
+    /// @param order The ERC721 order.
+    /// @return structHash The struct hash of the order.
+    function getERC721OrderStructHash(ERC721Order memory order)
+        internal
+        pure
+        returns (bytes32 structHash)
+    {
+        bytes32 propertiesHash = _propertiesHash(order.erc721TokenProperties);
+        bytes32 feesHash = _feesHash(order.fees);
+
+        // Hash in place, equivalent to:
+        // return keccak256(abi.encode(
+        //     _ERC_721_ORDER_TYPEHASH,
+        //     order.direction,
+        //     order.maker,
+        //     order.taker,
+        //     order.expiry,
+        //     order.nonce,
+        //     order.erc20Token,
+        //     order.erc20TokenAmount,
+        //     feesHash,
+        //     order.erc721Token,
+        //     order.erc721TokenId,
+        //     propertiesHash
+        // ));
+        assembly {
+            if lt(order, 32) { invalid() } // Don't underflow memory.
+
+            let typeHashPos := sub(order, 32) // order - 32
+            let feesHashPos := add(order, 224) // order + (32 * 7)
+            let propertiesHashPos := add(order, 320) // order + (32 * 10)
+
+            let typeHashMemBefore := mload(typeHashPos)
+            let feeHashMemBefore := mload(feesHashPos)
+            let propertiesHashMemBefore := mload(propertiesHashPos)
+
+            mstore(typeHashPos, _ERC_721_ORDER_TYPEHASH)
+            mstore(feesHashPos, feesHash)
+            mstore(propertiesHashPos, propertiesHash)
+            structHash := keccak256(typeHashPos, 384 /* 32 * 12 */ )
+
+            mstore(typeHashPos, typeHashMemBefore)
+            mstore(feesHashPos, feeHashMemBefore)
+            mstore(propertiesHashPos, propertiesHashMemBefore)
+        }
+        return structHash;
+    }
+
+    /// @dev Get the struct hash of an ERC1155 order.
+    /// @param order The ERC1155 order.
+    /// @return structHash The struct hash of the order.
+    function getERC1155OrderStructHash(ERC1155Order memory order)
+        internal
+        pure
+        returns (bytes32 structHash)
+    {
+        bytes32 propertiesHash = _propertiesHash(order.erc1155TokenProperties);
+        bytes32 feesHash = _feesHash(order.fees);
+
+        // Hash in place, equivalent to:
+        // return keccak256(abi.encode(
+        //     _ERC_1155_ORDER_TYPEHASH,
+        //     order.direction,
+        //     order.maker,
+        //     order.taker,
+        //     order.expiry,
+        //     order.nonce,
+        //     order.erc20Token,
+        //     order.erc20TokenAmount,
+        //     feesHash,
+        //     order.erc1155Token,
+        //     order.erc1155TokenId,
+        //     propertiesHash,
+        //     order.erc1155TokenAmount
+        // ));
+        assembly {
+            if lt(order, 32) { invalid() } // Don't underflow memory.
+
+            let typeHashPos := sub(order, 32) // order - 32
+            let feesHashPos := add(order, 224) // order + (32 * 7)
+            let propertiesHashPos := add(order, 320) // order + (32 * 10)
+
+            let typeHashMemBefore := mload(typeHashPos)
+            let feesHashMemBefore := mload(feesHashPos)
+            let propertiesHashMemBefore := mload(propertiesHashPos)
+
+            mstore(typeHashPos, _ERC_1155_ORDER_TYPEHASH)
+            mstore(feesHashPos, feesHash)
+            mstore(propertiesHashPos, propertiesHash)
+            structHash := keccak256(typeHashPos, 416 /* 32 * 12 */ )
+
+            mstore(typeHashPos, typeHashMemBefore)
+            mstore(feesHashPos, feesHashMemBefore)
+            mstore(propertiesHashPos, propertiesHashMemBefore)
+        }
+        return structHash;
+    }
+
+    // Hashes the `properties` array as part of computing the
+    // EIP-712 hash of an `ERC721Order` or `ERC1155Order`.
+    function _propertiesHash(Property[] memory properties)
+        private
+        pure
+        returns (bytes32 propertiesHash)
+    {
+        uint256 numProperties = properties.length;
+        // We give `properties.length == 0` and `properties.length == 1`
+        // special treatment because we expect these to be the most common.
+        if (numProperties == 0) {
+            propertiesHash = _EMPTY_ARRAY_KECCAK256;
+        } else if (numProperties == 1) {
+            Property memory property = properties[0];
+            if (
+                address(property.propertyValidator) == address(0) &&
+                property.propertyData.length == 0
+            ) {
+                propertiesHash = _NULL_PROPERTY_STRUCT_HASH;
+            } else {
+                // propertiesHash = keccak256(abi.encodePacked(keccak256(abi.encode(
+                //     _PROPERTY_TYPEHASH,
+                //     properties[0].propertyValidator,
+                //     keccak256(properties[0].propertyData)
+                // ))));
+                bytes32 dataHash = keccak256(property.propertyData);
+                assembly {
+                    // Load free memory pointer
+                    let mem := mload(64)
+                    mstore(mem, _PROPERTY_TYPEHASH)
+                    // property.propertyValidator
+                    mstore(add(mem, 32), and(ADDRESS_MASK, mload(property)))
+                    // keccak256(property.propertyData)
+                    mstore(add(mem, 64), dataHash)
+                    mstore(mem, keccak256(mem, 96))
+                    propertiesHash := keccak256(mem, 32)
+                }
+            }
+        } else {
+            bytes32[] memory propertyStructHashArray = new bytes32[](numProperties);
+            for (uint256 i = 0; i < numProperties; i++) {
+                propertyStructHashArray[i] = keccak256(abi.encode(
+                    _PROPERTY_TYPEHASH,
+                    properties[i].propertyValidator,
+                    keccak256(properties[i].propertyData)
+                ));
+            }
+            assembly {
+                propertiesHash := keccak256(add(propertyStructHashArray, 32), mul(numProperties, 32))
+            }
+        }
+    }
+
+    // Hashes the `fees` array as part of computing the
+    // EIP-712 hash of an `ERC721Order` or `ERC1155Order`.
+    function _feesHash(Fee[] memory fees)
+        private
+        pure
+        returns (bytes32 feesHash)
+    {
+        uint256 numFees = fees.length;
+        // We give `fees.length == 0` and `fees.length == 1`
+        // special treatment because we expect these to be the most common.
+        if (numFees == 0) {
+            feesHash = _EMPTY_ARRAY_KECCAK256;
+        } else if (numFees == 1) {
+            // feesHash = keccak256(abi.encodePacked(keccak256(abi.encode(
+            //     _FEE_TYPEHASH,
+            //     fees[0].recipient,
+            //     fees[0].amount,
+            //     keccak256(fees[0].feeData)
+            // ))));
+            Fee memory fee = fees[0];
+            bytes32 dataHash = keccak256(fee.feeData);
+            assembly {
+                // Load free memory pointer
+                let mem := mload(64)
+                mstore(mem, _FEE_TYPEHASH)
+                // fee.recipient
+                mstore(add(mem, 32), and(ADDRESS_MASK, mload(fee)))
+                // fee.amount
+                mstore(add(mem, 64), mload(add(fee, 32)))
+                // keccak256(fee.feeData)
+                mstore(add(mem, 96), dataHash)
+                mstore(mem, keccak256(mem, 128))
+                feesHash := keccak256(mem, 32)
+            }
+        } else {
+            bytes32[] memory feeStructHashArray = new bytes32[](numFees);
+            for (uint256 i = 0; i < numFees; i++) {
+                feeStructHashArray[i] = keccak256(abi.encode(
+                    _FEE_TYPEHASH,
+                    fees[i].recipient,
+                    fees[i].amount,
+                    keccak256(fees[i].feeData)
+                ));
+            }
+            assembly {
+                feesHash := keccak256(add(feeStructHashArray, 32), mul(numFees, 32))
+            }
+        }
+    }
+}

contracts/zero-ex/contracts/src/features/libs/LibSignature.sol

@@ -44,7 +44,8 @@ library LibSignature {
         ILLEGAL,
         INVALID,
         EIP712,
-        ETHSIGN
+        ETHSIGN,
+        PRESIGNED
     }
 
     /// @dev Encoded EC signature.
@@ -146,6 +147,15 @@ library LibSignature {
             ).rrevert();
         }
 
+        // If a feature supports pre-signing, it wouldn't use 
+        // `getSignerOfHash` on a pre-signed order.
+        if (signature.signatureType == SignatureType.PRESIGNED) {
+            LibSignatureRichErrors.SignatureValidationError(
+                LibSignatureRichErrors.SignatureValidationErrorCodes.UNSUPPORTED,
+                hash
+            ).rrevert();
+        }
+
         // Solidity should check that the signature type is within enum range for us
         // when abi-decoding.
     }

contracts/zero-ex/contracts/src/features/multiplex/MultiplexFeature.sol

@@ -622,15 +622,6 @@ contract MultiplexFeature is
             _executeBatchSell(batchSellParams).boughtAmount;
     }
 
-    // Transfers some amount of ETH to the given recipient and
-    // reverts if the transfer fails.
-    function _transferEth(address payable recipient, uint256 amount)
-        private
-    {
-        (bool success,) = recipient.call{value: amount}("");
-        require(success, "MultiplexFeature::_transferEth/TRANSFER_FAILED");
-    }
-
     // This function computes the "target" address of hop index `i` within
     // a multi-hop sell.
     // If `i == 0`, the target is the address which should hold the input

contracts/zero-ex/contracts/src/features/nft_orders/ERC1155OrdersFeature.sol

@@ -0,0 +1,635 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../../fixins/FixinERC1155Spender.sol";
+import "../../migrations/LibMigrate.sol";
+import "../../storage/LibERC1155OrdersStorage.sol";
+import "../interfaces/IFeature.sol";
+import "../interfaces/IERC1155OrdersFeature.sol";
+import "../libs/LibNFTOrder.sol";
+import "../libs/LibSignature.sol";
+import "./NFTOrders.sol";
+
+
+/// @dev Feature for interacting with ERC1155 orders.
+contract ERC1155OrdersFeature is
+    IFeature,
+    IERC1155OrdersFeature,
+    FixinERC1155Spender,
+    NFTOrders
+{
+    using LibSafeMathV06 for uint256;
+    using LibSafeMathV06 for uint128;
+    using LibNFTOrder for LibNFTOrder.ERC1155Order;
+    using LibNFTOrder for LibNFTOrder.NFTOrder;
+
+    /// @dev Name of this feature.
+    string public constant override FEATURE_NAME = "ERC1155Orders";
+    /// @dev Version of this feature.
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 0);
+
+    /// @dev The magic return value indicating the success of a `onERC1155Received`.
+    bytes4 private constant ERC1155_RECEIVED_MAGIC_BYTES = this.onERC1155Received.selector;
+
+
+    constructor(address zeroExAddress, IEtherTokenV06 weth)
+        public
+        NFTOrders(zeroExAddress, weth)
+    {}
+
+    /// @dev Initialize and register this feature.
+    ///      Should be delegatecalled by `Migrate.migrate()`.
+    /// @return success `LibMigrate.SUCCESS` on success.
+    function migrate()
+        external
+        returns (bytes4 success)
+    {
+        _registerFeatureFunction(this.sellERC1155.selector);
+        _registerFeatureFunction(this.buyERC1155.selector);
+        _registerFeatureFunction(this.cancelERC1155Order.selector);
+        _registerFeatureFunction(this.batchBuyERC1155s.selector);
+        _registerFeatureFunction(this.onERC1155Received.selector);
+        _registerFeatureFunction(this.preSignERC1155Order.selector);
+        _registerFeatureFunction(this.validateERC1155OrderSignature.selector);
+        _registerFeatureFunction(this.validateERC1155OrderProperties.selector);
+        _registerFeatureFunction(this.getERC1155OrderInfo.selector);
+        _registerFeatureFunction(this.getERC1155OrderHash.selector);
+        return LibMigrate.MIGRATE_SUCCESS;
+    }
+
+    /// @dev Sells an ERC1155 asset to fill the given order.
+    /// @param buyOrder The ERC1155 buy order.
+    /// @param signature The order signature from the maker.
+    /// @param erc1155TokenId The ID of the ERC1155 asset being
+    ///        sold. If the given order specifies properties,
+    ///        the asset must satisfy those properties. Otherwise,
+    ///        it must equal the tokenId in the order.
+    /// @param erc1155SellAmount The amount of the ERC1155 asset
+    ///        to sell.
+    /// @param unwrapNativeToken If this parameter is true and the
+    ///        ERC20 token of the order is e.g. WETH, unwraps the
+    ///        token before transferring it to the taker.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC1155OrderCallback` on `msg.sender` after
+    ///        the ERC20 tokens have been transferred to `msg.sender`
+    ///        but before transferring the ERC1155 asset to the buyer.
+    function sellERC1155(
+        LibNFTOrder.ERC1155Order memory buyOrder,
+        LibSignature.Signature memory signature,
+        uint256 erc1155TokenId,
+        uint128 erc1155SellAmount,
+        bool unwrapNativeToken,
+        bytes memory callbackData
+    )
+        public
+        override
+    {
+        _sellERC1155(
+            buyOrder,
+            signature,
+            SellParams(
+                erc1155SellAmount,
+                erc1155TokenId,
+                unwrapNativeToken,
+                msg.sender, // taker
+                msg.sender, // owner
+                callbackData
+            )
+        );
+    }
+
+    /// @dev Buys an ERC1155 asset by filling the given order.
+    /// @param sellOrder The ERC1155 sell order.
+    /// @param signature The order signature.
+    /// @param erc1155BuyAmount The amount of the ERC1155 asset
+    ///        to buy.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC1155OrderCallback` on `msg.sender` after
+    ///        the ERC1155 asset has been transferred to `msg.sender`
+    ///        but before transferring the ERC20 tokens to the seller.
+    ///        Native tokens acquired during the callback can be used
+    ///        to fill the order.
+    function buyERC1155(
+        LibNFTOrder.ERC1155Order memory sellOrder,
+        LibSignature.Signature memory signature,
+        uint128 erc1155BuyAmount,
+        bytes memory callbackData
+    )
+        public
+        override
+        payable
+    {
+        uint256 ethBalanceBefore = address(this).balance
+            .safeSub(msg.value);
+        _buyERC1155(
+            sellOrder,
+            signature,
+            BuyParams(
+                erc1155BuyAmount,
+                msg.value,
+                callbackData
+            )
+        );
+        uint256 ethBalanceAfter = address(this).balance;
+        // Cannot use pre-existing ETH balance
+        if (ethBalanceAfter < ethBalanceBefore) {
+            LibNFTOrdersRichErrors.OverspentEthError(
+                ethBalanceBefore - ethBalanceAfter + msg.value,
+                msg.value
+            ).rrevert();
+        }
+        // Refund
+        _transferEth(msg.sender, ethBalanceAfter - ethBalanceBefore);
+    }
+
+    /// @dev Cancel a single ERC1155 order by its nonce. The caller
+    ///      should be the maker of the order. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonce The order nonce.
+    function cancelERC1155Order(uint256 orderNonce)
+        public
+        override
+    {
+        // The bitvector is indexed by the lower 8 bits of the nonce.
+        uint256 flag = 1 << (orderNonce & 255);
+        // Update order cancellation bit vector to indicate that the order
+        // has been cancelled/filled by setting the designated bit to 1.
+        LibERC1155OrdersStorage.getStorage().orderCancellationByMaker
+            [msg.sender][uint248(orderNonce >> 8)] |= flag;
+
+        emit ERC1155OrderCancelled(msg.sender, orderNonce);
+    }
+
+    /// @dev Cancel multiple ERC1155 orders by their nonces. The caller
+    ///      should be the maker of the orders. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonces The order nonces.
+    function batchCancelERC1155Orders(uint256[] calldata orderNonces)
+        external
+        override
+    {
+        for (uint256 i = 0; i < orderNonces.length; i++) {
+            cancelERC1155Order(orderNonces[i]);
+        }
+    }
+
+    /// @dev Buys multiple ERC1155 assets by filling the
+    ///      given orders.
+    /// @param sellOrders The ERC1155 sell orders.
+    /// @param signatures The order signatures.
+    /// @param erc1155FillAmounts The amounts of the ERC1155 assets
+    ///        to buy for each order.
+    /// @param callbackData The data (if any) to pass to the taker
+    ///        callback for each order. Refer to the `callbackData`
+    ///        parameter to for `buyERC1155`.
+    /// @param revertIfIncomplete If true, reverts if this
+    ///        function fails to fill any individual order.
+    /// @return successes An array of booleans corresponding to whether
+    ///         each order in `orders` was successfully filled.
+    function batchBuyERC1155s(
+        LibNFTOrder.ERC1155Order[] memory sellOrders,
+        LibSignature.Signature[] memory signatures,
+        uint128[] calldata erc1155FillAmounts,
+        bytes[] memory callbackData,
+        bool revertIfIncomplete
+    )
+        public
+        override
+        payable
+        returns (bool[] memory successes)
+    {
+        require(
+            sellOrders.length == signatures.length &&
+            sellOrders.length == erc1155FillAmounts.length &&
+            sellOrders.length == callbackData.length,
+            "ERC1155OrdersFeature::batchBuyERC1155s/ARRAY_LENGTH_MISMATCH"
+        );
+        successes = new bool[](sellOrders.length);
+
+        uint256 ethBalanceBefore = address(this).balance
+            .safeSub(msg.value);
+        if (revertIfIncomplete) {
+            for (uint256 i = 0; i < sellOrders.length; i++) {
+                // Will revert if _buyERC1155 reverts.
+                _buyERC1155(
+                    sellOrders[i],
+                    signatures[i],
+                    BuyParams(
+                        erc1155FillAmounts[i],
+                        address(this).balance.safeSub(ethBalanceBefore), // Remaining ETH available
+                        callbackData[i]
+                    )
+                );
+                successes[i] = true;
+            }
+        } else {
+            for (uint256 i = 0; i < sellOrders.length; i++) {
+                // Delegatecall `_buyERC1155` to catch swallow reverts while
+                // preserving execution context.
+                // Note that `_buyERC1155` is a public function but should _not_
+                // be registered in the Exchange Proxy.
+                (successes[i], ) = _implementation.delegatecall(
+                    abi.encodeWithSelector(
+                        this._buyERC1155.selector,
+                        sellOrders[i],
+                        signatures[i],
+                        BuyParams(
+                            erc1155FillAmounts[i],
+                            address(this).balance.safeSub(ethBalanceBefore), // Remaining ETH available
+                            callbackData[i]
+                        )
+                    )
+                );
+            }
+        }
+
+        // Cannot use pre-existing ETH balance
+        uint256 ethBalanceAfter = address(this).balance;
+        if (ethBalanceAfter < ethBalanceBefore) {
+            LibNFTOrdersRichErrors.OverspentEthError(
+                msg.value + (ethBalanceBefore - ethBalanceAfter),
+                msg.value
+            ).rrevert();
+        }
+
+        // Refund
+        _transferEth(msg.sender, ethBalanceAfter - ethBalanceBefore);
+    }
+
+    /// @dev Callback for the ERC1155 `safeTransferFrom` function.
+    ///      This callback can be used to sell an ERC1155 asset if
+    ///      a valid ERC1155 order, signature and `unwrapNativeToken`
+    ///      are encoded in `data`. This allows takers to sell their
+    ///      ERC1155 asset without first calling `setApprovalForAll`.
+    /// @param operator The address which called `safeTransferFrom`.
+    /// @param tokenId The ID of the asset being transferred.
+    /// @param value The amount being transferred.
+    /// @param data Additional data with no specified format. If a
+    ///        valid ERC1155 order, signature and `unwrapNativeToken`
+    ///        are encoded in `data`, this function will try to fill
+    ///        the order using the received asset.
+    /// @return success The selector of this function (0xf23a6e61),
+    ///         indicating that the callback succeeded.
+    function onERC1155Received(
+        address operator,
+        address /* from */,
+        uint256 tokenId,
+        uint256 value,
+        bytes calldata data
+    )
+        external
+        override
+        returns (bytes4 success)
+    {
+        // Decode the order, signature, and `unwrapNativeToken` from
+        // `data`. If `data` does not encode such parameters, this
+        // will throw.
+        (
+            LibNFTOrder.ERC1155Order memory buyOrder,
+            LibSignature.Signature memory signature,
+            bool unwrapNativeToken
+        ) = abi.decode(
+            data,
+            (LibNFTOrder.ERC1155Order, LibSignature.Signature, bool)
+        );
+
+        // `onERC1155Received` is called by the ERC1155 token contract.
+        // Check that it matches the ERC1155 token in the order.
+        if (msg.sender != address(buyOrder.erc1155Token)) {
+            LibNFTOrdersRichErrors.ERC1155TokenMismatchError(
+                msg.sender,
+                address(buyOrder.erc1155Token)
+            ).rrevert();
+        }
+
+        _sellERC1155(
+            buyOrder,
+            signature,
+            SellParams(
+                value.safeDowncastToUint128(),
+                tokenId,
+                unwrapNativeToken,
+                operator,       // taker
+                address(this),  // owner (we hold the NFT currently)
+                new bytes(0)    // No taker callback
+            )
+        );
+
+        return ERC1155_RECEIVED_MAGIC_BYTES;
+    }
+
+    /// @dev Approves an ERC1155 order on-chain. After pre-signing
+    ///      the order, the `PRESIGNED` signature type will become
+    ///      valid for that order and signer.
+    /// @param order An ERC1155 order.
+    function preSignERC1155Order(LibNFTOrder.ERC1155Order memory order)
+        public
+        override
+    {
+        require(
+            order.maker == msg.sender,
+            "ERC1155OrdersFeature::preSignERC1155Order/MAKER_MISMATCH"
+        );
+        bytes32 orderHash = getERC1155OrderHash(order);
+
+        LibERC1155OrdersStorage.Storage storage stor =
+            LibERC1155OrdersStorage.getStorage();
+        // Set `preSigned` to true on the order state variable
+        // to indicate that the order has been pre-signed.
+        stor.orderState[orderHash].preSigned = true;
+
+        emit ERC1155OrderPreSigned(
+            order.direction,
+            order.maker,
+            order.taker,
+            order.expiry,
+            order.nonce,
+            order.erc20Token,
+            order.erc20TokenAmount,
+            order.fees,
+            order.erc1155Token,
+            order.erc1155TokenId,
+            order.erc1155TokenProperties,
+            order.erc1155TokenAmount
+        );
+    }
+
+    // Core settlement logic for selling an ERC1155 asset.
+    // Used by `sellERC1155` and `onERC1155Received`.
+    function _sellERC1155(
+        LibNFTOrder.ERC1155Order memory buyOrder,
+        LibSignature.Signature memory signature,
+        SellParams memory params
+    )
+        private
+    {
+        uint256 erc20FillAmount = _sellNFT(
+            buyOrder.asNFTOrder(),
+            signature,
+            params
+        );
+
+        emit ERC1155OrderFilled(
+            buyOrder.direction,
+            buyOrder.maker,
+            params.taker,
+            buyOrder.nonce,
+            buyOrder.erc20Token,
+            erc20FillAmount,
+            buyOrder.erc1155Token,
+            params.tokenId,
+            params.sellAmount,
+            address(0)
+        );
+    }
+
+    // Core settlement logic for buying an ERC1155 asset.
+    // Used by `buyERC1155` and `batchBuyERC1155s`.
+    function _buyERC1155(
+        LibNFTOrder.ERC1155Order memory sellOrder,
+        LibSignature.Signature memory signature,
+        BuyParams memory params
+    )
+        public
+        payable
+    {
+        uint256 erc20FillAmount = _buyNFT(
+            sellOrder.asNFTOrder(),
+            signature,
+            params
+        );
+
+        emit ERC1155OrderFilled(
+            sellOrder.direction,
+            sellOrder.maker,
+            msg.sender,
+            sellOrder.nonce,
+            sellOrder.erc20Token,
+            erc20FillAmount,
+            sellOrder.erc1155Token,
+            sellOrder.erc1155TokenId,
+            params.buyAmount,
+            address(0)
+        );
+    }
+
+    /// @dev Checks whether the given signature is valid for the
+    ///      the given ERC1155 order. Reverts if not.
+    /// @param order The ERC1155 order.
+    /// @param signature The signature to validate.
+    function validateERC1155OrderSignature(
+        LibNFTOrder.ERC1155Order memory order,
+        LibSignature.Signature memory signature
+    )
+        public
+        override
+        view
+    {
+        bytes32 orderHash = getERC1155OrderHash(order);
+        _validateOrderSignature(orderHash, signature, order.maker);
+    }
+
+    /// @dev Validates that the given signature is valid for the
+    ///      given maker and order hash. Reverts if the signature
+    ///      is not valid.
+    /// @param orderHash The hash of the order that was signed.
+    /// @param signature The signature to check.
+    /// @param maker The maker of the order.
+    function _validateOrderSignature(
+        bytes32 orderHash,
+        LibSignature.Signature memory signature,
+        address maker
+    )
+        internal
+        override
+        view
+    {
+        if (signature.signatureType == LibSignature.SignatureType.PRESIGNED) {
+            // Check if order hash has been pre-signed by the maker.
+            bool isPreSigned = LibERC1155OrdersStorage.getStorage()
+                .orderState[orderHash].preSigned;
+            if (!isPreSigned) {
+                LibNFTOrdersRichErrors.InvalidSignerError(maker, address(0)).rrevert();
+            }
+        } else {
+            address signer = LibSignature.getSignerOfHash(orderHash, signature);
+            if (signer != maker) {
+                LibNFTOrdersRichErrors.InvalidSignerError(maker, signer).rrevert();
+            }
+        }
+    }
+
+    /// @dev Transfers an NFT asset.
+    /// @param token The address of the NFT contract.
+    /// @param from The address currently holding the asset.
+    /// @param to The address to transfer the asset to.
+    /// @param tokenId The ID of the asset to transfer.
+    /// @param amount The amount of the asset to transfer. Always
+    ///        1 for ERC721 assets.
+    function _transferNFTAssetFrom(
+        address token,
+        address from,
+        address to,
+        uint256 tokenId,
+        uint256 amount
+    )
+        internal
+        override
+    {
+        _transferERC1155AssetFrom(IERC1155Token(token), from, to, tokenId, amount);
+    }
+
+    /// @dev Updates storage to indicate that the given order
+    ///      has been filled by the given amount.
+    /// @param orderHash The hash of `order`.
+    /// @param fillAmount The amount (denominated in the NFT asset)
+    ///        that the order has been filled by.
+    function _updateOrderState(
+        LibNFTOrder.NFTOrder memory /* order */,
+        bytes32 orderHash,
+        uint128 fillAmount
+    )
+        internal
+        override
+    {
+        LibERC1155OrdersStorage.Storage storage stor = LibERC1155OrdersStorage.getStorage();
+        uint128 filledAmount = stor.orderState[orderHash].filledAmount;
+        // Filled amount should never overflow 128 bits
+        assert(filledAmount + fillAmount > filledAmount);
+        stor.orderState[orderHash].filledAmount = filledAmount + fillAmount;
+    }
+
+    /// @dev If the given order is buying an ERC1155 asset, checks
+    ///      whether or not the given token ID satisfies the required
+    ///      properties specified in the order. If the order does not
+    ///      specify any properties, this function instead checks
+    ///      whether the given token ID matches the ID in the order.
+    ///      Reverts if any checks fail, or if the order is selling
+    ///      an ERC1155 asset.
+    /// @param order The ERC1155 order.
+    /// @param erc1155TokenId The ID of the ERC1155 asset.
+    function validateERC1155OrderProperties(
+        LibNFTOrder.ERC1155Order memory order,
+        uint256 erc1155TokenId
+    )
+        public
+        override
+        view
+    {
+        _validateOrderProperties(
+            order.asNFTOrder(),
+            erc1155TokenId
+        );
+    }
+
+    /// @dev Get the order info for an ERC1155 order.
+    /// @param order The ERC1155 order.
+    /// @return orderInfo Info about the order.
+    function getERC1155OrderInfo(LibNFTOrder.ERC1155Order memory order)
+        public
+        override
+        view
+        returns (LibNFTOrder.OrderInfo memory orderInfo)
+    {
+        orderInfo.orderAmount = order.erc1155TokenAmount;
+        orderInfo.orderHash = getERC1155OrderHash(order);
+
+        // Only buy orders with `erc1155TokenId` == 0 can be property
+        // orders.
+        if (order.erc1155TokenProperties.length > 0 &&
+                (order.direction != LibNFTOrder.TradeDirection.BUY_NFT ||
+                 order.erc1155TokenId != 0))
+        {
+            orderInfo.status = LibNFTOrder.OrderStatus.INVALID;
+            return orderInfo;
+        }
+
+        // Buy orders cannot use ETH as the ERC20 token, since ETH cannot be
+        // transferred from the buyer by a contract.
+        if (order.direction == LibNFTOrder.TradeDirection.BUY_NFT &&
+            address(order.erc20Token) == NATIVE_TOKEN_ADDRESS)
+        {
+            orderInfo.status = LibNFTOrder.OrderStatus.INVALID;
+            return orderInfo;
+        }
+
+        // Check for expiry.
+        if (order.expiry <= block.timestamp) {
+            orderInfo.status = LibNFTOrder.OrderStatus.EXPIRED;
+            return orderInfo;
+        }
+
+        {
+            LibERC1155OrdersStorage.Storage storage stor =
+                LibERC1155OrdersStorage.getStorage();
+
+            LibERC1155OrdersStorage.OrderState storage orderState =
+                stor.orderState[orderInfo.orderHash];
+            orderInfo.remainingAmount = order.erc1155TokenAmount
+                .safeSub128(orderState.filledAmount);
+
+            // `orderCancellationByMaker` is indexed by maker and nonce.
+            uint256 orderCancellationBitVector =
+                stor.orderCancellationByMaker[order.maker][uint248(order.nonce >> 8)];
+            // The bitvector is indexed by the lower 8 bits of the nonce.
+            uint256 flag = 1 << (order.nonce & 255);
+
+            if (orderInfo.remainingAmount == 0 ||
+                orderCancellationBitVector & flag != 0)
+            {
+                orderInfo.status = LibNFTOrder.OrderStatus.UNFILLABLE;
+                return orderInfo;
+            }
+        }
+
+        // Otherwise, the order is fillable.
+        orderInfo.status = LibNFTOrder.OrderStatus.FILLABLE;
+    }
+
+    /// @dev Get the order info for an NFT order.
+    /// @param order The NFT order.
+    /// @return orderInfo Info about the order.
+    function _getOrderInfo(LibNFTOrder.NFTOrder memory order)
+        internal
+        override
+        view
+        returns (LibNFTOrder.OrderInfo memory orderInfo)
+    {
+        return getERC1155OrderInfo(order.asERC1155Order());
+    }
+
+    /// @dev Get the EIP-712 hash of an ERC1155 order.
+    /// @param order The ERC1155 order.
+    /// @return orderHash The order hash.
+    function getERC1155OrderHash(LibNFTOrder.ERC1155Order memory order)
+        public
+        override
+        view
+        returns (bytes32 orderHash)
+    {
+        return _getEIP712Hash(LibNFTOrder.getERC1155OrderStructHash(order));
+    }
+}

contracts/zero-ex/contracts/src/features/nft_orders/ERC721OrdersFeature.sol

@@ -0,0 +1,931 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../../fixins/FixinERC721Spender.sol";
+import "../../migrations/LibMigrate.sol";
+import "../../storage/LibERC721OrdersStorage.sol";
+import "../interfaces/IFeature.sol";
+import "../interfaces/IERC721OrdersFeature.sol";
+import "../libs/LibNFTOrder.sol";
+import "../libs/LibSignature.sol";
+import "./NFTOrders.sol";
+
+
+/// @dev Feature for interacting with ERC721 orders.
+contract ERC721OrdersFeature is
+    IFeature,
+    IERC721OrdersFeature,
+    FixinERC721Spender,
+    NFTOrders
+{
+    using LibSafeMathV06 for uint256;
+    using LibNFTOrder for LibNFTOrder.ERC721Order;
+    using LibNFTOrder for LibNFTOrder.NFTOrder;
+
+    /// @dev Name of this feature.
+    string public constant override FEATURE_NAME = "ERC721Orders";
+    /// @dev Version of this feature.
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 0);
+
+    /// @dev The magic return value indicating the success of a `onERC721Received`.
+    bytes4 private constant ERC721_RECEIVED_MAGIC_BYTES = this.onERC721Received.selector;
+
+
+    constructor(address zeroExAddress, IEtherTokenV06 weth)
+        public
+        NFTOrders(zeroExAddress, weth)
+    {}
+
+    /// @dev Initialize and register this feature.
+    ///      Should be delegatecalled by `Migrate.migrate()`.
+    /// @return success `LibMigrate.SUCCESS` on success.
+    function migrate()
+        external
+        returns (bytes4 success)
+    {
+        _registerFeatureFunction(this.sellERC721.selector);
+        _registerFeatureFunction(this.buyERC721.selector);
+        _registerFeatureFunction(this.cancelERC721Order.selector);
+        _registerFeatureFunction(this.batchBuyERC721s.selector);
+        _registerFeatureFunction(this.matchERC721Orders.selector);
+        _registerFeatureFunction(this.batchMatchERC721Orders.selector);
+        _registerFeatureFunction(this.onERC721Received.selector);
+        _registerFeatureFunction(this.preSignERC721Order.selector);
+        _registerFeatureFunction(this.validateERC721OrderSignature.selector);
+        _registerFeatureFunction(this.validateERC721OrderProperties.selector);
+        _registerFeatureFunction(this.getERC721OrderStatus.selector);
+        _registerFeatureFunction(this.getERC721OrderHash.selector);
+        _registerFeatureFunction(this.getERC721OrderStatusBitVector.selector);
+        return LibMigrate.MIGRATE_SUCCESS;
+    }
+
+    /// @dev Sells an ERC721 asset to fill the given order.
+    /// @param buyOrder The ERC721 buy order.
+    /// @param signature The order signature from the maker.
+    /// @param erc721TokenId The ID of the ERC721 asset being
+    ///        sold. If the given order specifies properties,
+    ///        the asset must satisfy those properties. Otherwise,
+    ///        it must equal the tokenId in the order.
+    /// @param unwrapNativeToken If this parameter is true and the
+    ///        ERC20 token of the order is e.g. WETH, unwraps the
+    ///        token before transferring it to the taker.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC721OrderCallback` on `msg.sender` after
+    ///        the ERC20 tokens have been transferred to `msg.sender`
+    ///        but before transferring the ERC721 asset to the buyer.
+    function sellERC721(
+        LibNFTOrder.ERC721Order memory buyOrder,
+        LibSignature.Signature memory signature,
+        uint256 erc721TokenId,
+        bool unwrapNativeToken,
+        bytes memory callbackData
+    )
+        public
+        override
+    {
+        _sellERC721(
+            buyOrder,
+            signature,
+            erc721TokenId,
+            unwrapNativeToken,
+            msg.sender, // taker
+            msg.sender, // owner
+            callbackData
+        );
+    }
+
+    /// @dev Buys an ERC721 asset by filling the given order.
+    /// @param sellOrder The ERC721 sell order.
+    /// @param signature The order signature.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC721OrderCallback` on `msg.sender` after
+    ///        the ERC721 asset has been transferred to `msg.sender`
+    ///        but before transferring the ERC20 tokens to the seller.
+    ///        Native tokens acquired during the callback can be used
+    ///        to fill the order.
+    function buyERC721(
+        LibNFTOrder.ERC721Order memory sellOrder,
+        LibSignature.Signature memory signature,
+        bytes memory callbackData
+    )
+        public
+        override
+        payable
+    {
+        uint256 ethBalanceBefore = address(this).balance
+            .safeSub(msg.value);
+        _buyERC721(
+            sellOrder,
+            signature,
+            msg.value,
+            callbackData
+        );
+        uint256 ethBalanceAfter = address(this).balance;
+        // Cannot use pre-existing ETH balance
+        if (ethBalanceAfter < ethBalanceBefore) {
+            LibNFTOrdersRichErrors.OverspentEthError(
+                msg.value + (ethBalanceBefore - ethBalanceAfter),
+                msg.value
+            ).rrevert();
+        }
+        // Refund
+        _transferEth(msg.sender, ethBalanceAfter - ethBalanceBefore);
+    }
+
+    /// @dev Cancel a single ERC721 order by its nonce. The caller
+    ///      should be the maker of the order. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonce The order nonce.
+    function cancelERC721Order(uint256 orderNonce)
+        public
+        override
+    {
+        // Mark order as cancelled
+        _setOrderStatusBit(msg.sender, orderNonce);
+        emit ERC721OrderCancelled(msg.sender, orderNonce);
+    }
+
+    /// @dev Cancel multiple ERC721 orders by their nonces. The caller
+    ///      should be the maker of the orders. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonces The order nonces.
+    function batchCancelERC721Orders(uint256[] calldata orderNonces)
+        external
+        override
+    {
+        for (uint256 i = 0; i < orderNonces.length; i++) {
+            cancelERC721Order(orderNonces[i]);
+        }
+    }
+
+    /// @dev Buys multiple ERC721 assets by filling the
+    ///      given orders.
+    /// @param sellOrders The ERC721 sell orders.
+    /// @param signatures The order signatures.
+    /// @param revertIfIncomplete If true, reverts if this
+    ///        function fails to fill any individual order.
+    /// @param callbackData The data (if any) to pass to the taker
+    ///        callback for each order. Refer to the `callbackData`
+    ///        parameter to for `buyERC721`.
+    /// @return successes An array of booleans corresponding to whether
+    ///         each order in `orders` was successfully filled.
+    function batchBuyERC721s(
+        LibNFTOrder.ERC721Order[] memory sellOrders,
+        LibSignature.Signature[] memory signatures,
+        bytes[] memory callbackData,
+        bool revertIfIncomplete
+    )
+        public
+        override
+        payable
+        returns (bool[] memory successes)
+    {
+        require(
+            sellOrders.length == signatures.length &&
+            sellOrders.length == callbackData.length,
+            "ERC721OrdersFeature::batchBuyERC721s/ARRAY_LENGTH_MISMATCH"
+        );
+        successes = new bool[](sellOrders.length);
+
+        uint256 ethBalanceBefore = address(this).balance
+            .safeSub(msg.value);
+        if (revertIfIncomplete) {
+            for (uint256 i = 0; i < sellOrders.length; i++) {
+                // Will revert if _buyERC721 reverts.
+                _buyERC721(
+                    sellOrders[i],
+                    signatures[i],
+                    address(this).balance.safeSub(ethBalanceBefore),
+                    callbackData[i]
+                );
+                successes[i] = true;
+            }
+        } else {
+            for (uint256 i = 0; i < sellOrders.length; i++) {
+                // Delegatecall `_buyERC721` to swallow reverts while
+                // preserving execution context.
+                // Note that `_buyERC721` is a public function but should _not_
+                // be registered in the Exchange Proxy.
+                (successes[i], ) = _implementation.delegatecall(
+                    abi.encodeWithSelector(
+                        this._buyERC721.selector,
+                        sellOrders[i],
+                        signatures[i],
+                        address(this).balance.safeSub(ethBalanceBefore), // Remaining ETH available
+                        callbackData[i]
+                    )
+                );
+            }
+        }
+
+        // Cannot use pre-existing ETH balance
+        uint256 ethBalanceAfter = address(this).balance;
+        if (ethBalanceAfter < ethBalanceBefore) {
+            LibNFTOrdersRichErrors.OverspentEthError(
+                msg.value + (ethBalanceBefore - ethBalanceAfter),
+                msg.value
+            ).rrevert();
+        }
+
+        // Refund
+        _transferEth(msg.sender, ethBalanceAfter - ethBalanceBefore);
+    }
+
+    /// @dev Matches a pair of complementary orders that have
+    ///      a non-negative spread. Each order is filled at
+    ///      their respective price, and the matcher receives
+    ///      a profit denominated in the ERC20 token.
+    /// @param sellOrder Order selling an ERC721 asset.
+    /// @param buyOrder Order buying an ERC721 asset.
+    /// @param sellOrderSignature Signature for the sell order.
+    /// @param buyOrderSignature Signature for the buy order.
+    /// @return profit The amount of profit earned by the caller
+    ///         of this function (denominated in the ERC20 token
+    ///         of the matched orders).
+    function matchERC721Orders(
+        LibNFTOrder.ERC721Order memory sellOrder,
+        LibNFTOrder.ERC721Order memory buyOrder,
+        LibSignature.Signature memory sellOrderSignature,
+        LibSignature.Signature memory buyOrderSignature
+    )
+        public
+        override
+        returns (uint256 profit)
+    {
+        // The ERC721 tokens must match
+        if (sellOrder.erc721Token != buyOrder.erc721Token) {
+            LibNFTOrdersRichErrors.ERC721TokenMismatchError(
+                address(sellOrder.erc721Token),
+                address(buyOrder.erc721Token)
+            ).rrevert();
+        }
+
+        LibNFTOrder.NFTOrder memory sellNFTOrder = sellOrder.asNFTOrder();
+        LibNFTOrder.NFTOrder memory buyNFTOrder = buyOrder.asNFTOrder();
+
+        {
+            LibNFTOrder.OrderInfo memory sellOrderInfo = _getOrderInfo(sellNFTOrder);
+            LibNFTOrder.OrderInfo memory buyOrderInfo = _getOrderInfo(buyNFTOrder);
+
+            _validateSellOrder(
+                sellNFTOrder,
+                sellOrderSignature,
+                sellOrderInfo,
+                buyOrder.maker
+            );
+            _validateBuyOrder(
+                buyNFTOrder,
+                buyOrderSignature,
+                buyOrderInfo,
+                sellOrder.maker,
+                sellOrder.erc721TokenId
+            );
+
+            // Mark both orders as filled.
+            _updateOrderState(sellNFTOrder, sellOrderInfo.orderHash, 1);
+            _updateOrderState(buyNFTOrder, buyOrderInfo.orderHash, 1);
+        }
+
+        // The buyer must be willing to pay at least the amount that the
+        // seller is asking.
+        if (buyOrder.erc20TokenAmount < sellOrder.erc20TokenAmount) {
+            LibNFTOrdersRichErrors.NegativeSpreadError(
+                sellOrder.erc20TokenAmount,
+                buyOrder.erc20TokenAmount
+            ).rrevert();
+        }
+
+        // The difference in ERC20 token amounts is the spread.
+        uint256 spread = buyOrder.erc20TokenAmount - sellOrder.erc20TokenAmount;
+
+        // Transfer the ERC721 asset from seller to buyer.
+        _transferERC721AssetFrom(
+            sellOrder.erc721Token,
+            sellOrder.maker,
+            buyOrder.maker,
+            sellOrder.erc721TokenId
+        );
+
+        // Handle the ERC20 side of the order:
+        if (
+            address(sellOrder.erc20Token) == NATIVE_TOKEN_ADDRESS &&
+            buyOrder.erc20Token == WETH
+        ) {
+            // The sell order specifies ETH, while the buy order specifies WETH.
+            // The orders are still compatible with one another, but we'll have
+            // to unwrap the WETH on behalf of the buyer.
+
+            // Step 1: Transfer WETH from the buyer to the EP.
+            //         Note that we transfer `buyOrder.erc20TokenAmount`, which
+            //         is the amount the buyer signaled they are willing to pay
+            //         for the ERC721 asset, which may be more than the seller's
+            //         ask.
+            _transferERC20TokensFrom(
+                WETH,
+                buyOrder.maker,
+                address(this),
+                buyOrder.erc20TokenAmount
+            );
+            // Step 2: Unwrap the WETH into ETH. We unwrap the entire
+            //         `buyOrder.erc20TokenAmount`.
+            //         The ETH will be used for three purposes:
+            //         - To pay the seller
+            //         - To pay fees for the sell order
+            //         - Any remaining ETH will be sent to
+            //           `msg.sender` as profit.
+            WETH.withdraw(buyOrder.erc20TokenAmount);
+
+            // Step 3: Pay the seller (in ETH).
+            _transferEth(payable(sellOrder.maker), sellOrder.erc20TokenAmount);
+
+            // Step 4: Pay fees for the buy order. Note that these are paid
+            //         in _WETH_ by the _buyer_. By signing the buy order, the
+            //         buyer signals that they are willing to spend a total
+            //         of `erc20TokenAmount` _plus_ fees, all denominated in
+            //         the `erc20Token`, which in this case is WETH.
+            _payFees(
+                buyNFTOrder,
+                buyOrder.maker, // payer
+                1,              // fillAmount
+                1,              // orderAmount
+                false           // useNativeToken
+            );
+
+            // Step 5: Pay fees for the sell order. The `erc20Token` of the
+            //         sell order is ETH, so the fees are paid out in ETH.
+            //         There should be `spread` wei of ETH remaining in the
+            //         EP at this point, which we will use ETH to pay the
+            //         sell order fees.
+            uint256 sellOrderFees = _payFees(
+                sellNFTOrder,
+                address(this), // payer
+                1,             // fillAmount
+                1,             // orderAmount
+                true           // useNativeToken
+            );
+
+            // Step 6: The spread must be enough to cover the sell order fees.
+            //         If not, either `_payFees` will have reverted, or we
+            //         have spent ETH that was in the EP before this
+            //         `matchERC721Orders` call, which we disallow.
+            if (spread < sellOrderFees) {
+                LibNFTOrdersRichErrors.SellOrderFeesExceedSpreadError(
+                    sellOrderFees,
+                    spread
+                ).rrevert();
+            }
+            // Step 7: The spread less the sell order fees is the amount of ETH
+            //         remaining in the EP that can be sent to `msg.sender` as
+            //         the profit from matching these two orders.
+            profit = spread - sellOrderFees;
+            if (profit > 0) {
+                _transferEth(msg.sender, profit);
+            }
+        } else {
+            // ERC20 tokens must match
+            if (sellOrder.erc20Token != buyOrder.erc20Token) {
+                LibNFTOrdersRichErrors.ERC20TokenMismatchError(
+                    address(sellOrder.erc20Token),
+                    address(buyOrder.erc20Token)
+                ).rrevert();
+            }
+
+            // Step 1: Transfer the ERC20 token from the buyer to the seller.
+            //         Note that we transfer `sellOrder.erc20TokenAmount`, which
+            //         is at most `buyOrder.erc20TokenAmount`.
+            _transferERC20TokensFrom(
+                buyOrder.erc20Token,
+                buyOrder.maker,
+                sellOrder.maker,
+                sellOrder.erc20TokenAmount
+            );
+
+            // Step 2: Pay fees for the buy order. Note that these are paid
+            //         by the buyer. By signing the buy order, the buyer signals
+            //         that they are willing to spend a total of
+            //         `buyOrder.erc20TokenAmount` _plus_ `buyOrder.fees`.
+            _payFees(
+                buyNFTOrder,
+                buyOrder.maker, // payer
+                1,              // fillAmount
+                1,              // orderAmount
+                false           // useNativeToken
+            );
+
+            // Step 3: Pay fees for the sell order. These are paid by the buyer
+            //         as well. After paying these fees, we may have taken more
+            //         from the buyer than they agreed to in the buy order. If
+            //         so, we revert in the following step.
+            uint256 sellOrderFees = _payFees(
+                sellNFTOrder,
+                buyOrder.maker, // payer
+                1,              // fillAmount
+                1,              // orderAmount
+                false           // useNativeToken
+            );
+
+            // Step 4: The spread must be enough to cover the sell order fees.
+            //         If not, `_payFees` will have taken more tokens from the
+            //         buyer than they had agreed to in the buy order, in which
+            //         case we revert here.
+            if (spread < sellOrderFees) {
+                LibNFTOrdersRichErrors.SellOrderFeesExceedSpreadError(
+                    sellOrderFees,
+                    spread
+                ).rrevert();
+            }
+
+            // Step 5: We calculate the profit as:
+            //         profit = buyOrder.erc20TokenAmount - sellOrder.erc20TokenAmount - sellOrderFees
+            //                = spread - sellOrderFees
+            //         I.e. the buyer would've been willing to pay up to `profit`
+            //         more to buy the asset, so instead that amount is sent to
+            //         `msg.sender` as the profit from matching these two orders.
+            profit = spread - sellOrderFees;
+            if (profit > 0) {
+                _transferERC20TokensFrom(
+                    buyOrder.erc20Token,
+                    buyOrder.maker,
+                    msg.sender,
+                    profit
+                );
+            }
+        }
+
+        emit ERC721OrderFilled(
+            sellOrder.direction,
+            sellOrder.maker,
+            buyOrder.maker, // taker
+            sellOrder.nonce,
+            sellOrder.erc20Token,
+            sellOrder.erc20TokenAmount,
+            sellOrder.erc721Token,
+            sellOrder.erc721TokenId,
+            msg.sender
+        );
+
+        emit ERC721OrderFilled(
+            buyOrder.direction,
+            buyOrder.maker,
+            sellOrder.maker, // taker
+            buyOrder.nonce,
+            buyOrder.erc20Token,
+            buyOrder.erc20TokenAmount,
+            buyOrder.erc721Token,
+            sellOrder.erc721TokenId,
+            msg.sender
+        );
+    }
+
+    /// @dev Matches pairs of complementary orders that have
+    ///      non-negative spreads. Each order is filled at
+    ///      their respective price, and the matcher receives
+    ///      a profit denominated in the ERC20 token.
+    /// @param sellOrders Orders selling ERC721 assets.
+    /// @param buyOrders Orders buying ERC721 assets.
+    /// @param sellOrderSignatures Signatures for the sell orders.
+    /// @param buyOrderSignatures Signatures for the buy orders.
+    /// @return profits The amount of profit earned by the caller
+    ///         of this function for each pair of matched orders
+    ///         (denominated in the ERC20 token of the order pair).
+    /// @return successes An array of booleans corresponding to
+    ///         whether each pair of orders was successfully matched.
+    function batchMatchERC721Orders(
+        LibNFTOrder.ERC721Order[] memory sellOrders,
+        LibNFTOrder.ERC721Order[] memory buyOrders,
+        LibSignature.Signature[] memory sellOrderSignatures,
+        LibSignature.Signature[] memory buyOrderSignatures
+    )
+        public
+        override
+        returns (uint256[] memory profits, bool[] memory successes)
+    {
+        require(
+            sellOrders.length == buyOrders.length &&
+            sellOrderSignatures.length == buyOrderSignatures.length &&
+            sellOrders.length == sellOrderSignatures.length,
+            "ERC721OrdersFeature::batchMatchERC721Orders/ARRAY_LENGTH_MISMATCH"
+        );
+        profits = new uint256[](sellOrders.length);
+        successes = new bool[](sellOrders.length);
+
+        for (uint256 i = 0; i < sellOrders.length; i++) {
+            bytes memory returnData;
+            // Delegatecall `matchERC721Orders` to catch reverts while
+            // preserving execution context.
+            (successes[i], returnData) = _implementation.delegatecall(
+                abi.encodeWithSelector(
+                    this.matchERC721Orders.selector,
+                    sellOrders[i],
+                    buyOrders[i],
+                    sellOrderSignatures[i],
+                    buyOrderSignatures[i]
+                )
+            );
+            if (successes[i]) {
+                // If the matching succeeded, record the profit.
+                (uint256 profit) = abi.decode(returnData, (uint256));
+                profits[i] = profit;
+            }
+        }
+    }
+
+    /// @dev Callback for the ERC721 `safeTransferFrom` function.
+    ///      This callback can be used to sell an ERC721 asset if
+    ///      a valid ERC721 order, signature and `unwrapNativeToken`
+    ///      are encoded in `data`. This allows takers to sell their
+    ///      ERC721 asset without first calling `setApprovalForAll`.
+    /// @param operator The address which called `safeTransferFrom`.
+    /// @param tokenId The ID of the asset being transferred.
+    /// @param data Additional data with no specified format. If a
+    ///        valid ERC721 order, signature and `unwrapNativeToken`
+    ///        are encoded in `data`, this function will try to fill
+    ///        the order using the received asset.
+    /// @return success The selector of this function (0x150b7a02),
+    ///         indicating that the callback succeeded.
+    function onERC721Received(
+        address operator,
+        address /* from */,
+        uint256 tokenId,
+        bytes calldata data
+    )
+        external
+        override
+        returns (bytes4 success)
+    {
+        // Decode the order, signature, and `unwrapNativeToken` from
+        // `data`. If `data` does not encode such parameters, this
+        // will throw.
+        (
+            LibNFTOrder.ERC721Order memory buyOrder,
+            LibSignature.Signature memory signature,
+            bool unwrapNativeToken
+        ) = abi.decode(
+            data,
+            (LibNFTOrder.ERC721Order, LibSignature.Signature, bool)
+        );
+
+        // `onERC721Received` is called by the ERC721 token contract.
+        // Check that it matches the ERC721 token in the order.
+        if (msg.sender != address(buyOrder.erc721Token)) {
+            LibNFTOrdersRichErrors.ERC721TokenMismatchError(
+                msg.sender,
+                address(buyOrder.erc721Token)
+            ).rrevert();
+        }
+
+        _sellERC721(
+            buyOrder,
+            signature,
+            tokenId,
+            unwrapNativeToken,
+            operator,       // taker
+            address(this),  // owner (we hold the NFT currently)
+            new bytes(0)    // No taker callback
+        );
+
+        return ERC721_RECEIVED_MAGIC_BYTES;
+    }
+
+    /// @dev Approves an ERC721 order on-chain. After pre-signing
+    ///      the order, the `PRESIGNED` signature type will become
+    ///      valid for that order and signer.
+    /// @param order An ERC721 order.
+    function preSignERC721Order(LibNFTOrder.ERC721Order memory order)
+        public
+        override
+    {
+        require(
+            order.maker == msg.sender,
+            "ERC721OrdersFeature::preSignERC721Order/ONLY_MAKER"
+        );
+        bytes32 orderHash = getERC721OrderHash(order);
+        LibERC721OrdersStorage.getStorage().preSigned[orderHash] = true;
+
+        emit ERC721OrderPreSigned(
+            order.direction,
+            order.maker,
+            order.taker,
+            order.expiry,
+            order.nonce,
+            order.erc20Token,
+            order.erc20TokenAmount,
+            order.fees,
+            order.erc721Token,
+            order.erc721TokenId,
+            order.erc721TokenProperties
+        );
+    }
+
+    // Core settlement logic for selling an ERC721 asset.
+    // Used by `sellERC721` and `onERC721Received`.
+    function _sellERC721(
+        LibNFTOrder.ERC721Order memory buyOrder,
+        LibSignature.Signature memory signature,
+        uint256 erc721TokenId,
+        bool unwrapNativeToken,
+        address taker,
+        address currentNftOwner,
+        bytes memory takerCallbackData
+    )
+        private
+    {
+        _sellNFT(
+            buyOrder.asNFTOrder(),
+            signature,
+            SellParams(
+                1, // sell amount
+                erc721TokenId,
+                unwrapNativeToken,
+                taker,
+                currentNftOwner,
+                takerCallbackData
+            )
+        );
+
+        emit ERC721OrderFilled(
+            buyOrder.direction,
+            buyOrder.maker,
+            taker,
+            buyOrder.nonce,
+            buyOrder.erc20Token,
+            buyOrder.erc20TokenAmount,
+            buyOrder.erc721Token,
+            erc721TokenId,
+            address(0)
+        );
+    }
+
+    // Core settlement logic for buying an ERC721 asset.
+    // Used by `buyERC721` and `batchBuyERC721s`.
+    function _buyERC721(
+        LibNFTOrder.ERC721Order memory sellOrder,
+        LibSignature.Signature memory signature,
+        uint256 ethAvailable,
+        bytes memory takerCallbackData
+    )
+        public
+        payable
+    {
+        _buyNFT(
+            sellOrder.asNFTOrder(),
+            signature,
+            BuyParams(
+                1, // buy amount
+                ethAvailable,
+                takerCallbackData
+            )
+        );
+
+        emit ERC721OrderFilled(
+            sellOrder.direction,
+            sellOrder.maker,
+            msg.sender,
+            sellOrder.nonce,
+            sellOrder.erc20Token,
+            sellOrder.erc20TokenAmount,
+            sellOrder.erc721Token,
+            sellOrder.erc721TokenId,
+            address(0)
+        );
+    }
+
+
+    /// @dev Checks whether the given signature is valid for the
+    ///      the given ERC721 order. Reverts if not.
+    /// @param order The ERC721 order.
+    /// @param signature The signature to validate.
+    function validateERC721OrderSignature(
+        LibNFTOrder.ERC721Order memory order,
+        LibSignature.Signature memory signature
+    )
+        public
+        override
+        view
+    {
+        bytes32 orderHash = getERC721OrderHash(order);
+        _validateOrderSignature(orderHash, signature, order.maker);
+    }
+
+    /// @dev Validates that the given signature is valid for the
+    ///      given maker and order hash. Reverts if the signature
+    ///      is not valid.
+    /// @param orderHash The hash of the order that was signed.
+    /// @param signature The signature to check.
+    /// @param maker The maker of the order.
+    function _validateOrderSignature(
+        bytes32 orderHash,
+        LibSignature.Signature memory signature,
+        address maker
+    )
+        internal
+        override
+        view
+    {
+        if (signature.signatureType == LibSignature.SignatureType.PRESIGNED) {
+            // Check if order hash has been pre-signed by the maker.
+            bool isPreSigned = LibERC721OrdersStorage.getStorage().preSigned[orderHash];
+            if (!isPreSigned) {
+                LibNFTOrdersRichErrors.InvalidSignerError(maker, address(0)).rrevert();
+            }
+        } else {
+            address signer = LibSignature.getSignerOfHash(orderHash, signature);
+            if (signer != maker) {
+                LibNFTOrdersRichErrors.InvalidSignerError(maker, signer).rrevert();
+            }
+        }
+    }
+
+    /// @dev Transfers an NFT asset.
+    /// @param token The address of the NFT contract.
+    /// @param from The address currently holding the asset.
+    /// @param to The address to transfer the asset to.
+    /// @param tokenId The ID of the asset to transfer.
+    /// @param amount The amount of the asset to transfer. Always
+    ///        1 for ERC721 assets.
+    function _transferNFTAssetFrom(
+        address token,
+        address from,
+        address to,
+        uint256 tokenId,
+        uint256 amount
+    )
+        internal
+        override
+    {
+        assert(amount == 1);
+        _transferERC721AssetFrom(IERC721Token(token), from, to, tokenId);
+    }
+
+    /// @dev Updates storage to indicate that the given order
+    ///      has been filled by the given amount.
+    /// @param order The order that has been filled.
+    /// @param fillAmount The amount (denominated in the NFT asset)
+    ///        that the order has been filled by.
+    function _updateOrderState(
+        LibNFTOrder.NFTOrder memory order,
+        bytes32 /* orderHash */,
+        uint128 fillAmount
+    )
+        internal
+        override
+    {
+        assert(fillAmount == 1);
+        _setOrderStatusBit(order.maker, order.nonce);
+    }
+
+    function _setOrderStatusBit(address maker, uint256 nonce)
+        private
+    {
+        // The bitvector is indexed by the lower 8 bits of the nonce.
+        uint256 flag = 1 << (nonce & 255);
+        // Update order status bit vector to indicate that the given order
+        // has been cancelled/filled by setting the designated bit to 1.
+        LibERC721OrdersStorage.getStorage().orderStatusByMaker
+            [maker][uint248(nonce >> 8)] |= flag;
+    }
+
+    /// @dev If the given order is buying an ERC721 asset, checks
+    ///      whether or not the given token ID satisfies the required
+    ///      properties specified in the order. If the order does not
+    ///      specify any properties, this function instead checks
+    ///      whether the given token ID matches the ID in the order.
+    ///      Reverts if any checks fail, or if the order is selling
+    ///      an ERC721 asset.
+    /// @param order The ERC721 order.
+    /// @param erc721TokenId The ID of the ERC721 asset.
+    function validateERC721OrderProperties(
+        LibNFTOrder.ERC721Order memory order,
+        uint256 erc721TokenId
+    )
+        public
+        override
+        view
+    {
+        _validateOrderProperties(
+            order.asNFTOrder(),
+            erc721TokenId
+        );
+    }
+
+    /// @dev Get the current status of an ERC721 order.
+    /// @param order The ERC721 order.
+    /// @return status The status of the order.
+    function getERC721OrderStatus(LibNFTOrder.ERC721Order memory order)
+        public
+        override
+        view
+        returns (LibNFTOrder.OrderStatus status)
+    {
+        // Only buy orders with `erc721TokenId` == 0 can be property
+        // orders.
+        if (order.erc721TokenProperties.length > 0 &&
+                (order.direction != LibNFTOrder.TradeDirection.BUY_NFT ||
+                 order.erc721TokenId != 0))
+        {
+            return LibNFTOrder.OrderStatus.INVALID;
+        }
+
+        // Buy orders cannot use ETH as the ERC20 token, since ETH cannot be
+        // transferred from the buyer by a contract.
+        if (order.direction == LibNFTOrder.TradeDirection.BUY_NFT &&
+            address(order.erc20Token) == NATIVE_TOKEN_ADDRESS)
+        {
+            return LibNFTOrder.OrderStatus.INVALID;
+        }
+
+        // Check for expiry.
+        if (order.expiry <= block.timestamp) {
+            return LibNFTOrder.OrderStatus.EXPIRED;
+        }
+
+        // Check `orderStatusByMaker` state variable to see if the order
+        // has been cancelled or previously filled.
+        LibERC721OrdersStorage.Storage storage stor =
+            LibERC721OrdersStorage.getStorage();
+        // `orderStatusByMaker` is indexed by maker and nonce.
+        uint256 orderStatusBitVector =
+            stor.orderStatusByMaker[order.maker][uint248(order.nonce >> 8)];
+        // The bitvector is indexed by the lower 8 bits of the nonce.
+        uint256 flag = 1 << (order.nonce & 255);
+        // If the designated bit is set, the order has been cancelled or
+        // previously filled, so it is now unfillable.
+        if (orderStatusBitVector & flag != 0) {
+            return LibNFTOrder.OrderStatus.UNFILLABLE;
+        }
+
+        // Otherwise, the order is fillable.
+        return LibNFTOrder.OrderStatus.FILLABLE;
+    }
+
+    /// @dev Get the order info for an NFT order.
+    /// @param order The NFT order.
+    /// @return orderInfo Info about the order.
+    function _getOrderInfo(LibNFTOrder.NFTOrder memory order)
+        internal
+        override
+        view
+        returns (LibNFTOrder.OrderInfo memory orderInfo)
+    {
+        LibNFTOrder.ERC721Order memory erc721Order = order.asERC721Order();
+        orderInfo.orderHash = getERC721OrderHash(erc721Order);
+        orderInfo.status = getERC721OrderStatus(erc721Order);
+        orderInfo.orderAmount = 1;
+        orderInfo.remainingAmount = orderInfo.status == LibNFTOrder.OrderStatus.FILLABLE ? 1 : 0;
+    }
+
+    /// @dev Get the EIP-712 hash of an ERC721 order.
+    /// @param order The ERC721 order.
+    /// @return orderHash The order hash.
+    function getERC721OrderHash(LibNFTOrder.ERC721Order memory order)
+        public
+        override
+        view
+        returns (bytes32 orderHash)
+    {
+        return _getEIP712Hash(LibNFTOrder.getERC721OrderStructHash(order));
+    }
+
+    /// @dev Get the order status bit vector for the given
+    ///      maker address and nonce range.
+    /// @param maker The maker of the order.
+    /// @param nonceRange Order status bit vectors are indexed
+    ///        by maker address and the upper 248 bits of the
+    ///        order nonce. We define `nonceRange` to be these
+    ///        248 bits.
+    /// @return bitVector The order status bit vector for the
+    ///         given maker and nonce range.
+    function getERC721OrderStatusBitVector(address maker, uint248 nonceRange)
+        external
+        override
+        view
+        returns (uint256 bitVector)
+    {
+        LibERC721OrdersStorage.Storage storage stor =
+            LibERC721OrdersStorage.getStorage();
+        return stor.orderStatusByMaker[maker][nonceRange];
+    }
+}

contracts/zero-ex/contracts/src/features/nft_orders/NFTOrders.sol

@@ -0,0 +1,615 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibMathV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../../errors/LibNFTOrdersRichErrors.sol";
+import "../../fixins/FixinCommon.sol";
+import "../../fixins/FixinEIP712.sol";
+import "../../fixins/FixinTokenSpender.sol";
+import "../../migrations/LibMigrate.sol";
+import "../../vendor/IFeeRecipient.sol";
+import "../../vendor/ITakerCallback.sol";
+import "../libs/LibSignature.sol";
+import "../libs/LibNFTOrder.sol";
+
+
+/// @dev Abstract base contract inherited by ERC721OrdersFeature and NFTOrders
+abstract contract NFTOrders is
+    FixinCommon,
+    FixinEIP712,
+    FixinTokenSpender
+{
+    using LibSafeMathV06 for uint256;
+
+    /// @dev Native token pseudo-address.
+    address constant internal NATIVE_TOKEN_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+    /// @dev The WETH token contract.
+    IEtherTokenV06 internal immutable WETH;
+
+    /// @dev The magic return value indicating the success of a `receiveZeroExFeeCallback`.
+    bytes4 private constant FEE_CALLBACK_MAGIC_BYTES = IFeeRecipient.receiveZeroExFeeCallback.selector;
+    /// @dev The magic return value indicating the success of a `zeroExTakerCallback`.
+    bytes4 private constant TAKER_CALLBACK_MAGIC_BYTES = ITakerCallback.zeroExTakerCallback.selector;
+
+    constructor(address zeroExAddress, IEtherTokenV06 weth)
+        public
+        FixinEIP712(zeroExAddress)
+    {
+        WETH = weth;
+    }
+
+    struct SellParams {
+        uint128 sellAmount;
+        uint256 tokenId;
+        bool unwrapNativeToken;
+        address taker;
+        address currentNftOwner;
+        bytes takerCallbackData;
+    }
+
+    struct BuyParams {
+        uint128 buyAmount;
+        uint256 ethAvailable;
+        bytes takerCallbackData;
+    }
+
+    // Core settlement logic for selling an NFT asset.
+    function _sellNFT(
+        LibNFTOrder.NFTOrder memory buyOrder,
+        LibSignature.Signature memory signature,
+        SellParams memory params
+    )
+        internal
+        returns (uint256 erc20FillAmount)
+    {
+        LibNFTOrder.OrderInfo memory orderInfo = _getOrderInfo(buyOrder);
+        // Check that the order can be filled.
+        _validateBuyOrder(
+            buyOrder,
+            signature,
+            orderInfo,
+            params.taker,
+            params.tokenId
+        );
+
+        if (params.sellAmount > orderInfo.remainingAmount) {
+            LibNFTOrdersRichErrors.ExceedsRemainingOrderAmount(
+                orderInfo.remainingAmount,
+                params.sellAmount
+            ).rrevert();
+        }
+
+        _updateOrderState(buyOrder, orderInfo.orderHash, params.sellAmount);
+
+        if (params.sellAmount == orderInfo.orderAmount) {
+            erc20FillAmount = buyOrder.erc20TokenAmount;
+        } else {
+            // Rounding favors the order maker.
+            erc20FillAmount = LibMathV06.getPartialAmountFloor(
+                params.sellAmount,
+                orderInfo.orderAmount,
+                buyOrder.erc20TokenAmount
+            );
+        }
+
+        if (params.unwrapNativeToken) {
+            // The ERC20 token must be WETH for it to be unwrapped.
+            if (buyOrder.erc20Token != WETH) {
+                LibNFTOrdersRichErrors.ERC20TokenMismatchError(
+                    address(buyOrder.erc20Token),
+                    address(WETH)
+                ).rrevert();
+            }
+            // Transfer the WETH from the maker to the Exchange Proxy
+            // so we can unwrap it before sending it to the seller.
+            // TODO: Probably safe to just use WETH.transferFrom for some
+            //       small gas savings
+            _transferERC20TokensFrom(
+                WETH,
+                buyOrder.maker,
+                address(this),
+                erc20FillAmount
+            );
+            // Unwrap WETH into ETH.
+            WETH.withdraw(erc20FillAmount);
+            // Send ETH to the seller.
+            _transferEth(payable(params.taker), erc20FillAmount);
+        } else {
+            // Transfer the ERC20 token from the buyer to the seller.
+            _transferERC20TokensFrom(
+                buyOrder.erc20Token,
+                buyOrder.maker,
+                params.taker,
+                erc20FillAmount
+            );
+        }
+
+        if (params.takerCallbackData.length > 0) {
+            require(
+                params.taker != address(this),
+                "NFTOrders::_sellNFT/CANNOT_CALLBACK_SELF"
+            );
+            // Invoke the callback
+            bytes4 callbackResult = ITakerCallback(params.taker)
+                .zeroExTakerCallback(orderInfo.orderHash, params.takerCallbackData);
+            // Check for the magic success bytes
+            require(
+                callbackResult == TAKER_CALLBACK_MAGIC_BYTES,
+                "NFTOrders::_sellNFT/CALLBACK_FAILED"
+            );
+        }
+
+        // Transfer the NFT asset to the buyer.
+        // If this function is called from the
+        // `onNFTReceived` callback the Exchange Proxy
+        // holds the asset. Otherwise, transfer it from
+        // the seller.
+        _transferNFTAssetFrom(
+            buyOrder.nft,
+            params.currentNftOwner,
+            buyOrder.maker,
+            params.tokenId,
+            params.sellAmount
+        );
+
+        // The buyer pays the order fees.
+        _payFees(
+            buyOrder,
+            buyOrder.maker,
+            params.sellAmount,
+            orderInfo.orderAmount,
+            false
+        );
+    }
+
+    // Core settlement logic for buying an NFT asset.
+    function _buyNFT(
+        LibNFTOrder.NFTOrder memory sellOrder,
+        LibSignature.Signature memory signature,
+        BuyParams memory params
+    )
+        internal
+        returns (uint256 erc20FillAmount)
+    {
+        LibNFTOrder.OrderInfo memory orderInfo = _getOrderInfo(sellOrder);
+        // Check that the order can be filled.
+        _validateSellOrder(
+            sellOrder,
+            signature,
+            orderInfo,
+            msg.sender
+        );
+
+        if (params.buyAmount > orderInfo.remainingAmount) {
+            LibNFTOrdersRichErrors.ExceedsRemainingOrderAmount(
+                orderInfo.remainingAmount,
+                params.buyAmount
+            ).rrevert();
+        }
+
+        _updateOrderState(sellOrder, orderInfo.orderHash, params.buyAmount);
+
+        if (params.buyAmount == orderInfo.orderAmount) {
+            erc20FillAmount = sellOrder.erc20TokenAmount;
+        } else {
+            // Rounding favors the order maker.
+            erc20FillAmount = LibMathV06.getPartialAmountCeil(
+                params.buyAmount,
+                orderInfo.orderAmount,
+                sellOrder.erc20TokenAmount
+            );
+        }
+
+        // Transfer the NFT asset to the buyer (`msg.sender`).
+        _transferNFTAssetFrom(
+            sellOrder.nft,
+            sellOrder.maker,
+            msg.sender,
+            sellOrder.nftId,
+            params.buyAmount
+        );
+
+        uint256 ethAvailable = params.ethAvailable;
+        if (params.takerCallbackData.length > 0) {
+            require(
+                msg.sender != address(this),
+                "NFTOrders::_buyNFT/CANNOT_CALLBACK_SELF"
+            );
+            uint256 ethBalanceBeforeCallback = address(this).balance;
+            // Invoke the callback
+            bytes4 callbackResult = ITakerCallback(msg.sender)
+                .zeroExTakerCallback(orderInfo.orderHash, params.takerCallbackData);
+            // Update `ethAvailable` with amount acquired during
+            // the callback
+            ethAvailable = ethAvailable.safeAdd(
+                address(this).balance.safeSub(ethBalanceBeforeCallback)
+            );
+            // Check for the magic success bytes
+            require(
+                callbackResult == TAKER_CALLBACK_MAGIC_BYTES,
+                "NFTOrders::_buyNFT/CALLBACK_FAILED"
+            );
+        }
+
+        if (address(sellOrder.erc20Token) == NATIVE_TOKEN_ADDRESS) {
+            // Transfer ETH to the seller.
+            _transferEth(payable(sellOrder.maker), erc20FillAmount);
+            // Fees are paid from the EP's current balance of ETH.
+            _payEthFees(
+                sellOrder,
+                params.buyAmount,
+                orderInfo.orderAmount,
+                erc20FillAmount,
+                ethAvailable
+            );
+        } else if (sellOrder.erc20Token == WETH) {
+            // If there is enough ETH available, fill the WETH order
+            // (including fees) using that ETH.
+            // Otherwise, transfer WETH from the taker.
+            if (ethAvailable >= erc20FillAmount) {
+                // Wrap ETH.
+                WETH.deposit{value: erc20FillAmount}();
+                // TODO: Probably safe to just use WETH.transfer for some
+                //       small gas savings
+                // Transfer WETH to the seller.
+                _transferERC20Tokens(
+                    WETH,
+                    sellOrder.maker,
+                    erc20FillAmount
+                );
+                // Fees are paid from the EP's current balance of ETH.
+                _payEthFees(
+                    sellOrder,
+                    params.buyAmount,
+                    orderInfo.orderAmount,
+                    erc20FillAmount,
+                    ethAvailable
+                );
+            } else {
+                // Transfer WETH from the buyer to the seller.
+                _transferERC20TokensFrom(
+                    sellOrder.erc20Token,
+                    msg.sender,
+                    sellOrder.maker,
+                    erc20FillAmount
+                );
+                // The buyer pays fees using WETH.
+                _payFees(
+                    sellOrder,
+                    msg.sender,
+                    params.buyAmount,
+                    orderInfo.orderAmount,
+                    false
+                );
+            }
+        } else {
+            // Transfer ERC20 token from the buyer to the seller.
+            _transferERC20TokensFrom(
+                sellOrder.erc20Token,
+                msg.sender,
+                sellOrder.maker,
+                erc20FillAmount
+            );
+            // The buyer pays fees.
+            _payFees(
+                sellOrder,
+                msg.sender,
+                params.buyAmount,
+                orderInfo.orderAmount,
+                false
+            );
+        }
+    }
+
+    function _validateSellOrder(
+        LibNFTOrder.NFTOrder memory sellOrder,
+        LibSignature.Signature memory signature,
+        LibNFTOrder.OrderInfo memory orderInfo,
+        address taker
+    )
+        internal
+        view
+    {
+        // Order must be selling the NFT asset.
+        require(
+            sellOrder.direction == LibNFTOrder.TradeDirection.SELL_NFT,
+            "NFTOrders::_validateSellOrder/WRONG_TRADE_DIRECTION"
+        );
+        // Taker must match the order taker, if one is specified.
+        if (sellOrder.taker != address(0) && sellOrder.taker != taker) {
+            LibNFTOrdersRichErrors.OnlyTakerError(taker, sellOrder.taker).rrevert();
+        }
+        // Check that the order is valid and has not expired, been cancelled,
+        // or been filled.
+        if (orderInfo.status != LibNFTOrder.OrderStatus.FILLABLE) {
+            LibNFTOrdersRichErrors.OrderNotFillableError(
+                sellOrder.maker,
+                sellOrder.nonce,
+                uint8(orderInfo.status)
+            ).rrevert();
+        }
+
+        // Check the signature.
+        _validateOrderSignature(orderInfo.orderHash, signature, sellOrder.maker);
+    }
+
+    function _validateBuyOrder(
+        LibNFTOrder.NFTOrder memory buyOrder,
+        LibSignature.Signature memory signature,
+        LibNFTOrder.OrderInfo memory orderInfo,
+        address taker,
+        uint256 tokenId
+    )
+        internal
+        view
+    {
+        // Order must be buying the NFT asset.
+        require(
+            buyOrder.direction == LibNFTOrder.TradeDirection.BUY_NFT,
+            "NFTOrders::_validateBuyOrder/WRONG_TRADE_DIRECTION"
+        );
+        // The ERC20 token cannot be ETH.
+        require(
+            address(buyOrder.erc20Token) != NATIVE_TOKEN_ADDRESS,
+            "NFTOrders::_validateBuyOrder/NATIVE_TOKEN_NOT_ALLOWED"
+        );
+        // Taker must match the order taker, if one is specified.
+        if (buyOrder.taker != address(0) && buyOrder.taker != taker) {
+            LibNFTOrdersRichErrors.OnlyTakerError(taker, buyOrder.taker).rrevert();
+        }
+        // Check that the order is valid and has not expired, been cancelled,
+        // or been filled.
+        if (orderInfo.status != LibNFTOrder.OrderStatus.FILLABLE) {
+            LibNFTOrdersRichErrors.OrderNotFillableError(
+                buyOrder.maker,
+                buyOrder.nonce,
+                uint8(orderInfo.status)
+            ).rrevert();
+        }
+        // Check that the asset with the given token ID satisfies the properties
+        // specified by the order.
+        _validateOrderProperties(buyOrder, tokenId);
+        // Check the signature.
+        _validateOrderSignature(orderInfo.orderHash, signature, buyOrder.maker);
+    }
+
+    function _payEthFees(
+        LibNFTOrder.NFTOrder memory order,
+        uint128 fillAmount,
+        uint128 orderAmount,
+        uint256 ethSpent,
+        uint256 ethAvailable
+    )
+        private
+    {
+        // Pay fees using ETH.
+        uint256 ethFees = _payFees(
+            order,
+            address(this),
+            fillAmount,
+            orderAmount,
+            true
+        );
+        // Update amount of ETH spent.
+        ethSpent = ethSpent.safeAdd(ethFees);
+        if (ethSpent > ethAvailable) {
+            LibNFTOrdersRichErrors.OverspentEthError(
+                ethSpent,
+                ethAvailable
+            ).rrevert();
+        }
+    }
+
+    function _payFees(
+        LibNFTOrder.NFTOrder memory order,
+        address payer,
+        uint128 fillAmount,
+        uint128 orderAmount,
+        bool useNativeToken
+    )
+        internal
+        returns (uint256 totalFeesPaid)
+    {
+        // Make assertions about ETH case
+        if (useNativeToken) {
+            assert(payer == address(this));
+            assert(
+                order.erc20Token == WETH ||
+                address(order.erc20Token) == NATIVE_TOKEN_ADDRESS
+            );
+        }
+
+        for (uint256 i = 0; i < order.fees.length; i++) {
+            LibNFTOrder.Fee memory fee = order.fees[i];
+
+            require(
+                fee.recipient != address(this),
+                "NFTOrders::_payFees/RECIPIENT_CANNOT_BE_EXCHANGE_PROXY"
+            );
+
+            uint256 feeFillAmount;
+            if (fillAmount == orderAmount) {
+                feeFillAmount = fee.amount;
+            } else {
+                // Round against the fee recipient
+                feeFillAmount = LibMathV06.getPartialAmountFloor(
+                    fillAmount,
+                    orderAmount,
+                    fee.amount
+                );
+            }
+            if (feeFillAmount == 0) {
+                continue;
+            }
+
+            if (useNativeToken) {
+                // Transfer ETH to the fee recipient.
+                _transferEth(payable(fee.recipient), feeFillAmount);
+            } else {
+                // Transfer ERC20 token from payer to recipient.
+                _transferERC20TokensFrom(
+                    order.erc20Token,
+                    payer,
+                    fee.recipient,
+                    feeFillAmount
+                );
+            }
+            // Note that the fee callback is _not_ called if zero
+            // `feeData` is provided. If `feeData` is provided, we assume
+            // the fee recipient is a contract that implements the
+            // `IFeeRecipient` interface.
+            if (fee.feeData.length > 0) {
+                // Invoke the callback
+                bytes4 callbackResult = IFeeRecipient(fee.recipient).receiveZeroExFeeCallback(
+                    useNativeToken ? NATIVE_TOKEN_ADDRESS : address(order.erc20Token),
+                    feeFillAmount,
+                    fee.feeData
+                );
+                // Check for the magic success bytes
+                require(
+                    callbackResult == FEE_CALLBACK_MAGIC_BYTES,
+                    "NFTOrders::_payFees/CALLBACK_FAILED"
+                );
+            }
+            // Sum the fees paid
+            totalFeesPaid = totalFeesPaid.safeAdd(feeFillAmount);
+        }
+    }
+
+    /// @dev If the given order is buying an NFT asset, checks
+    ///      whether or not the given token ID satisfies the required
+    ///      properties specified in the order. If the order does not
+    ///      specify any properties, this function instead checks
+    ///      whether the given token ID matches the ID in the order.
+    ///      Reverts if any checks fail, or if the order is selling
+    ///      an NFT asset.
+    /// @param order The NFT order.
+    /// @param tokenId The ID of the NFT asset.
+    function _validateOrderProperties(
+        LibNFTOrder.NFTOrder memory order,
+        uint256 tokenId
+    )
+        internal
+        view
+    {
+        // Order must be buying an NFT asset to have properties.
+        require(
+            order.direction == LibNFTOrder.TradeDirection.BUY_NFT,
+            "NFTOrders::_validateOrderProperties/WRONG_TRADE_DIRECTION"
+        );
+
+        // If no properties are specified, check that the given
+        // `tokenId` matches the one specified in the order.
+        if (order.nftProperties.length == 0) {
+            if (tokenId != order.nftId) {
+                LibNFTOrdersRichErrors.TokenIdMismatchError(
+                    tokenId,
+                    order.nftId
+                ).rrevert();
+            }
+        } else {
+            // Validate each property
+            for (uint256 i = 0; i < order.nftProperties.length; i++) {
+                LibNFTOrder.Property memory property = order.nftProperties[i];
+                // `address(0)` is interpreted as a no-op. Any token ID
+                // will satisfy a property with `propertyValidator == address(0)`.
+                if (address(property.propertyValidator) == address(0)) {
+                    continue;
+                }
+
+                // Call the property validator and throw a descriptive error
+                // if the call reverts.
+                try property.propertyValidator.validateProperty(
+                    order.nft,
+                    tokenId,
+                    property.propertyData
+                ) {} catch (bytes memory errorData) {
+                    LibNFTOrdersRichErrors.PropertyValidationFailedError(
+                        address(property.propertyValidator),
+                        order.nft,
+                        tokenId,
+                        property.propertyData,
+                        errorData
+                    ).rrevert();
+                }
+            }
+        }
+    }
+
+    /// @dev Validates that the given signature is valid for the
+    ///      given maker and order hash. Reverts if the signature
+    ///      is not valid.
+    /// @param orderHash The hash of the order that was signed.
+    /// @param signature The signature to check.
+    /// @param maker The maker of the order.
+    function _validateOrderSignature(
+        bytes32 orderHash,
+        LibSignature.Signature memory signature,
+        address maker
+    )
+        internal
+        virtual
+        view;
+
+    /// @dev Transfers an NFT asset.
+    /// @param token The address of the NFT contract.
+    /// @param from The address currently holding the asset.
+    /// @param to The address to transfer the asset to.
+    /// @param tokenId The ID of the asset to transfer.
+    /// @param amount The amount of the asset to transfer. Always
+    ///        1 for ERC721 assets.
+    function _transferNFTAssetFrom(
+        address token,
+        address from,
+        address to,
+        uint256 tokenId,
+        uint256 amount
+    )
+        internal
+        virtual;
+
+    /// @dev Updates storage to indicate that the given order
+    ///      has been filled by the given amount.
+    /// @param order The order that has been filled.
+    /// @param orderHash The hash of `order`.
+    /// @param fillAmount The amount (denominated in the NFT asset)
+    ///        that the order has been filled by.
+    function _updateOrderState(
+        LibNFTOrder.NFTOrder memory order,
+        bytes32 orderHash,
+        uint128 fillAmount
+    )
+        internal
+        virtual;
+
+    /// @dev Get the order info for an NFT order.
+    /// @param order The NFT order.
+    /// @return orderInfo Info about the order.
+    function _getOrderInfo(LibNFTOrder.NFTOrder memory order)
+        internal
+        virtual
+        view
+        returns (LibNFTOrder.OrderInfo memory orderInfo);
+}

contracts/zero-ex/contracts/src/fixins/FixinERC1155Spender.sol

@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../vendor/IERC1155Token.sol";
+
+
+/// @dev Helpers for moving ERC1155 assets around.
+abstract contract FixinERC1155Spender {
+
+    // Mask of the lower 20 bytes of a bytes32.
+    uint256 constant private ADDRESS_MASK = 0x000000000000000000000000ffffffffffffffffffffffffffffffffffffffff;
+
+    /// @dev Transfers an ERC1155 asset from `owner` to `to`.
+    /// @param token The address of the ERC1155 token contract.
+    /// @param owner The owner of the asset.
+    /// @param to The recipient of the asset.
+    /// @param tokenId The token ID of the asset to transfer.
+    /// @param amount The amount of the asset to transfer.
+    function _transferERC1155AssetFrom(
+        IERC1155Token token,
+        address owner,
+        address to,
+        uint256 tokenId,
+        uint256 amount
+    )
+        internal
+    {
+        require(address(token) != address(this), "FixinERC1155Spender/CANNOT_INVOKE_SELF");
+
+        assembly {
+            let ptr := mload(0x40) // free memory pointer
+
+            // selector for safeTransferFrom(address,address,uint256,uint256,bytes)
+            mstore(ptr, 0xf242432a00000000000000000000000000000000000000000000000000000000)
+            mstore(add(ptr, 0x04), and(owner, ADDRESS_MASK))
+            mstore(add(ptr, 0x24), and(to, ADDRESS_MASK))
+            mstore(add(ptr, 0x44), tokenId)
+            mstore(add(ptr, 0x64), amount)
+            mstore(add(ptr, 0x84), 0xa0)
+            mstore(add(ptr, 0xa4), 0)
+
+            let success := call(
+                gas(),
+                and(token, ADDRESS_MASK),
+                0,
+                ptr,
+                0xc4,
+                0,
+                0
+            )
+
+            if iszero(success) {
+                let rdsize := returndatasize()
+                returndatacopy(ptr, 0, rdsize)
+                revert(ptr, rdsize)
+            }
+        }
+    }
+}

contracts/zero-ex/contracts/src/fixins/FixinERC721Spender.sol

@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../vendor/IERC721Token.sol";
+
+
+/// @dev Helpers for moving ERC721 assets around.
+abstract contract FixinERC721Spender {
+
+    // Mask of the lower 20 bytes of a bytes32.
+    uint256 constant private ADDRESS_MASK = 0x000000000000000000000000ffffffffffffffffffffffffffffffffffffffff;
+
+    /// @dev Transfers an ERC721 asset from `owner` to `to`.
+    /// @param token The address of the ERC721 token contract.
+    /// @param owner The owner of the asset.
+    /// @param to The recipient of the asset.
+    /// @param tokenId The token ID of the asset to transfer.
+    function _transferERC721AssetFrom(
+        IERC721Token token,
+        address owner,
+        address to,
+        uint256 tokenId
+    )
+        internal
+    {
+        require(address(token) != address(this), "FixinERC721Spender/CANNOT_INVOKE_SELF");
+
+        assembly {
+            let ptr := mload(0x40) // free memory pointer
+
+            // selector for transferFrom(address,address,uint256)
+            mstore(ptr, 0x23b872dd00000000000000000000000000000000000000000000000000000000)
+            mstore(add(ptr, 0x04), and(owner, ADDRESS_MASK))
+            mstore(add(ptr, 0x24), and(to, ADDRESS_MASK))
+            mstore(add(ptr, 0x44), tokenId)
+
+            let success := call(
+                gas(),
+                and(token, ADDRESS_MASK),
+                0,
+                ptr,
+                0x64,
+                0,
+                0
+            )
+
+            if iszero(success) {
+                let rdsize := returndatasize()
+                returndatacopy(ptr, 0, rdsize)
+                revert(ptr, rdsize)
+            }
+        }
+    }
+}

contracts/zero-ex/contracts/src/fixins/FixinTokenSpender.sol

@@ -20,7 +20,7 @@
 pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
 
 
@@ -141,6 +141,20 @@ abstract contract FixinTokenSpender {
         }
     }
 
+
+    /// @dev Transfers some amount of ETH to the given recipient and
+    ///      reverts if the transfer fails.
+    /// @param recipient The recipient of the ETH.
+    /// @param amount The amount of ETH to transfer.
+    function _transferEth(address payable recipient, uint256 amount)
+        internal
+    {
+        if (amount > 0) {
+            (bool success,) = recipient.call{value: amount}("");
+            require(success, "FixinTokenSpender::_transferEth/TRANSFER_FAILED");
+        }
+    }
+
     /// @dev Gets the maximum amount of an ERC20 token `token` that can be
     ///      pulled from `owner` by this address.
     /// @param token The token to spend.

contracts/zero-ex/contracts/src/storage/LibERC1155OrdersStorage.sol

@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "./LibStorage.sol";
+
+
+/// @dev Storage helpers for `ERC1155OrdersFeature`.
+library LibERC1155OrdersStorage {
+
+    struct OrderState {
+        // The amount (denominated in the ERC1155 asset)
+        // that the order has been filled by.
+        uint128 filledAmount;
+        // Whether the order has been pre-signed.
+        bool preSigned;
+    }
+
+    /// @dev Storage bucket for this feature.
+    struct Storage {
+        // Mapping from order hash to order state:
+        mapping(bytes32 => OrderState) orderState;
+        // maker => nonce range => order cancellation bit vector
+        mapping(address => mapping(uint248 => uint256)) orderCancellationByMaker;
+    }
+
+    /// @dev Get the storage bucket for this contract.
+    function getStorage() internal pure returns (Storage storage stor) {
+        uint256 storageSlot = LibStorage.getStorageSlot(
+            LibStorage.StorageId.ERC1155Orders
+        );
+        // Dip into assembly to change the slot pointed to by the local
+        // variable `stor`.
+        // See https://solidity.readthedocs.io/en/v0.6.8/assembly.html?highlight=slot#access-to-external-variables-functions-and-libraries
+        assembly { stor_slot := storageSlot }
+    }
+}

contracts/zero-ex/contracts/src/storage/LibERC721OrdersStorage.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "./LibStorage.sol";
+
+
+/// @dev Storage helpers for `ERC721OrdersFeature`.
+library LibERC721OrdersStorage {
+
+    /// @dev Storage bucket for this feature.
+    struct Storage {
+        // maker => nonce range => order status bit vector
+        mapping(address => mapping(uint248 => uint256)) orderStatusByMaker;
+        // order hash => isSigned
+        mapping(bytes32 => bool) preSigned;
+    }
+
+    /// @dev Get the storage bucket for this contract.
+    function getStorage() internal pure returns (Storage storage stor) {
+        uint256 storageSlot = LibStorage.getStorageSlot(
+            LibStorage.StorageId.ERC721Orders
+        );
+        // Dip into assembly to change the slot pointed to by the local
+        // variable `stor`.
+        // See https://solidity.readthedocs.io/en/v0.6.8/assembly.html?highlight=slot#access-to-external-variables-functions-and-libraries
+        assembly { stor_slot := storageSlot }
+    }
+}

contracts/zero-ex/contracts/src/storage/LibStorage.sol

@@ -17,7 +17,7 @@
 
 */
 
-pragma solidity ^0.6.5;
+pragma solidity ^0.6;
 pragma experimental ABIEncoderV2;
 
 
@@ -39,7 +39,9 @@ library LibStorage {
         MetaTransactions,
         ReentrancyGuard,
         NativeOrders,
-        OtcOrders
+        OtcOrders,
+        ERC721Orders,
+        ERC1155Orders
     }
 
     /// @dev Get the storage slot given a storage ID. We assign unique, well-spaced

contracts/zero-ex/contracts/src/transformers/bridges/BridgeAdapter.sol

@@ -22,10 +22,13 @@ pragma experimental ABIEncoderV2;
 
 import "./IBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
+import "./mixins/MixinAaveV2.sol";
 import "./mixins/MixinBalancer.sol";
 import "./mixins/MixinBalancerV2.sol";
+import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinBancor.sol";
 import "./mixins/MixinCoFiX.sol";
+import "./mixins/MixinCompound.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
 import "./mixins/MixinCryptoCom.sol";
@@ -47,10 +50,13 @@ import "./mixins/MixinZeroExBridge.sol";
 
 contract BridgeAdapter is
     IBridgeAdapter,
+    MixinAaveV2,
     MixinBalancer,
     MixinBalancerV2,
+    MixinBalancerV2Batch,
     MixinBancor,
     MixinCoFiX,
+    MixinCompound,
     MixinCurve,
     MixinCurveV2,
     MixinCryptoCom,
@@ -72,10 +78,12 @@ contract BridgeAdapter is
 {
     constructor(IEtherTokenV06 weth)
         public
+        MixinAaveV2()
         MixinBalancer()
         MixinBalancerV2()
         MixinBancor(weth)
         MixinCoFiX()
+        MixinCompound(weth)
         MixinCurve(weth)
         MixinCurveV2()
         MixinCryptoCom()
@@ -153,6 +161,11 @@ contract BridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
+        } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
+            boughtAmount = _tradeBalancerV2Batch(
+                sellAmount,
+                order.bridgeData
+            );
         } else if (protocolId == BridgeProtocols.KYBER) {
             boughtAmount = _tradeKyber(
                 sellToken,
@@ -245,6 +258,20 @@ contract BridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
+        } else if (protocolId == BridgeProtocols.AAVEV2) {
+            boughtAmount = _tradeAaveV2(
+                sellToken,
+                buyToken,
+                sellAmount,
+                order.bridgeData
+            );
+        } else if (protocolId == BridgeProtocols.COMPOUND) {
+            boughtAmount = _tradeCompound(
+                sellToken,
+                buyToken,
+                sellAmount,
+                order.bridgeData
+            );
         } else {
             boughtAmount = _tradeZeroExBridge(
                 sellToken,

contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.sol

@@ -27,27 +27,30 @@ library BridgeProtocols {
     // A incrementally increasing, append-only list of protocol IDs.
     // We don't use an enum so solidity doesn't throw when we pass in a
     // new protocol ID that hasn't been rolled up yet.
-    uint128 internal constant UNKNOWN     = 0;
-    uint128 internal constant CURVE       = 1;
-    uint128 internal constant UNISWAPV2   = 2;
-    uint128 internal constant UNISWAP     = 3;
-    uint128 internal constant BALANCER    = 4;
-    uint128 internal constant KYBER       = 5;
-    uint128 internal constant MOONISWAP   = 6;
-    uint128 internal constant MSTABLE     = 7;
-    uint128 internal constant OASIS       = 8;
-    uint128 internal constant SHELL       = 9;
-    uint128 internal constant DODO        = 10;
-    uint128 internal constant DODOV2      = 11;
-    uint128 internal constant CRYPTOCOM   = 12;
-    uint128 internal constant BANCOR      = 13;
-    uint128 internal constant COFIX       = 14;
-    uint128 internal constant NERVE       = 15;
-    uint128 internal constant MAKERPSM    = 16;
-    uint128 internal constant BALANCERV2  = 17;
-    uint128 internal constant UNISWAPV3   = 18;
-    uint128 internal constant KYBERDMM    = 19;
-    uint128 internal constant CURVEV2     = 20;
-    uint128 internal constant LIDO        = 21;
-    uint128 internal constant CLIPPER     = 22; // Not used: Clipper is now using PLP interface
+    uint128 internal constant UNKNOWN         = 0;
+    uint128 internal constant CURVE           = 1;
+    uint128 internal constant UNISWAPV2       = 2;
+    uint128 internal constant UNISWAP         = 3;
+    uint128 internal constant BALANCER        = 4;
+    uint128 internal constant KYBER           = 5;
+    uint128 internal constant MOONISWAP       = 6;
+    uint128 internal constant MSTABLE         = 7;
+    uint128 internal constant OASIS           = 8;
+    uint128 internal constant SHELL           = 9;
+    uint128 internal constant DODO            = 10;
+    uint128 internal constant DODOV2          = 11;
+    uint128 internal constant CRYPTOCOM       = 12;
+    uint128 internal constant BANCOR          = 13;
+    uint128 internal constant COFIX           = 14;
+    uint128 internal constant NERVE           = 15;
+    uint128 internal constant MAKERPSM        = 16;
+    uint128 internal constant BALANCERV2      = 17;
+    uint128 internal constant UNISWAPV3       = 18;
+    uint128 internal constant KYBERDMM        = 19;
+    uint128 internal constant CURVEV2         = 20;
+    uint128 internal constant LIDO            = 21;
+    uint128 internal constant CLIPPER         = 22; // Not used: Clipper is now using PLP interface
+    uint128 internal constant AAVEV2          = 23;
+    uint128 internal constant COMPOUND        = 24;
+    uint128 internal constant BALANCERV2BATCH = 25;
 }

contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV2.sol

@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+
+// Minimal Aave V2 LendingPool interface
+interface ILendingPool {
+    /**
+   * @dev Deposits an `amount` of underlying asset into the reserve, receiving in return overlying aTokens.
+   * - E.g. User deposits 100 USDC and gets in return 100 aUSDC
+   * @param asset The address of the underlying asset to deposit
+   * @param amount The amount to be deposited
+   * @param onBehalfOf The address that will receive the aTokens, same as msg.sender if the user
+   *   wants to receive them on his own wallet, or a different address if the beneficiary of aTokens
+   *   is a different wallet
+   * @param referralCode Code used to register the integrator originating the operation, for potential rewards.
+   *   0 if the action is executed directly by the user, without any middle-man
+   **/
+  function deposit(
+    address asset,
+    uint256 amount,
+    address onBehalfOf,
+    uint16 referralCode
+  ) external;
+
+  /**
+   * @dev Withdraws an `amount` of underlying asset from the reserve, burning the equivalent aTokens owned
+   * E.g. User has 100 aUSDC, calls withdraw() and receives 100 USDC, burning the 100 aUSDC
+   * @param asset The address of the underlying asset to withdraw
+   * @param amount The underlying amount to be withdrawn
+   *   - Send the value type(uint256).max in order to withdraw the whole aToken balance
+   * @param to Address that will receive the underlying, same as msg.sender if the user
+   *   wants to receive it on his own wallet, or a different address if the beneficiary is a
+   *   different wallet
+   * @return The final amount withdrawn
+   **/
+  function withdraw(
+    address asset,
+    uint256 amount,
+    address to
+  ) external returns (uint256);
+}
+
+contract MixinAaveV2 {
+    using LibERC20TokenV06 for IERC20TokenV06;
+
+    function _tradeAaveV2(
+        IERC20TokenV06 sellToken,
+        IERC20TokenV06 buyToken,
+        uint256 sellAmount,
+        bytes memory bridgeData
+    )
+        internal
+        returns (uint256)
+    {
+        (ILendingPool lendingPool, address aToken) = abi.decode(bridgeData, (ILendingPool, address));
+
+          sellToken.approveIfBelow(
+              address(lendingPool),
+              sellAmount
+          );
+
+        if (address(buyToken) == aToken) {
+            lendingPool.deposit(address(sellToken), sellAmount, address(this), 0);
+            // 1:1 mapping token -> aToken and have the same number of decimals as the underlying token
+            return sellAmount;
+        } else if (address(sellToken) == aToken) {
+            return lendingPool.withdraw(address(buyToken), sellAmount, address(this));
+        }
+
+        revert("MixinAaveV2/UNSUPPORTED_TOKEN_PAIR");
+    }
+}

contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol

@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+
+
+interface IBalancerV2BatchSwapVault {
+
+    enum SwapKind { GIVEN_IN, GIVEN_OUT }
+
+    struct BatchSwapStep {
+        bytes32 poolId;
+        uint256 assetInIndex;
+        uint256 assetOutIndex;
+        uint256 amount;
+        bytes userData;
+    }
+
+    struct FundManagement {
+        address sender;
+        bool fromInternalBalance;
+        address payable recipient;
+        bool toInternalBalance;
+    }
+
+    function batchSwap(
+        SwapKind kind,
+        BatchSwapStep[] calldata swaps,
+        IERC20TokenV06[] calldata assets,
+        FundManagement calldata funds,
+        int256[] calldata limits,
+        uint256 deadline
+    ) external returns (int256[] memory amounts);
+}
+
+contract MixinBalancerV2Batch {
+
+    using LibERC20TokenV06 for IERC20TokenV06;
+
+    struct BalancerV2BatchBridgeData {
+        IBalancerV2BatchSwapVault vault;
+        IBalancerV2BatchSwapVault.BatchSwapStep[] swapSteps;
+        IERC20TokenV06[] assets;
+    }
+
+    function _tradeBalancerV2Batch(
+        uint256 sellAmount,
+        bytes memory bridgeData
+    )
+        internal
+        returns (uint256 boughtAmount)
+    {
+        // Decode the bridge data.
+        (
+            IBalancerV2BatchSwapVault vault,
+            IBalancerV2BatchSwapVault.BatchSwapStep[] memory swapSteps,
+            address[] memory assets_
+        ) = abi.decode(bridgeData, (IBalancerV2BatchSwapVault, IBalancerV2BatchSwapVault.BatchSwapStep[], address[]));
+        IERC20TokenV06[] memory assets;
+        assembly { assets := assets_ }
+
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        assets[0].approveIfBelow(address(vault), sellAmount);
+
+        swapSteps[0].amount = sellAmount;
+        int256[] memory limits = new int256[](assets.length);
+        for (uint256 i = 0; i < limits.length; ++i) {
+            limits[i] = type(int256).max;
+        }
+
+        int256[] memory amounts = vault.batchSwap(
+            IBalancerV2BatchSwapVault.SwapKind.GIVEN_IN,
+            swapSteps,
+            assets,
+            IBalancerV2BatchSwapVault.FundManagement({
+                sender: address(this),
+                fromInternalBalance: false,
+                recipient: payable(address(this)),
+                toInternalBalance: false
+            }),
+            limits,
+            block.timestamp + 1
+        );
+        require(amounts[amounts.length - 1] <= 0, 'Unexpected BalancerV2Batch output');
+        return uint256(amounts[amounts.length - 1] * -1);
+    }
+}

contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCompound.sol

@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+
+
+/// @dev Minimal CToken interface
+interface ICToken {
+    /// @dev deposits specified amount underlying tokens and mints cToken for the sender
+    /// @param mintAmountInUnderlying amount of underlying tokens to deposit to mint cTokens
+    /// @return status code of whether the mint was successful or not
+    function mint(uint256 mintAmountInUnderlying) external returns (uint256);
+    /// @dev redeems specified amount of cTokens and returns the underlying token to the sender
+    /// @param redeemTokensInCtokens amount of cTokens to redeem for underlying collateral
+    /// @return status code of whether the redemption was successful or not
+    function redeem(uint256 redeemTokensInCtokens) external returns (uint256);
+}
+/// @dev Minimal CEther interface
+interface ICEther {
+    /// @dev deposits the amount of Ether sent as value and return mints cEther for the sender
+    function mint() payable external;
+    /// @dev redeems specified amount of cETH and returns the underlying ether to the sender
+    /// @dev redeemTokensInCEther amount of cETH to redeem for underlying ether
+    /// @return status code of whether the redemption was successful or not
+    function redeem(uint256 redeemTokensInCEther) external returns (uint256);
+}
+
+contract MixinCompound {
+    using LibERC20TokenV06 for IERC20TokenV06;
+    using LibSafeMathV06 for uint256;
+
+    IEtherTokenV06 private immutable WETH;
+
+    constructor(IEtherTokenV06 weth)
+        public
+    {
+        WETH = weth;
+    }
+
+    uint256 constant private COMPOUND_SUCCESS_CODE = 0;
+
+    function _tradeCompound(
+        IERC20TokenV06 sellToken,
+        IERC20TokenV06 buyToken,
+        uint256 sellAmount,
+        bytes memory bridgeData
+    )
+        internal
+        returns (uint256)
+    {
+        (address cTokenAddress) = abi.decode(bridgeData, (address));
+        uint256 beforeBalance = buyToken.balanceOf(address(this));
+
+        if (address(buyToken) == cTokenAddress) {
+            if (address(sellToken) == address(WETH)) {
+                // ETH/WETH -> cETH
+                ICEther cETH = ICEther(cTokenAddress);
+                // Compound expects ETH to be sent with mint call
+                WETH.withdraw(sellAmount);
+                // NOTE: cETH mint will revert on failure instead of returning a status code
+                cETH.mint{value: sellAmount}();
+            } else {
+                sellToken.approveIfBelow(
+                    cTokenAddress,
+                    sellAmount
+                );
+                // Token -> cToken
+                ICToken cToken = ICToken(cTokenAddress);
+                require(cToken.mint(sellAmount) == COMPOUND_SUCCESS_CODE, "MixinCompound/FAILED_TO_MINT_CTOKEN");
+            }
+        } else if (address(sellToken) == cTokenAddress) {
+            if (address(buyToken) == address(WETH)) {
+                // cETH -> ETH/WETH
+                uint256 etherBalanceBefore = address(this).balance;
+                ICEther cETH = ICEther(cTokenAddress);
+                require(cETH.redeem(sellAmount) == COMPOUND_SUCCESS_CODE, "MixinCompound/FAILED_TO_REDEEM_CETHER");
+                uint256 etherBalanceAfter = address(this).balance;
+                uint256 receivedEtherBalance = etherBalanceAfter.safeSub(etherBalanceBefore);
+                WETH.deposit{value: receivedEtherBalance}();
+            } else {
+                ICToken cToken = ICToken(cTokenAddress);
+                require(cToken.redeem(sellAmount) == COMPOUND_SUCCESS_CODE, "MixinCompound/FAILED_TO_REDEEM_CTOKEN");
+            }
+        }
+
+        return buyToken.balanceOf(address(this)).safeSub(beforeBalance);
+    }
+}

contracts/zero-ex/contracts/src/vendor/IERC1155Token.sol

@@ -0,0 +1,151 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2022 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+
+interface IERC1155Token {
+
+    /// @dev Either TransferSingle or TransferBatch MUST emit when tokens are transferred,
+    ///      including zero value transfers as well as minting or burning.
+    /// Operator will always be msg.sender.
+    /// Either event from address `0x0` signifies a minting operation.
+    /// An event to address `0x0` signifies a burning or melting operation.
+    /// The total value transferred from address 0x0 minus the total value transferred to 0x0 may
+    /// be used by clients and exchanges to be added to the "circulating supply" for a given token ID.
+    /// To define a token ID with no initial balance, the contract SHOULD emit the TransferSingle event
+    /// from `0x0` to `0x0`, with the token creator as `_operator`.
+    event TransferSingle(
+        address indexed operator,
+        address indexed from,
+        address indexed to,
+        uint256 id,
+        uint256 value
+    );
+
+    /// @dev Either TransferSingle or TransferBatch MUST emit when tokens are transferred,
+    ///      including zero value transfers as well as minting or burning.
+    ///Operator will always be msg.sender.
+    /// Either event from address `0x0` signifies a minting operation.
+    /// An event to address `0x0` signifies a burning or melting operation.
+    /// The total value transferred from address 0x0 minus the total value transferred to 0x0 may
+    /// be used by clients and exchanges to be added to the "circulating supply" for a given token ID.
+    /// To define multiple token IDs with no initial balance, this SHOULD emit the TransferBatch event
+    /// from `0x0` to `0x0`, with the token creator as `_operator`.
+    event TransferBatch(
+        address indexed operator,
+        address indexed from,
+        address indexed to,
+        uint256[] ids,
+        uint256[] values
+    );
+
+    /// @dev MUST emit when an approval is updated.
+    event ApprovalForAll(
+        address indexed owner,
+        address indexed operator,
+        bool approved
+    );
+
+    /// @dev MUST emit when the URI is updated for a token ID.
+    /// URIs are defined in RFC 3986.
+    /// The URI MUST point a JSON file that conforms to the "ERC-1155 Metadata JSON Schema".
+    event URI(
+        string value,
+        uint256 indexed id
+    );
+
+    /// @notice Transfers value amount of an _id from the _from address to the _to address specified.
+    /// @dev MUST emit TransferSingle event on success.
+    /// Caller must be approved to manage the _from account's tokens (see isApprovedForAll).
+    /// MUST throw if `_to` is the zero address.
+    /// MUST throw if balance of sender for token `_id` is lower than the `_value` sent.
+    /// MUST throw on any other error.
+    /// When transfer is complete, this function MUST check if `_to` is a smart contract (code size > 0).
+    /// If so, it MUST call `onERC1155Received` on `_to` and revert if the return value
+    /// is not `bytes4(keccak256("onERC1155Received(address,address,uint256,uint256,bytes)"))`.
+    /// @param from    Source address
+    /// @param to      Target address
+    /// @param id      ID of the token type
+    /// @param value   Transfer amount
+    /// @param data    Additional data with no specified format, sent in call to `_to`
+    function safeTransferFrom(
+        address from,
+        address to,
+        uint256 id,
+        uint256 value,
+        bytes calldata data
+    )
+        external;
+
+    /// @notice Send multiple types of Tokens from a 3rd party in one transfer (with safety call).
+    /// @dev MUST emit TransferBatch event on success.
+    /// Caller must be approved to manage the _from account's tokens (see isApprovedForAll).
+    /// MUST throw if `_to` is the zero address.
+    /// MUST throw if length of `_ids` is not the same as length of `_values`.
+    ///  MUST throw if any of the balance of sender for token `_ids` is lower than the respective `_values` sent.
+    /// MUST throw on any other error.
+    /// When transfer is complete, this function MUST check if `_to` is a smart contract (code size > 0).
+    /// If so, it MUST call `onERC1155BatchReceived` on `_to` and revert if the return value
+    /// is not `bytes4(keccak256("onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)"))`.
+    /// @param from    Source addresses
+    /// @param to      Target addresses
+    /// @param ids     IDs of each token type
+    /// @param values  Transfer amounts per token type
+    /// @param data    Additional data with no specified format, sent in call to `_to`
+    function safeBatchTransferFrom(
+        address from,
+        address to,
+        uint256[] calldata ids,
+        uint256[] calldata values,
+        bytes calldata data
+    )
+        external;
+
+    /// @notice Enable or disable approval for a third party ("operator") to manage all of the caller's tokens.
+    /// @dev MUST emit the ApprovalForAll event on success.
+    /// @param operator  Address to add to the set of authorized operators
+    /// @param approved  True if the operator is approved, false to revoke approval
+    function setApprovalForAll(address operator, bool approved) external;
+
+    /// @notice Queries the approval status of an operator for a given owner.
+    /// @param owner        The owner of the Tokens
+    /// @param operator     Address of authorized operator
+    /// @return isApproved  True if the operator is approved, false if not
+    function isApprovedForAll(address owner, address operator) external view returns (bool isApproved);
+
+    /// @notice Get the balance of an account's Tokens.
+    /// @param owner     The address of the token holder
+    /// @param id        ID of the Token
+    /// @return balance  The _owner's balance of the Token type requested
+    function balanceOf(address owner, uint256 id) external view returns (uint256 balance);
+
+    /// @notice Get the balance of multiple account/token pairs
+    /// @param owners      The addresses of the token holders
+    /// @param ids         ID of the Tokens
+    /// @return balances_  The _owner's balance of the Token types requested
+    function balanceOfBatch(
+        address[] calldata owners,
+        uint256[] calldata ids
+    )
+        external
+        view
+        returns (uint256[] memory balances_);
+}

contracts/zero-ex/contracts/src/vendor/IERC721Token.sol

@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+
+
+interface IERC721Token {
+
+    /// @dev This emits when ownership of any NFT changes by any mechanism.
+    ///      This event emits when NFTs are created (`from` == 0) and destroyed
+    ///      (`to` == 0). Exception: during contract creation, any number of NFTs
+    ///      may be created and assigned without emitting Transfer. At the time of
+    ///      any transfer, the approved address for that NFT (if any) is reset to none.
+    event Transfer(
+        address indexed _from,
+        address indexed _to,
+        uint256 indexed _tokenId
+    );
+
+    /// @dev This emits when the approved address for an NFT is changed or
+    ///      reaffirmed. The zero address indicates there is no approved address.
+    ///      When a Transfer event emits, this also indicates that the approved
+    ///      address for that NFT (if any) is reset to none.
+    event Approval(
+        address indexed _owner,
+        address indexed _approved,
+        uint256 indexed _tokenId
+    );
+
+    /// @dev This emits when an operator is enabled or disabled for an owner.
+    ///      The operator can manage all NFTs of the owner.
+    event ApprovalForAll(
+        address indexed _owner,
+        address indexed _operator,
+        bool _approved
+    );
+
+    /// @notice Transfers the ownership of an NFT from one address to another address
+    /// @dev Throws unless `msg.sender` is the current owner, an authorized
+    ///      perator, or the approved address for this NFT. Throws if `_from` is
+    ///      not the current owner. Throws if `_to` is the zero address. Throws if
+    ///      `_tokenId` is not a valid NFT. When transfer is complete, this function
+    ///      checks if `_to` is a smart contract (code size > 0). If so, it calls
+    ///      `onERC721Received` on `_to` and throws if the return value is not
+    ///      `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`.
+    /// @param _from The current owner of the NFT
+    /// @param _to The new owner
+    /// @param _tokenId The NFT to transfer
+    /// @param _data Additional data with no specified format, sent in call to `_to`
+    function safeTransferFrom(
+        address _from,
+        address _to,
+        uint256 _tokenId,
+        bytes calldata _data
+    )
+        external;
+
+    /// @notice Transfers the ownership of an NFT from one address to another address
+    /// @dev This works identically to the other function with an extra data parameter,
+    ///      except this function just sets data to "".
+    /// @param _from The current owner of the NFT
+    /// @param _to The new owner
+    /// @param _tokenId The NFT to transfer
+    function safeTransferFrom(
+        address _from,
+        address _to,
+        uint256 _tokenId
+    )
+        external;
+
+    /// @notice Change or reaffirm the approved address for an NFT
+    /// @dev The zero address indicates there is no approved address.
+    ///      Throws unless `msg.sender` is the current NFT owner, or an authorized
+    ///      operator of the current owner.
+    /// @param _approved The new approved NFT controller
+    /// @param _tokenId The NFT to approve
+    function approve(address _approved, uint256 _tokenId)
+        external;
+
+    /// @notice Enable or disable approval for a third party ("operator") to manage
+    ///         all of `msg.sender`'s assets
+    /// @dev Emits the ApprovalForAll event. The contract MUST allow
+    ///      multiple operators per owner.
+    /// @param _operator Address to add to the set of authorized operators
+    /// @param _approved True if the operator is approved, false to revoke approval
+    function setApprovalForAll(address _operator, bool _approved)
+        external;
+
+    /// @notice Count all NFTs assigned to an owner
+    /// @dev NFTs assigned to the zero address are considered invalid, and this
+    ///      function throws for queries about the zero address.
+    /// @param _owner An address for whom to query the balance
+    /// @return The number of NFTs owned by `_owner`, possibly zero
+    function balanceOf(address _owner)
+        external
+        view
+        returns (uint256);
+
+    /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE
+    ///         TO CONFIRM THAT `_to` IS CAPABLE OF RECEIVING NFTS OR ELSE
+    ///         THEY MAY BE PERMANENTLY LOST
+    /// @dev Throws unless `msg.sender` is the current owner, an authorized
+    ///      operator, or the approved address for this NFT. Throws if `_from` is
+    ///      not the current owner. Throws if `_to` is the zero address. Throws if
+    ///      `_tokenId` is not a valid NFT.
+    /// @param _from The current owner of the NFT
+    /// @param _to The new owner
+    /// @param _tokenId The NFT to transfer
+    function transferFrom(
+        address _from,
+        address _to,
+        uint256 _tokenId
+    )
+        external;
+
+    /// @notice Find the owner of an NFT
+    /// @dev NFTs assigned to zero address are considered invalid, and queries
+    ///      about them do throw.
+    /// @param _tokenId The identifier for an NFT
+    /// @return The address of the owner of the NFT
+    function ownerOf(uint256 _tokenId)
+        external
+        view
+        returns (address);
+
+    /// @notice Get the approved address for a single NFT
+    /// @dev Throws if `_tokenId` is not a valid NFT.
+    /// @param _tokenId The NFT to find the approved address for
+    /// @return The approved address for this NFT, or the zero address if there is none
+    function getApproved(uint256 _tokenId)
+        external
+        view
+        returns (address);
+
+    /// @notice Query if an address is an authorized operator for another address
+    /// @param _owner The address that owns the NFTs
+    /// @param _operator The address that acts on behalf of the owner
+    /// @return True if `_operator` is an approved operator for `_owner`, false otherwise
+    function isApprovedForAll(address _owner, address _operator)
+        external
+        view
+        returns (bool);
+}

contracts/zero-ex/contracts/src/vendor/IFeeRecipient.sol

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+
+interface IFeeRecipient {
+
+    /// @dev A callback function invoked in the ERC721Feature for each ERC721
+    ///      order fee that get paid. Integrators can make use of this callback
+    ///      to implement arbitrary fee-handling logic, e.g. splitting the fee
+    ///      between multiple parties.
+    /// @param tokenAddress The address of the token in which the received fee is
+    ///        denominated. `0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE` indicates
+    ///        that the fee was paid in the native token (e.g. ETH).
+    /// @param amount The amount of the given token received.
+    /// @param feeData Arbitrary data encoded in the `Fee` used by this callback.
+    /// @return success The selector of this function (0x0190805e),
+    ///         indicating that the callback succeeded.
+    function receiveZeroExFeeCallback(
+        address tokenAddress,
+        uint256 amount,
+        bytes calldata feeData
+    )
+        external
+        returns (bytes4 success);
+}

contracts/zero-ex/contracts/src/vendor/IPropertyValidator.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+
+interface IPropertyValidator {
+
+    /// @dev Checks that the given ERC721/ERC1155 asset satisfies the properties encoded in `propertyData`.
+    ///      Should revert if the asset does not satisfy the specified properties.
+    /// @param tokenAddress The ERC721/ERC1155 token contract address.
+    /// @param tokenId The ERC721/ERC1155 tokenId of the asset to check.
+    /// @param propertyData Encoded properties or auxiliary data needed to perform the check.
+    function validateProperty(
+        address tokenAddress,
+        uint256 tokenId,
+        bytes calldata propertyData
+    )
+        external
+        view;
+}

contracts/zero-ex/contracts/src/vendor/ITakerCallback.sol

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+
+interface ITakerCallback {
+
+    /// @dev A taker callback function invoked in ERC721OrdersFeature and
+    ///      ERC1155OrdersFeature between the maker -> taker transfer and
+    ///      the taker -> maker transfer.
+    /// @param orderHash The hash of the order being filled when this
+    ///        callback is invoked.
+    /// @param callbackData Arbitrary data used by this callback.
+    /// @return success The selector of this function,
+    ///         indicating that the callback succeeded.
+    function zeroExTakerCallback(
+        bytes32 orderHash,
+        bytes calldata callbackData
+    )
+        external
+        returns (bytes4 success);
+}

contracts/zero-ex/contracts/test/TestFeeRecipient.sol

@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+
+contract TestFeeRecipient {
+    bytes4 constant private SUCCESS = this.receiveZeroExFeeCallback.selector;
+    bytes4 constant private FAILURE = 0xdeadbeef;
+
+    uint256 constant private TRIGGER_REVERT = 333;
+    uint256 constant private TRIGGER_FAILURE = 666;
+
+    event FeeReceived(
+        address tokenAddress,
+        uint256 amount
+    );
+
+    receive() external payable {}
+
+    function receiveZeroExFeeCallback(
+        address tokenAddress,
+        uint256 amount,
+        bytes calldata /* feeData */
+    )
+        external
+        returns (bytes4 success)
+    {
+        emit FeeReceived(tokenAddress, amount);
+        if (amount == TRIGGER_REVERT) {
+            revert("TestFeeRecipient::receiveZeroExFeeCallback/REVERT");
+        } else if (amount == TRIGGER_FAILURE) {
+            return FAILURE;
+        } else {
+            return SUCCESS;
+        }
+    }
+}

contracts/zero-ex/contracts/test/TestFillQuoteTransformerBridge.sol

@@ -22,7 +22,7 @@ pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-utils/contracts/src/v06/LibMathV06.sol";
 import "../src/vendor/v3/IERC20Bridge.sol";
-import "./TestMintableERC20Token.sol";
+import "./tokens/TestMintableERC20Token.sol";
 
 
 contract TestFillQuoteTransformerBridge {

contracts/zero-ex/contracts/test/TestFillQuoteTransformerExchange.sol

@@ -23,7 +23,7 @@ pragma experimental ABIEncoderV2;
 import "@0x/contracts-utils/contracts/src/v06/LibBytesV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibMathV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
-import "./TestMintableERC20Token.sol";
+import "./tokens/TestMintableERC20Token.sol";
 import "../src/features/libs/LibNativeOrder.sol";
 import "../src/features/libs/LibSignature.sol";
 

contracts/zero-ex/contracts/test/TestFillQuoteTransformerHost.sol

@@ -21,7 +21,7 @@ pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
 import "../src/transformers/IERC20Transformer.sol";
-import "./TestMintableERC20Token.sol";
+import "./tokens/TestMintableERC20Token.sol";
 import "./TestTransformerHost.sol";
 
 

contracts/zero-ex/contracts/test/TestMintTokenERC20Transformer.sol

@@ -23,7 +23,7 @@ pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
 import "../src/transformers/IERC20Transformer.sol";
 import "../src/transformers/LibERC20Transformer.sol";
-import "./TestMintableERC20Token.sol";
+import "./tokens/TestMintableERC20Token.sol";
 
 
 contract TestMintTokenERC20Transformer is

contracts/zero-ex/contracts/test/TestNFTOrderPresigner.sol

@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "../src/IZeroEx.sol";
+import "../src/vendor/IERC1155Token.sol";
+import "../src/vendor/IERC721Token.sol";
+import "../src/features/libs/LibNFTOrder.sol";
+
+
+contract TestNFTOrderPresigner {
+    IZeroEx private immutable zeroEx;
+
+    constructor(IZeroEx _zeroEx)
+        public
+    {
+        zeroEx = _zeroEx;
+    }
+
+    function onERC1155Received(
+        address operator,
+        address from,
+        uint256 id,
+        uint256 value,
+        bytes calldata data
+    )
+        external
+        returns(bytes4 success)
+    {
+        return 0xf23a6e61;
+    }
+
+    function approveERC721(IERC721Token token)
+        external
+    {
+        token.setApprovalForAll(address(zeroEx), true);
+    }
+
+    function approveERC1155(IERC1155Token token)
+        external
+    {
+        token.setApprovalForAll(address(zeroEx), true);
+    }
+
+    function approveERC20(IERC20TokenV06 token)
+        external
+    {
+        token.approve(address(zeroEx), uint256(-1));
+    }
+
+    function preSignERC721Order(LibNFTOrder.ERC721Order calldata order)
+        external
+    {
+        zeroEx.preSignERC721Order(order);
+    }
+
+    function preSignERC1155Order(LibNFTOrder.ERC1155Order calldata order)
+        external
+    {
+        zeroEx.preSignERC1155Order(order);
+    }
+
+    function cancelERC721Order(uint256 orderNonce)
+        external
+    {
+        zeroEx.cancelERC721Order(orderNonce);
+    }
+
+    function cancelERC1155Order(uint256 orderNonce)
+        external
+    {
+        zeroEx.cancelERC1155Order(orderNonce);
+    }
+}

contracts/zero-ex/contracts/test/TestPropertyValidator.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+
+contract TestPropertyValidator {
+
+    function validateProperty(
+        address tokenAddress,
+        uint256 tokenId,
+        bytes calldata propertyData
+    )
+        external
+        view
+    {
+        require(
+            propertyData.length > 0,
+            "TestPropertyValidator::validateProperty/REVERT"
+        );
+    }
+}

contracts/zero-ex/contracts/test/TestWethTransformerHost.sol

@@ -21,9 +21,9 @@ pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
 import "../src/transformers/IERC20Transformer.sol";
-import "./TestMintableERC20Token.sol";
+import "./tokens/TestMintableERC20Token.sol";
 import "./TestTransformerHost.sol";
-import "./TestWeth.sol";
+import "./tokens/TestWeth.sol";
 
 
 contract TestWethTransformerHost is

contracts/zero-ex/contracts/test/integration/TestCurve.sol

@@ -21,7 +21,7 @@ pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-import "./TestMintableERC20Token.sol";
+import "../tokens/TestMintableERC20Token.sol";
 
 contract TestCurve {
 

contracts/zero-ex/contracts/test/integration/TestMooniswap.sol

@@ -21,7 +21,7 @@ pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-import "./TestMintableERC20Token.sol";
+import "../tokens/TestMintableERC20Token.sol";
 
 contract TestMooniswap {
 

contracts/zero-ex/contracts/test/integration/TestUniswapV2Pool.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.6;
 pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-import "../src/vendor/IUniswapV2Pair.sol";
+import "../../src/vendor/IUniswapV2Pair.sol";
 
 interface IUniswapV2PoolDeployer {
     struct CreationParameters {

contracts/zero-ex/contracts/test/integration/TestUniswapV3Pool.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.6;
 pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-import "../src/vendor/IUniswapV3Pool.sol";
+import "../../src/vendor/IUniswapV3Pool.sol";
 
 interface IUniswapV3PoolDeployer {
     struct CreationParameters {

contracts/zero-ex/contracts/test/tokens/TestMintableERC1155Token.sol

@@ -0,0 +1,345 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2019 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+
+
+interface IERC1155Receiver {
+
+    /// @notice Handle the receipt of a single ERC1155 token type
+    /// @dev The smart contract calls this function on the recipient
+    /// after a `safeTransferFrom`. This function MAY throw to revert and reject the
+    /// transfer. Return of other than the magic value MUST result in the
+    ///transaction being reverted
+    /// Note: the contract address is always the message sender
+    /// @param operator  The address which called `safeTransferFrom` function
+    /// @param from      The address which previously owned the token
+    /// @param id        An array containing the ids of the token being transferred
+    /// @param value     An array containing the amount of tokens being transferred
+    /// @param data      Additional data with no specified format
+    /// @return success  `bytes4(keccak256("onERC1155Received(address,address,uint256,uint256,bytes)"))`
+    function onERC1155Received(
+        address operator,
+        address from,
+        uint256 id,
+        uint256 value,
+        bytes calldata data
+    )
+        external
+        returns(bytes4 success);
+
+    /// @notice Handle the receipt of multiple ERC1155 token types
+    /// @dev The smart contract calls this function on the recipient
+    /// after a `safeTransferFrom`. This function MAY throw to revert and reject the
+    /// transfer. Return of other than the magic value MUST result in the
+    /// transaction being reverted
+    /// Note: the contract address is always the message sender
+    /// @param operator  The address which called `safeTransferFrom` function
+    /// @param from      The address which previously owned the token
+    /// @param ids       An array containing ids of each token being transferred
+    /// @param values    An array containing amounts of each token being transferred
+    /// @param data      Additional data with no specified format
+    /// @return success  `bytes4(keccak256("onERC1155Received(address,address,uint256,uint256,bytes)"))`
+    function onERC1155BatchReceived(
+        address operator,
+        address from,
+        uint256[] calldata ids,
+        uint256[] calldata values,
+        bytes calldata data
+    )
+        external
+        returns(bytes4 success);
+}
+
+contract TestMintableERC1155Token {
+    using LibSafeMathV06 for uint256;
+
+    /// @dev Either TransferSingle or TransferBatch MUST emit when tokens are transferred,
+    ///      including zero value transfers as well as minting or burning.
+    /// Operator will always be msg.sender.
+    /// Either event from address `0x0` signifies a minting operation.
+    /// An event to address `0x0` signifies a burning or melting operation.
+    /// The total value transferred from address 0x0 minus the total value transferred to 0x0 may
+    /// be used by clients and exchanges to be added to the "circulating supply" for a given token ID.
+    /// To define a token ID with no initial balance, the contract SHOULD emit the TransferSingle event
+    /// from `0x0` to `0x0`, with the token creator as `_operator`.
+    event TransferSingle(
+        address indexed operator,
+        address indexed from,
+        address indexed to,
+        uint256 id,
+        uint256 value
+    );
+
+    /// @dev Either TransferSingle or TransferBatch MUST emit when tokens are transferred,
+    ///      including zero value transfers as well as minting or burning.
+    ///Operator will always be msg.sender.
+    /// Either event from address `0x0` signifies a minting operation.
+    /// An event to address `0x0` signifies a burning or melting operation.
+    /// The total value transferred from address 0x0 minus the total value transferred to 0x0 may
+    /// be used by clients and exchanges to be added to the "circulating supply" for a given token ID.
+    /// To define multiple token IDs with no initial balance, this SHOULD emit the TransferBatch event
+    /// from `0x0` to `0x0`, with the token creator as `_operator`.
+    event TransferBatch(
+        address indexed operator,
+        address indexed from,
+        address indexed to,
+        uint256[] ids,
+        uint256[] values
+    );
+
+    /// @dev MUST emit when an approval is updated.
+    event ApprovalForAll(
+        address indexed owner,
+        address indexed operator,
+        bool approved
+    );
+
+    // selectors for receiver callbacks
+    bytes4 constant public ERC1155_RECEIVED       = 0xf23a6e61;
+    bytes4 constant public ERC1155_BATCH_RECEIVED = 0xbc197c81;
+
+    // id => (owner => balance)
+    mapping (uint256 => mapping(address => uint256)) internal balances;
+
+    // owner => (operator => approved)
+    mapping (address => mapping(address => bool)) internal operatorApproval;
+
+
+    function mint(
+        address to,
+        uint256 id,
+        uint256 quantity
+    )
+        external
+    {
+        // Grant the items to the caller
+        balances[id][to] = quantity.safeAdd(balances[id][to]);
+
+        // Emit the Transfer/Mint event.
+        // the 0x0 source address implies a mint
+        // It will also provide the circulating supply info.
+        emit TransferSingle(
+            msg.sender,
+            address(0x0),
+            to,
+            id,
+            quantity
+        );
+
+        // if `to` is a contract then trigger its callback
+        uint256 receiverCodeSize;
+        assembly {
+            receiverCodeSize := extcodesize(to)
+        }
+        if (receiverCodeSize > 0) {
+            bytes4 callbackReturnValue = IERC1155Receiver(to).onERC1155Received(
+                msg.sender,
+                msg.sender,
+                id,
+                quantity,
+                ""
+            );
+            require(
+                callbackReturnValue == ERC1155_RECEIVED,
+                "BAD_RECEIVER_RETURN_VALUE"
+            );
+        }
+    }
+
+    /// @notice Transfers value amount of an _id from the _from address to the _to address specified.
+    /// @dev MUST emit TransferSingle event on success.
+    /// Caller must be approved to manage the _from account's tokens (see isApprovedForAll).
+    /// MUST throw if `_to` is the zero address.
+    /// MUST throw if balance of sender for token `_id` is lower than the `_value` sent.
+    /// MUST throw on any other error.
+    /// When transfer is complete, this function MUST check if `_to` is a smart contract (code size > 0).
+    /// If so, it MUST call `onERC1155Received` on `_to` and revert if the return value
+    /// is not `bytes4(keccak256("onERC1155Received(address,address,uint256,uint256,bytes)"))`.
+    /// @param from    Source address
+    /// @param to      Target address
+    /// @param id      ID of the token type
+    /// @param value   Transfer amount
+    /// @param data    Additional data with no specified format, sent in call to `_to`
+    function safeTransferFrom(
+        address from,
+        address to,
+        uint256 id,
+        uint256 value,
+        bytes calldata data
+    )
+        external
+    {
+        // sanity checks
+        require(
+            to != address(0x0),
+            "CANNOT_TRANSFER_TO_ADDRESS_ZERO"
+        );
+        require(
+            from == msg.sender || operatorApproval[from][msg.sender] == true,
+            "INSUFFICIENT_ALLOWANCE"
+        );
+
+        // perform transfer
+        balances[id][from] = balances[id][from].safeSub(value);
+        balances[id][to] = balances[id][to].safeAdd(value);
+
+        emit TransferSingle(msg.sender, from, to, id, value);
+
+        // if `to` is a contract then trigger its callback
+        uint256 receiverCodeSize;
+        assembly {
+            receiverCodeSize := extcodesize(to)
+        }
+        if (receiverCodeSize > 0) {
+            bytes4 callbackReturnValue = IERC1155Receiver(to).onERC1155Received(
+                msg.sender,
+                from,
+                id,
+                value,
+                data
+            );
+            require(
+                callbackReturnValue == ERC1155_RECEIVED,
+                "BAD_RECEIVER_RETURN_VALUE"
+            );
+        }
+    }
+
+    /// @notice Send multiple types of Tokens from a 3rd party in one transfer (with safety call).
+    /// @dev MUST emit TransferBatch event on success.
+    /// Caller must be approved to manage the _from account's tokens (see isApprovedForAll).
+    /// MUST throw if `_to` is the zero address.
+    /// MUST throw if length of `_ids` is not the same as length of `_values`.
+    ///  MUST throw if any of the balance of sender for token `_ids` is lower than the respective `_values` sent.
+    /// MUST throw on any other error.
+    /// When transfer is complete, this function MUST check if `_to` is a smart contract (code size > 0).
+    /// If so, it MUST call `onERC1155BatchReceived` on `_to` and revert if the return value
+    /// is not `bytes4(keccak256("onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)"))`.
+    /// @param from    Source addresses
+    /// @param to      Target addresses
+    /// @param ids     IDs of each token type
+    /// @param values  Transfer amounts per token type
+    /// @param data    Additional data with no specified format, sent in call to `_to`
+    function safeBatchTransferFrom(
+        address from,
+        address to,
+        uint256[] calldata ids,
+        uint256[] calldata values,
+        bytes calldata data
+    )
+        external
+    {
+        // sanity checks
+        require(
+            to != address(0x0),
+            "CANNOT_TRANSFER_TO_ADDRESS_ZERO"
+        );
+        require(
+            ids.length == values.length,
+            "TOKEN_AND_VALUES_LENGTH_MISMATCH"
+        );
+
+        // Only supporting a global operator approval allows us to do
+        // only 1 check and not to touch storage to handle allowances.
+        require(
+            from == msg.sender || operatorApproval[from][msg.sender] == true,
+            "INSUFFICIENT_ALLOWANCE"
+        );
+
+        // perform transfers
+        for (uint256 i = 0; i < ids.length; ++i) {
+            // Cache value to local variable to reduce read costs.
+            uint256 id = ids[i];
+            uint256 value = values[i];
+
+            balances[id][from] = balances[id][from].safeSub(value);
+            balances[id][to] = balances[id][to].safeAdd(value);
+        }
+        emit TransferBatch(msg.sender, from, to, ids, values);
+
+        // if `to` is a contract then trigger its callback
+        uint256 receiverCodeSize;
+        assembly {
+            receiverCodeSize := extcodesize(to)
+        }
+        if (receiverCodeSize > 0) {
+            bytes4 callbackReturnValue = IERC1155Receiver(to).onERC1155BatchReceived(
+                msg.sender,
+                from,
+                ids,
+                values,
+                data
+            );
+            require(
+                callbackReturnValue == ERC1155_BATCH_RECEIVED,
+                "BAD_RECEIVER_RETURN_VALUE"
+            );
+        }
+    }
+
+    /// @notice Enable or disable approval for a third party ("operator") to manage all of the caller's tokens.
+    /// @dev MUST emit the ApprovalForAll event on success.
+    /// @param operator  Address to add to the set of authorized operators
+    /// @param approved  True if the operator is approved, false to revoke approval
+    function setApprovalForAll(address operator, bool approved) external {
+        operatorApproval[msg.sender][operator] = approved;
+        emit ApprovalForAll(msg.sender, operator, approved);
+    }
+
+    /// @notice Queries the approval status of an operator for a given owner.
+    /// @param owner        The owner of the Tokens
+    /// @param operator     Address of authorized operator
+    /// @return isApproved  True if the operator is approved, false if not
+    function isApprovedForAll(address owner, address operator) external view returns (bool isApproved) {
+        return operatorApproval[owner][operator];
+    }
+
+    /// @notice Get the balance of an account's Tokens.
+    /// @param owner     The address of the token holder
+    /// @param id        ID of the Token
+    /// @return balance  The _owner's balance of the Token type requested
+    function balanceOf(address owner, uint256 id) external view returns (uint256 balance) {
+        return balances[id][owner];
+    }
+
+    /// @notice Get the balance of multiple account/token pairs
+    /// @param owners      The addresses of the token holders
+    /// @param ids         ID of the Tokens
+    /// @return balances_  The _owner's balance of the Token types requested
+    function balanceOfBatch(address[] calldata owners, uint256[] calldata ids) external view returns (uint256[] memory balances_) {
+        // sanity check
+        require(
+            owners.length == ids.length,
+            "OWNERS_AND_IDS_MUST_HAVE_SAME_LENGTH"
+        );
+
+        // get balances
+        balances_ = new uint256[](owners.length);
+        for (uint256 i = 0; i < owners.length; ++i) {
+            uint256 id = ids[i];
+            balances_[i] = balances[id][owners[i]];
+        }
+
+        return balances_;
+    }
+}

contracts/zero-ex/contracts/test/tokens/TestMintableERC721Token.sol

@@ -0,0 +1,385 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+
+
+interface IERC721Receiver {
+
+    /// @notice Handle the receipt of an NFT
+    /// @dev The ERC721 smart contract calls this function on the recipient
+    ///  after a `transfer`. This function MAY throw to revert and reject the
+    ///  transfer. Return of other than the magic value MUST result in the
+    ///  transaction being reverted.
+    ///  Note: the contract address is always the message sender.
+    /// @param _operator The address which called `safeTransferFrom` function
+    /// @param _from The address which previously owned the token
+    /// @param _tokenId The NFT identifier which is being transferred
+    /// @param _data Additional data with no specified format
+    /// @return `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`
+    ///  unless throwing
+    function onERC721Received(
+        address _operator,
+        address _from,
+        uint256 _tokenId,
+        bytes calldata _data
+    )
+        external
+        returns (bytes4);
+}
+
+contract TestMintableERC721Token {
+    using LibSafeMathV06 for uint256;
+
+    /// @dev This emits when ownership of any NFT changes by any mechanism.
+    ///      This event emits when NFTs are created (`from` == 0) and destroyed
+    ///      (`to` == 0). Exception: during contract creation, any number of NFTs
+    ///      may be created and assigned without emitting Transfer. At the time of
+    ///      any transfer, the approved address for that NFT (if any) is reset to none.
+    event Transfer(
+        address _from,
+        address _to,
+        uint256 _tokenId
+    );
+
+    /// @dev This emits when the approved address for an NFT is changed or
+    ///      reaffirmed. The zero address indicates there is no approved address.
+    ///      When a Transfer event emits, this also indicates that the approved
+    ///      address for that NFT (if any) is reset to none.
+    event Approval(
+        address indexed _owner,
+        address indexed _approved,
+        uint256 indexed _tokenId
+    );
+
+    /// @dev This emits when an operator is enabled or disabled for an owner.
+    ///      The operator can manage all NFTs of the owner.
+    event ApprovalForAll(
+        address indexed _owner,
+        address indexed _operator,
+        bool _approved
+    );
+
+    // Function selector for ERC721Receiver.onERC721Received
+    // 0x150b7a02
+    bytes4 constant private ERC721_RECEIVED = bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"));
+
+    // Mapping of tokenId => owner
+    mapping (uint256 => address) private owners;
+
+    // Mapping of tokenId => approved address
+    mapping (uint256 => address) private approvals;
+
+    // Mapping of owner => number of tokens owned
+    mapping (address => uint256) private balances;
+
+    // Mapping of owner => operator => approved
+    mapping (address => mapping (address => bool)) private operatorApprovals;
+
+    /// @dev Function to mint a new token
+    ///      Reverts if the given token ID already exists
+    /// @param _to Address of the beneficiary that will own the minted token
+    /// @param _tokenId ID of the token to be minted by the msg.sender    
+    function mint(address _to, uint256 _tokenId)
+        external
+    {
+        require(
+            _to != address(0),
+            "ERC721_ZERO_TO_ADDRESS"
+        );
+
+        address owner = owners[_tokenId];
+        require(
+            owner == address(0),
+            "ERC721_OWNER_ALREADY_EXISTS"
+        );
+
+        owners[_tokenId] = _to;
+        balances[_to] = balances[_to].safeAdd(1);
+
+        emit Transfer(
+            address(0),
+            _to,
+            _tokenId
+        );
+    }
+
+    /// @dev Function to burn a token
+    ///      Reverts if the given token ID doesn't exist
+    /// @param _owner Owner of token with given token ID
+    /// @param _tokenId ID of the token to be burned by the msg.sender
+    function burn(address _owner, uint256 _tokenId)
+        external
+    {
+        require(
+            _owner != address(0),
+            "ERC721_ZERO_OWNER_ADDRESS"
+        );
+
+        address owner = owners[_tokenId];
+        require(
+            owner == _owner,
+            "ERC721_OWNER_MISMATCH"
+        );
+
+        owners[_tokenId] = address(0);
+        balances[_owner] = balances[_owner].safeSub(1);
+
+        emit Transfer(
+            _owner,
+            address(0),
+            _tokenId
+        );
+    }
+
+    /// @notice Transfers the ownership of an NFT from one address to another address
+    /// @dev Throws unless `msg.sender` is the current owner, an authorized
+    ///      operator, or the approved address for this NFT. Throws if `_from` is
+    ///      not the current owner. Throws if `_to` is the zero address. Throws if
+    ///      `_tokenId` is not a valid NFT. When transfer is complete, this function
+    ///      checks if `_to` is a smart contract (code size > 0). If so, it calls
+    ///      `onERC721Received` on `_to` and throws if the return value is not
+    ///      `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`.
+    /// @param _from The current owner of the NFT
+    /// @param _to The new owner
+    /// @param _tokenId The NFT to transfer
+    /// @param _data Additional data with no specified format, sent in call to `_to`
+    function safeTransferFrom(
+        address _from,
+        address _to,
+        uint256 _tokenId,
+        bytes calldata _data
+    )
+        external
+    {
+        transferFrom(
+            _from,
+            _to,
+            _tokenId
+        );
+
+        uint256 receiverCodeSize;
+        assembly {
+            receiverCodeSize := extcodesize(_to)
+        }
+        if (receiverCodeSize > 0) {
+            bytes4 selector = IERC721Receiver(_to).onERC721Received(
+                msg.sender,
+                _from,
+                _tokenId,
+                _data
+            );
+            require(
+                selector == ERC721_RECEIVED,
+                "ERC721_INVALID_SELECTOR"
+            );
+        }
+    }
+
+    /// @notice Transfers the ownership of an NFT from one address to another address
+    /// @dev This works identically to the other function with an extra data parameter,
+    ///      except this function just sets data to "".
+    /// @param _from The current owner of the NFT
+    /// @param _to The new owner
+    /// @param _tokenId The NFT to transfer
+    function safeTransferFrom(
+        address _from,
+        address _to,
+        uint256 _tokenId
+    )
+        external
+    {
+        transferFrom(
+            _from,
+            _to,
+            _tokenId
+        );
+
+        uint256 receiverCodeSize;
+        assembly {
+            receiverCodeSize := extcodesize(_to)
+        }
+        if (receiverCodeSize > 0) {
+            bytes4 selector = IERC721Receiver(_to).onERC721Received(
+                msg.sender,
+                _from,
+                _tokenId,
+                ""
+            );
+            require(
+                selector == ERC721_RECEIVED,
+                "ERC721_INVALID_SELECTOR"
+            );
+        }
+    }
+
+    /// @notice Change or reaffirm the approved address for an NFT
+    /// @dev The zero address indicates there is no approved address.
+    ///      Throws unless `msg.sender` is the current NFT owner, or an authorized
+    ///      operator of the current owner.
+    /// @param _approved The new approved NFT controller
+    /// @param _tokenId The NFT to approve
+    function approve(address _approved, uint256 _tokenId)
+        external
+    {
+        address owner = ownerOf(_tokenId);
+        require(
+            msg.sender == owner || isApprovedForAll(owner, msg.sender),
+            "ERC721_INVALID_SENDER"
+        );
+
+        approvals[_tokenId] = _approved;
+        emit Approval(
+            owner,
+            _approved,
+            _tokenId
+        );
+    }
+
+    /// @notice Enable or disable approval for a third party ("operator") to manage
+    ///         all of `msg.sender`'s assets
+    /// @dev Emits the ApprovalForAll event. The contract MUST allow
+    ///      multiple operators per owner.
+    /// @param _operator Address to add to the set of authorized operators
+    /// @param _approved True if the operator is approved, false to revoke approval
+    function setApprovalForAll(address _operator, bool _approved)
+        external
+    {
+        operatorApprovals[msg.sender][_operator] = _approved;
+        emit ApprovalForAll(
+            msg.sender,
+            _operator,
+            _approved
+        );
+    }
+
+    /// @notice Count all NFTs assigned to an owner
+    /// @dev NFTs assigned to the zero address are considered invalid, and this
+    ///      function throws for queries about the zero address.
+    /// @param _owner An address for whom to query the balance
+    /// @return The number of NFTs owned by `_owner`, possibly zero
+    function balanceOf(address _owner)
+        external
+        view
+        returns (uint256)
+    {
+        require(
+            _owner != address(0),
+            "ERC721_ZERO_OWNER"
+        );
+        return balances[_owner];
+    }
+
+    /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE
+    ///         TO CONFIRM THAT `_to` IS CAPABLE OF RECEIVING NFTS OR ELSE
+    ///         THEY MAY BE PERMANENTLY LOST
+    /// @dev Throws unless `msg.sender` is the current owner, an authorized
+    ///      operator, or the approved address for this NFT. Throws if `_from` is
+    ///      not the current owner. Throws if `_to` is the zero address. Throws if
+    ///      `_tokenId` is not a valid NFT.
+    /// @param _from The current owner of the NFT
+    /// @param _to The new owner
+    /// @param _tokenId The NFT to transfer
+    function transferFrom(
+        address _from,
+        address _to,
+        uint256 _tokenId
+    )
+        public
+    {
+        require(
+            _to != address(0),
+            "ERC721_ZERO_TO_ADDRESS"
+        );
+
+        address owner = ownerOf(_tokenId);
+        require(
+            _from == owner,
+            "ERC721_OWNER_MISMATCH"
+        );
+
+        address spender = msg.sender;
+        address approvedAddress = getApproved(_tokenId);
+        require(
+            spender == owner ||
+            isApprovedForAll(owner, spender) ||
+            approvedAddress == spender,
+            "ERC721_INVALID_SPENDER"
+        );
+
+        if (approvedAddress != address(0)) {
+            approvals[_tokenId] = address(0);
+        }
+
+        owners[_tokenId] = _to;
+        balances[_from] = balances[_from].safeSub(1);
+        balances[_to] = balances[_to].safeAdd(1);
+
+        emit Transfer(
+            _from,
+            _to,
+            _tokenId
+        );
+    }
+
+    /// @notice Find the owner of an NFT
+    /// @dev NFTs assigned to zero address are considered invalid, and queries
+    ///      about them do throw.
+    /// @param _tokenId The identifier for an NFT
+    /// @return The address of the owner of the NFT
+    function ownerOf(uint256 _tokenId)
+        public
+        view
+        returns (address)
+    {
+        address owner = owners[_tokenId];
+        require(
+            owner != address(0),
+            "ERC721_ZERO_OWNER"
+        );
+        return owner;
+    }
+
+    /// @notice Get the approved address for a single NFT
+    /// @dev Throws if `_tokenId` is not a valid NFT.
+    /// @param _tokenId The NFT to find the approved address for
+    /// @return The approved address for this NFT, or the zero address if there is none
+    function getApproved(uint256 _tokenId)
+        public
+        view
+        returns (address)
+    {
+        return approvals[_tokenId];
+    }
+
+    /// @notice Query if an address is an authorized operator for another address
+    /// @param _owner The address that owns the NFTs
+    /// @param _operator The address that acts on behalf of the owner
+    /// @return True if `_operator` is an approved operator for `_owner`, false otherwise
+    function isApprovedForAll(address _owner, address _operator)
+        public
+        view
+        returns (bool)
+    {
+        return operatorApprovals[_owner][_operator];
+    }
+}

contracts/zero-ex/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-zero-ex",
-    "version": "0.29.5",
+    "version": "0.32.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -43,7 +43,7 @@
     "config": {
         "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IERC20Transformer,IOwnableFeature,ISimpleFunctionRegistryFeature,ITransformERC20Feature,FillQuoteTransformer,PayTakerTransformer,PositiveSlippageFeeTransformer,WethTransformer,OwnableFeature,SimpleFunctionRegistryFeature,TransformERC20Feature,AffiliateFeeTransformer,MetaTransactionsFeature,LogMetadataTransformer,BridgeAdapter,LiquidityProviderFeature,ILiquidityProviderFeature,NativeOrdersFeature,INativeOrdersFeature,FeeCollectorController,FeeCollector,CurveLiquidityProvider,BatchFillNativeOrdersFeature,IBatchFillNativeOrdersFeature,MultiplexFeature,IMultiplexFeature,OtcOrdersFeature,IOtcOrdersFeature",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(AffiliateFeeTransformer|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeAdapter|BridgeProtocols|CurveLiquidityProvider|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC20Bridge|IERC20Transformer|IFeature|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|ISimpleFunctionRegistryFeature|IStaking|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC20Transformer|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MixinBalancer|MixinBalancerV2|MixinBancor|MixinCoFiX|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinKyber|MixinKyberDmm|MixinLido|MixinMStable|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinOasis|MixinShell|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestBridge|TestCallTarget|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC20Token|TestMooniswap|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TestZeroExFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json"
+        "abis": "./test/generated-artifacts/@(AffiliateFeeTransformer|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeAdapter|BridgeProtocols|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MixinAaveV2|MixinBalancer|MixinBalancerV2|MixinBalancerV2Batch|MixinBancor|MixinCoFiX|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinKyber|MixinKyberDmm|MixinLido|MixinMStable|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinOasis|MixinShell|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestBridge|TestCallTarget|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TestZeroExFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json"
     },
     "repository": {
         "type": "git",
@@ -55,14 +55,14 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
     "devDependencies": {
-        "@0x/abi-gen": "^5.6.2",
-        "@0x/contract-addresses": "^6.9.0",
-        "@0x/contracts-erc20": "^3.3.23",
-        "@0x/contracts-gen": "^2.0.40",
-        "@0x/contracts-test-utils": "^5.4.14",
-        "@0x/dev-utils": "^4.2.9",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contract-addresses": "^6.13.0",
+        "@0x/contracts-erc20": "^3.3.29",
+        "@0x/contracts-gen": "^2.0.46",
+        "@0x/contracts-test-utils": "^5.4.20",
+        "@0x/dev-utils": "^4.2.14",
         "@0x/order-utils": "^10.4.28",
-        "@0x/sol-compiler": "^4.7.5",
+        "@0x/sol-compiler": "^4.8.1",
         "@0x/ts-doc-gen": "^0.0.28",
         "@0x/tslint-config": "^4.1.4",
         "@types/isomorphic-fetch": "^0.0.35",
@@ -79,17 +79,17 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "4.2.2"
+        "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.4.2",
-        "@0x/protocol-utils": "^1.9.5",
-        "@0x/subproviders": "^6.6.0",
-        "@0x/types": "^3.3.4",
-        "@0x/typescript-typings": "^5.2.1",
-        "@0x/utils": "^6.4.4",
-        "@0x/web3-wrapper": "^7.6.0",
-        "ethereum-types": "^3.6.0",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/protocol-utils": "^11.12.0",
+        "@0x/subproviders": "^6.6.5",
+        "@0x/types": "^3.3.6",
+        "@0x/typescript-typings": "^5.3.1",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
+        "ethereum-types": "^3.7.0",
         "ethereumjs-util": "^7.0.10",
         "ethers": "~4.0.4"
     },

contracts/zero-ex/test/artifacts.ts

@@ -11,11 +11,16 @@ import * as BootstrapFeature from '../test/generated-artifacts/BootstrapFeature.
 import * as BridgeAdapter from '../test/generated-artifacts/BridgeAdapter.json';
 import * as BridgeProtocols from '../test/generated-artifacts/BridgeProtocols.json';
 import * as CurveLiquidityProvider from '../test/generated-artifacts/CurveLiquidityProvider.json';
+import * as ERC1155OrdersFeature from '../test/generated-artifacts/ERC1155OrdersFeature.json';
+import * as ERC165Feature from '../test/generated-artifacts/ERC165Feature.json';
+import * as ERC721OrdersFeature from '../test/generated-artifacts/ERC721OrdersFeature.json';
 import * as FeeCollector from '../test/generated-artifacts/FeeCollector.json';
 import * as FeeCollectorController from '../test/generated-artifacts/FeeCollectorController.json';
 import * as FillQuoteTransformer from '../test/generated-artifacts/FillQuoteTransformer.json';
 import * as FixinCommon from '../test/generated-artifacts/FixinCommon.json';
 import * as FixinEIP712 from '../test/generated-artifacts/FixinEIP712.json';
+import * as FixinERC1155Spender from '../test/generated-artifacts/FixinERC1155Spender.json';
+import * as FixinERC721Spender from '../test/generated-artifacts/FixinERC721Spender.json';
 import * as FixinProtocolFees from '../test/generated-artifacts/FixinProtocolFees.json';
 import * as FixinReentrancyGuard from '../test/generated-artifacts/FixinReentrancyGuard.json';
 import * as FixinTokenSpender from '../test/generated-artifacts/FixinTokenSpender.json';
@@ -25,9 +30,15 @@ import * as FundRecoveryFeature from '../test/generated-artifacts/FundRecoveryFe
 import * as IBatchFillNativeOrdersFeature from '../test/generated-artifacts/IBatchFillNativeOrdersFeature.json';
 import * as IBootstrapFeature from '../test/generated-artifacts/IBootstrapFeature.json';
 import * as IBridgeAdapter from '../test/generated-artifacts/IBridgeAdapter.json';
+import * as IERC1155OrdersFeature from '../test/generated-artifacts/IERC1155OrdersFeature.json';
+import * as IERC1155Token from '../test/generated-artifacts/IERC1155Token.json';
+import * as IERC165Feature from '../test/generated-artifacts/IERC165Feature.json';
 import * as IERC20Bridge from '../test/generated-artifacts/IERC20Bridge.json';
 import * as IERC20Transformer from '../test/generated-artifacts/IERC20Transformer.json';
+import * as IERC721OrdersFeature from '../test/generated-artifacts/IERC721OrdersFeature.json';
+import * as IERC721Token from '../test/generated-artifacts/IERC721Token.json';
 import * as IFeature from '../test/generated-artifacts/IFeature.json';
+import * as IFeeRecipient from '../test/generated-artifacts/IFeeRecipient.json';
 import * as IFlashWallet from '../test/generated-artifacts/IFlashWallet.json';
 import * as IFundRecoveryFeature from '../test/generated-artifacts/IFundRecoveryFeature.json';
 import * as ILiquidityProvider from '../test/generated-artifacts/ILiquidityProvider.json';
@@ -42,8 +53,10 @@ import * as InitialMigration from '../test/generated-artifacts/InitialMigration.
 import * as IOtcOrdersFeature from '../test/generated-artifacts/IOtcOrdersFeature.json';
 import * as IOwnableFeature from '../test/generated-artifacts/IOwnableFeature.json';
 import * as IPancakeSwapFeature from '../test/generated-artifacts/IPancakeSwapFeature.json';
+import * as IPropertyValidator from '../test/generated-artifacts/IPropertyValidator.json';
 import * as ISimpleFunctionRegistryFeature from '../test/generated-artifacts/ISimpleFunctionRegistryFeature.json';
 import * as IStaking from '../test/generated-artifacts/IStaking.json';
+import * as ITakerCallback from '../test/generated-artifacts/ITakerCallback.json';
 import * as ITestSimpleFunctionRegistryFeature from '../test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json';
 import * as ITokenSpenderFeature from '../test/generated-artifacts/ITokenSpenderFeature.json';
 import * as ITransformERC20Feature from '../test/generated-artifacts/ITransformERC20Feature.json';
@@ -54,7 +67,9 @@ import * as IUniswapV3Pool from '../test/generated-artifacts/IUniswapV3Pool.json
 import * as IZeroEx from '../test/generated-artifacts/IZeroEx.json';
 import * as LibBootstrap from '../test/generated-artifacts/LibBootstrap.json';
 import * as LibCommonRichErrors from '../test/generated-artifacts/LibCommonRichErrors.json';
+import * as LibERC1155OrdersStorage from '../test/generated-artifacts/LibERC1155OrdersStorage.json';
 import * as LibERC20Transformer from '../test/generated-artifacts/LibERC20Transformer.json';
+import * as LibERC721OrdersStorage from '../test/generated-artifacts/LibERC721OrdersStorage.json';
 import * as LibFeeCollector from '../test/generated-artifacts/LibFeeCollector.json';
 import * as LibLiquidityProviderRichErrors from '../test/generated-artifacts/LibLiquidityProviderRichErrors.json';
 import * as LibMetaTransactionsRichErrors from '../test/generated-artifacts/LibMetaTransactionsRichErrors.json';
@@ -63,6 +78,8 @@ import * as LibMigrate from '../test/generated-artifacts/LibMigrate.json';
 import * as LibNativeOrder from '../test/generated-artifacts/LibNativeOrder.json';
 import * as LibNativeOrdersRichErrors from '../test/generated-artifacts/LibNativeOrdersRichErrors.json';
 import * as LibNativeOrdersStorage from '../test/generated-artifacts/LibNativeOrdersStorage.json';
+import * as LibNFTOrder from '../test/generated-artifacts/LibNFTOrder.json';
+import * as LibNFTOrdersRichErrors from '../test/generated-artifacts/LibNFTOrdersRichErrors.json';
 import * as LibOtcOrdersStorage from '../test/generated-artifacts/LibOtcOrdersStorage.json';
 import * as LibOwnableRichErrors from '../test/generated-artifacts/LibOwnableRichErrors.json';
 import * as LibOwnableStorage from '../test/generated-artifacts/LibOwnableStorage.json';
@@ -81,10 +98,13 @@ import * as LiquidityProviderFeature from '../test/generated-artifacts/Liquidity
 import * as LiquidityProviderSandbox from '../test/generated-artifacts/LiquidityProviderSandbox.json';
 import * as LogMetadataTransformer from '../test/generated-artifacts/LogMetadataTransformer.json';
 import * as MetaTransactionsFeature from '../test/generated-artifacts/MetaTransactionsFeature.json';
+import * as MixinAaveV2 from '../test/generated-artifacts/MixinAaveV2.json';
 import * as MixinBalancer from '../test/generated-artifacts/MixinBalancer.json';
 import * as MixinBalancerV2 from '../test/generated-artifacts/MixinBalancerV2.json';
+import * as MixinBalancerV2Batch from '../test/generated-artifacts/MixinBalancerV2Batch.json';
 import * as MixinBancor from '../test/generated-artifacts/MixinBancor.json';
 import * as MixinCoFiX from '../test/generated-artifacts/MixinCoFiX.json';
+import * as MixinCompound from '../test/generated-artifacts/MixinCompound.json';
 import * as MixinCryptoCom from '../test/generated-artifacts/MixinCryptoCom.json';
 import * as MixinCurve from '../test/generated-artifacts/MixinCurve.json';
 import * as MixinCurveV2 from '../test/generated-artifacts/MixinCurveV2.json';
@@ -116,6 +136,7 @@ import * as NativeOrdersFeature from '../test/generated-artifacts/NativeOrdersFe
 import * as NativeOrdersInfo from '../test/generated-artifacts/NativeOrdersInfo.json';
 import * as NativeOrdersProtocolFees from '../test/generated-artifacts/NativeOrdersProtocolFees.json';
 import * as NativeOrdersSettlement from '../test/generated-artifacts/NativeOrdersSettlement.json';
+import * as NFTOrders from '../test/generated-artifacts/NFTOrders.json';
 import * as OtcOrdersFeature from '../test/generated-artifacts/OtcOrdersFeature.json';
 import * as OwnableFeature from '../test/generated-artifacts/OwnableFeature.json';
 import * as PancakeSwapFeature from '../test/generated-artifacts/PancakeSwapFeature.json';
@@ -128,6 +149,7 @@ import * as TestCallTarget from '../test/generated-artifacts/TestCallTarget.json
 import * as TestCurve from '../test/generated-artifacts/TestCurve.json';
 import * as TestDelegateCaller from '../test/generated-artifacts/TestDelegateCaller.json';
 import * as TestFeeCollectorController from '../test/generated-artifacts/TestFeeCollectorController.json';
+import * as TestFeeRecipient from '../test/generated-artifacts/TestFeeRecipient.json';
 import * as TestFillQuoteTransformerBridge from '../test/generated-artifacts/TestFillQuoteTransformerBridge.json';
 import * as TestFillQuoteTransformerExchange from '../test/generated-artifacts/TestFillQuoteTransformerExchange.json';
 import * as TestFillQuoteTransformerHost from '../test/generated-artifacts/TestFillQuoteTransformerHost.json';
@@ -141,14 +163,18 @@ import * as TestLiquidityProvider from '../test/generated-artifacts/TestLiquidit
 import * as TestMetaTransactionsNativeOrdersFeature from '../test/generated-artifacts/TestMetaTransactionsNativeOrdersFeature.json';
 import * as TestMetaTransactionsTransformERC20Feature from '../test/generated-artifacts/TestMetaTransactionsTransformERC20Feature.json';
 import * as TestMigrator from '../test/generated-artifacts/TestMigrator.json';
+import * as TestMintableERC1155Token from '../test/generated-artifacts/TestMintableERC1155Token.json';
 import * as TestMintableERC20Token from '../test/generated-artifacts/TestMintableERC20Token.json';
+import * as TestMintableERC721Token from '../test/generated-artifacts/TestMintableERC721Token.json';
 import * as TestMintTokenERC20Transformer from '../test/generated-artifacts/TestMintTokenERC20Transformer.json';
 import * as TestMooniswap from '../test/generated-artifacts/TestMooniswap.json';
 import * as TestNativeOrdersFeature from '../test/generated-artifacts/TestNativeOrdersFeature.json';
+import * as TestNFTOrderPresigner from '../test/generated-artifacts/TestNFTOrderPresigner.json';
 import * as TestNoEthRecipient from '../test/generated-artifacts/TestNoEthRecipient.json';
 import * as TestOrderSignerRegistryWithContractWallet from '../test/generated-artifacts/TestOrderSignerRegistryWithContractWallet.json';
 import * as TestPermissionlessTransformerDeployerSuicidal from '../test/generated-artifacts/TestPermissionlessTransformerDeployerSuicidal.json';
 import * as TestPermissionlessTransformerDeployerTransformer from '../test/generated-artifacts/TestPermissionlessTransformerDeployerTransformer.json';
+import * as TestPropertyValidator from '../test/generated-artifacts/TestPropertyValidator.json';
 import * as TestRfqOriginRegistration from '../test/generated-artifacts/TestRfqOriginRegistration.json';
 import * as TestSimpleFunctionRegistryFeatureImpl1 from '../test/generated-artifacts/TestSimpleFunctionRegistryFeatureImpl1.json';
 import * as TestSimpleFunctionRegistryFeatureImpl2 from '../test/generated-artifacts/TestSimpleFunctionRegistryFeatureImpl2.json';
@@ -181,6 +207,7 @@ export const artifacts = {
     LibCommonRichErrors: LibCommonRichErrors as ContractArtifact,
     LibLiquidityProviderRichErrors: LibLiquidityProviderRichErrors as ContractArtifact,
     LibMetaTransactionsRichErrors: LibMetaTransactionsRichErrors as ContractArtifact,
+    LibNFTOrdersRichErrors: LibNFTOrdersRichErrors as ContractArtifact,
     LibNativeOrdersRichErrors: LibNativeOrdersRichErrors as ContractArtifact,
     LibOwnableRichErrors: LibOwnableRichErrors as ContractArtifact,
     LibProxyRichErrors: LibProxyRichErrors as ContractArtifact,
@@ -199,6 +226,7 @@ export const artifacts = {
     TransformerDeployer: TransformerDeployer as ContractArtifact,
     BatchFillNativeOrdersFeature: BatchFillNativeOrdersFeature as ContractArtifact,
     BootstrapFeature: BootstrapFeature as ContractArtifact,
+    ERC165Feature: ERC165Feature as ContractArtifact,
     FundRecoveryFeature: FundRecoveryFeature as ContractArtifact,
     LiquidityProviderFeature: LiquidityProviderFeature as ContractArtifact,
     MetaTransactionsFeature: MetaTransactionsFeature as ContractArtifact,
@@ -212,6 +240,9 @@ export const artifacts = {
     UniswapV3Feature: UniswapV3Feature as ContractArtifact,
     IBatchFillNativeOrdersFeature: IBatchFillNativeOrdersFeature as ContractArtifact,
     IBootstrapFeature: IBootstrapFeature as ContractArtifact,
+    IERC1155OrdersFeature: IERC1155OrdersFeature as ContractArtifact,
+    IERC165Feature: IERC165Feature as ContractArtifact,
+    IERC721OrdersFeature: IERC721OrdersFeature as ContractArtifact,
     IFeature: IFeature as ContractArtifact,
     IFundRecoveryFeature: IFundRecoveryFeature as ContractArtifact,
     ILiquidityProviderFeature: ILiquidityProviderFeature as ContractArtifact,
@@ -227,6 +258,7 @@ export const artifacts = {
     ITransformERC20Feature: ITransformERC20Feature as ContractArtifact,
     IUniswapFeature: IUniswapFeature as ContractArtifact,
     IUniswapV3Feature: IUniswapV3Feature as ContractArtifact,
+    LibNFTOrder: LibNFTOrder as ContractArtifact,
     LibNativeOrder: LibNativeOrder as ContractArtifact,
     LibSignature: LibSignature as ContractArtifact,
     MultiplexFeature: MultiplexFeature as ContractArtifact,
@@ -240,8 +272,13 @@ export const artifacts = {
     NativeOrdersInfo: NativeOrdersInfo as ContractArtifact,
     NativeOrdersProtocolFees: NativeOrdersProtocolFees as ContractArtifact,
     NativeOrdersSettlement: NativeOrdersSettlement as ContractArtifact,
+    ERC1155OrdersFeature: ERC1155OrdersFeature as ContractArtifact,
+    ERC721OrdersFeature: ERC721OrdersFeature as ContractArtifact,
+    NFTOrders: NFTOrders as ContractArtifact,
     FixinCommon: FixinCommon as ContractArtifact,
     FixinEIP712: FixinEIP712 as ContractArtifact,
+    FixinERC1155Spender: FixinERC1155Spender as ContractArtifact,
+    FixinERC721Spender: FixinERC721Spender as ContractArtifact,
     FixinProtocolFees: FixinProtocolFees as ContractArtifact,
     FixinReentrancyGuard: FixinReentrancyGuard as ContractArtifact,
     FixinTokenSpender: FixinTokenSpender as ContractArtifact,
@@ -251,6 +288,8 @@ export const artifacts = {
     InitialMigration: InitialMigration as ContractArtifact,
     LibBootstrap: LibBootstrap as ContractArtifact,
     LibMigrate: LibMigrate as ContractArtifact,
+    LibERC1155OrdersStorage: LibERC1155OrdersStorage as ContractArtifact,
+    LibERC721OrdersStorage: LibERC721OrdersStorage as ContractArtifact,
     LibMetaTransactionsStorage: LibMetaTransactionsStorage as ContractArtifact,
     LibNativeOrdersStorage: LibNativeOrdersStorage as ContractArtifact,
     LibOtcOrdersStorage: LibOtcOrdersStorage as ContractArtifact,
@@ -272,10 +311,13 @@ export const artifacts = {
     BridgeAdapter: BridgeAdapter as ContractArtifact,
     BridgeProtocols: BridgeProtocols as ContractArtifact,
     IBridgeAdapter: IBridgeAdapter as ContractArtifact,
+    MixinAaveV2: MixinAaveV2 as ContractArtifact,
     MixinBalancer: MixinBalancer as ContractArtifact,
     MixinBalancerV2: MixinBalancerV2 as ContractArtifact,
+    MixinBalancerV2Batch: MixinBalancerV2Batch as ContractArtifact,
     MixinBancor: MixinBancor as ContractArtifact,
     MixinCoFiX: MixinCoFiX as ContractArtifact,
+    MixinCompound: MixinCompound as ContractArtifact,
     MixinCryptoCom: MixinCryptoCom as ContractArtifact,
     MixinCurve: MixinCurve as ContractArtifact,
     MixinCurveV2: MixinCurveV2 as ContractArtifact,
@@ -294,8 +336,13 @@ export const artifacts = {
     MixinUniswapV2: MixinUniswapV2 as ContractArtifact,
     MixinUniswapV3: MixinUniswapV3 as ContractArtifact,
     MixinZeroExBridge: MixinZeroExBridge as ContractArtifact,
+    IERC1155Token: IERC1155Token as ContractArtifact,
+    IERC721Token: IERC721Token as ContractArtifact,
+    IFeeRecipient: IFeeRecipient as ContractArtifact,
     ILiquidityProvider: ILiquidityProvider as ContractArtifact,
     IMooniswapPool: IMooniswapPool as ContractArtifact,
+    IPropertyValidator: IPropertyValidator as ContractArtifact,
+    ITakerCallback: ITakerCallback as ContractArtifact,
     IUniswapV2Pair: IUniswapV2Pair as ContractArtifact,
     IUniswapV3Pool: IUniswapV3Pool as ContractArtifact,
     IERC20Bridge: IERC20Bridge as ContractArtifact,
@@ -303,9 +350,9 @@ export const artifacts = {
     ITestSimpleFunctionRegistryFeature: ITestSimpleFunctionRegistryFeature as ContractArtifact,
     TestBridge: TestBridge as ContractArtifact,
     TestCallTarget: TestCallTarget as ContractArtifact,
-    TestCurve: TestCurve as ContractArtifact,
     TestDelegateCaller: TestDelegateCaller as ContractArtifact,
     TestFeeCollectorController: TestFeeCollectorController as ContractArtifact,
+    TestFeeRecipient: TestFeeRecipient as ContractArtifact,
     TestFillQuoteTransformerBridge: TestFillQuoteTransformerBridge as ContractArtifact,
     TestFillQuoteTransformerExchange: TestFillQuoteTransformerExchange as ContractArtifact,
     TestFillQuoteTransformerHost: TestFillQuoteTransformerHost as ContractArtifact,
@@ -315,33 +362,38 @@ export const artifacts = {
     TestInitialMigration: TestInitialMigration as ContractArtifact,
     TestLibNativeOrder: TestLibNativeOrder as ContractArtifact,
     TestLibSignature: TestLibSignature as ContractArtifact,
-    TestLiquidityProvider: TestLiquidityProvider as ContractArtifact,
     TestMetaTransactionsNativeOrdersFeature: TestMetaTransactionsNativeOrdersFeature as ContractArtifact,
     TestMetaTransactionsTransformERC20Feature: TestMetaTransactionsTransformERC20Feature as ContractArtifact,
     TestMigrator: TestMigrator as ContractArtifact,
     TestMintTokenERC20Transformer: TestMintTokenERC20Transformer as ContractArtifact,
-    TestMintableERC20Token: TestMintableERC20Token as ContractArtifact,
-    TestMooniswap: TestMooniswap as ContractArtifact,
+    TestNFTOrderPresigner: TestNFTOrderPresigner as ContractArtifact,
     TestNativeOrdersFeature: TestNativeOrdersFeature as ContractArtifact,
     TestNoEthRecipient: TestNoEthRecipient as ContractArtifact,
     TestOrderSignerRegistryWithContractWallet: TestOrderSignerRegistryWithContractWallet as ContractArtifact,
     TestPermissionlessTransformerDeployerSuicidal: TestPermissionlessTransformerDeployerSuicidal as ContractArtifact,
     TestPermissionlessTransformerDeployerTransformer: TestPermissionlessTransformerDeployerTransformer as ContractArtifact,
+    TestPropertyValidator: TestPropertyValidator as ContractArtifact,
     TestRfqOriginRegistration: TestRfqOriginRegistration as ContractArtifact,
     TestSimpleFunctionRegistryFeatureImpl1: TestSimpleFunctionRegistryFeatureImpl1 as ContractArtifact,
     TestSimpleFunctionRegistryFeatureImpl2: TestSimpleFunctionRegistryFeatureImpl2 as ContractArtifact,
     TestStaking: TestStaking as ContractArtifact,
-    TestTokenSpenderERC20Token: TestTokenSpenderERC20Token as ContractArtifact,
     TestTransformERC20: TestTransformERC20 as ContractArtifact,
     TestTransformerBase: TestTransformerBase as ContractArtifact,
     TestTransformerDeployerTransformer: TestTransformerDeployerTransformer as ContractArtifact,
     TestTransformerHost: TestTransformerHost as ContractArtifact,
+    TestUniswapV3Feature: TestUniswapV3Feature as ContractArtifact,
+    TestWethTransformerHost: TestWethTransformerHost as ContractArtifact,
+    TestZeroExFeature: TestZeroExFeature as ContractArtifact,
+    TestCurve: TestCurve as ContractArtifact,
+    TestLiquidityProvider: TestLiquidityProvider as ContractArtifact,
+    TestMooniswap: TestMooniswap as ContractArtifact,
     TestUniswapV2Factory: TestUniswapV2Factory as ContractArtifact,
     TestUniswapV2Pool: TestUniswapV2Pool as ContractArtifact,
     TestUniswapV3Factory: TestUniswapV3Factory as ContractArtifact,
-    TestUniswapV3Feature: TestUniswapV3Feature as ContractArtifact,
     TestUniswapV3Pool: TestUniswapV3Pool as ContractArtifact,
+    TestMintableERC1155Token: TestMintableERC1155Token as ContractArtifact,
+    TestMintableERC20Token: TestMintableERC20Token as ContractArtifact,
+    TestMintableERC721Token: TestMintableERC721Token as ContractArtifact,
+    TestTokenSpenderERC20Token: TestTokenSpenderERC20Token as ContractArtifact,
     TestWeth: TestWeth as ContractArtifact,
-    TestWethTransformerHost: TestWethTransformerHost as ContractArtifact,
-    TestZeroExFeature: TestZeroExFeature as ContractArtifact,
 };

contracts/zero-ex/test/utils/nft_orders.ts

@@ -0,0 +1,41 @@
+import { constants, getRandomInteger, randomAddress } from '@0x/contracts-test-utils';
+import { ERC1155Order, ERC721Order } from '@0x/protocol-utils';
+import { BigNumber } from '@0x/utils';
+
+/**
+ * Generate a random ERC721 Order
+ */
+export function getRandomERC721Order(fields: Partial<ERC721Order> = {}): ERC721Order {
+    return new ERC721Order({
+        erc20Token: randomAddress(),
+        erc20TokenAmount: getRandomInteger('1e18', '10e18'),
+        erc721Token: randomAddress(),
+        erc721TokenId: getRandomInteger(0, constants.MAX_UINT256),
+        maker: randomAddress(),
+        taker: randomAddress(),
+        erc721TokenProperties: [],
+        fees: [],
+        nonce: getRandomInteger(0, constants.MAX_UINT256),
+        expiry: new BigNumber(Math.floor(Date.now() / 1000 + 60)),
+        ...fields,
+    });
+}
+/**
+ * Generate a random ERC1155 Order
+ */
+export function getRandomERC1155Order(fields: Partial<ERC1155Order> = {}): ERC1155Order {
+    return new ERC1155Order({
+        erc20Token: randomAddress(),
+        erc20TokenAmount: getRandomInteger('1e18', '10e18'),
+        erc1155Token: randomAddress(),
+        erc1155TokenId: getRandomInteger(0, constants.MAX_UINT256),
+        erc1155TokenAmount: getRandomInteger(1, '10e18'),
+        maker: randomAddress(),
+        taker: randomAddress(),
+        erc1155TokenProperties: [],
+        fees: [],
+        nonce: getRandomInteger(0, constants.MAX_UINT256),
+        expiry: new BigNumber(Math.floor(Date.now() / 1000 + 60)),
+        ...fields,
+    });
+}

contracts/zero-ex/test/wrappers.ts

@@ -9,11 +9,16 @@ export * from '../test/generated-wrappers/bootstrap_feature';
 export * from '../test/generated-wrappers/bridge_adapter';
 export * from '../test/generated-wrappers/bridge_protocols';
 export * from '../test/generated-wrappers/curve_liquidity_provider';
+export * from '../test/generated-wrappers/erc1155_orders_feature';
+export * from '../test/generated-wrappers/erc165_feature';
+export * from '../test/generated-wrappers/erc721_orders_feature';
 export * from '../test/generated-wrappers/fee_collector';
 export * from '../test/generated-wrappers/fee_collector_controller';
 export * from '../test/generated-wrappers/fill_quote_transformer';
 export * from '../test/generated-wrappers/fixin_common';
 export * from '../test/generated-wrappers/fixin_e_i_p712';
+export * from '../test/generated-wrappers/fixin_erc1155_spender';
+export * from '../test/generated-wrappers/fixin_erc721_spender';
 export * from '../test/generated-wrappers/fixin_protocol_fees';
 export * from '../test/generated-wrappers/fixin_reentrancy_guard';
 export * from '../test/generated-wrappers/fixin_token_spender';
@@ -23,9 +28,15 @@ export * from '../test/generated-wrappers/fund_recovery_feature';
 export * from '../test/generated-wrappers/i_batch_fill_native_orders_feature';
 export * from '../test/generated-wrappers/i_bootstrap_feature';
 export * from '../test/generated-wrappers/i_bridge_adapter';
+export * from '../test/generated-wrappers/i_erc1155_orders_feature';
+export * from '../test/generated-wrappers/i_erc1155_token';
+export * from '../test/generated-wrappers/i_erc165_feature';
 export * from '../test/generated-wrappers/i_erc20_bridge';
 export * from '../test/generated-wrappers/i_erc20_transformer';
+export * from '../test/generated-wrappers/i_erc721_orders_feature';
+export * from '../test/generated-wrappers/i_erc721_token';
 export * from '../test/generated-wrappers/i_feature';
+export * from '../test/generated-wrappers/i_fee_recipient';
 export * from '../test/generated-wrappers/i_flash_wallet';
 export * from '../test/generated-wrappers/i_fund_recovery_feature';
 export * from '../test/generated-wrappers/i_liquidity_provider';
@@ -39,8 +50,10 @@ export * from '../test/generated-wrappers/i_native_orders_feature';
 export * from '../test/generated-wrappers/i_otc_orders_feature';
 export * from '../test/generated-wrappers/i_ownable_feature';
 export * from '../test/generated-wrappers/i_pancake_swap_feature';
+export * from '../test/generated-wrappers/i_property_validator';
 export * from '../test/generated-wrappers/i_simple_function_registry_feature';
 export * from '../test/generated-wrappers/i_staking';
+export * from '../test/generated-wrappers/i_taker_callback';
 export * from '../test/generated-wrappers/i_test_simple_function_registry_feature';
 export * from '../test/generated-wrappers/i_token_spender_feature';
 export * from '../test/generated-wrappers/i_transform_erc20_feature';
@@ -52,12 +65,16 @@ export * from '../test/generated-wrappers/i_zero_ex';
 export * from '../test/generated-wrappers/initial_migration';
 export * from '../test/generated-wrappers/lib_bootstrap';
 export * from '../test/generated-wrappers/lib_common_rich_errors';
+export * from '../test/generated-wrappers/lib_erc1155_orders_storage';
 export * from '../test/generated-wrappers/lib_erc20_transformer';
+export * from '../test/generated-wrappers/lib_erc721_orders_storage';
 export * from '../test/generated-wrappers/lib_fee_collector';
 export * from '../test/generated-wrappers/lib_liquidity_provider_rich_errors';
 export * from '../test/generated-wrappers/lib_meta_transactions_rich_errors';
 export * from '../test/generated-wrappers/lib_meta_transactions_storage';
 export * from '../test/generated-wrappers/lib_migrate';
+export * from '../test/generated-wrappers/lib_n_f_t_order';
+export * from '../test/generated-wrappers/lib_n_f_t_orders_rich_errors';
 export * from '../test/generated-wrappers/lib_native_order';
 export * from '../test/generated-wrappers/lib_native_orders_rich_errors';
 export * from '../test/generated-wrappers/lib_native_orders_storage';
@@ -79,10 +96,13 @@ export * from '../test/generated-wrappers/liquidity_provider_feature';
 export * from '../test/generated-wrappers/liquidity_provider_sandbox';
 export * from '../test/generated-wrappers/log_metadata_transformer';
 export * from '../test/generated-wrappers/meta_transactions_feature';
+export * from '../test/generated-wrappers/mixin_aave_v2';
 export * from '../test/generated-wrappers/mixin_balancer';
 export * from '../test/generated-wrappers/mixin_balancer_v2';
+export * from '../test/generated-wrappers/mixin_balancer_v2_batch';
 export * from '../test/generated-wrappers/mixin_bancor';
 export * from '../test/generated-wrappers/mixin_co_fi_x';
+export * from '../test/generated-wrappers/mixin_compound';
 export * from '../test/generated-wrappers/mixin_crypto_com';
 export * from '../test/generated-wrappers/mixin_curve';
 export * from '../test/generated-wrappers/mixin_curve_v2';
@@ -109,6 +129,7 @@ export * from '../test/generated-wrappers/multiplex_rfq';
 export * from '../test/generated-wrappers/multiplex_transform_erc20';
 export * from '../test/generated-wrappers/multiplex_uniswap_v2';
 export * from '../test/generated-wrappers/multiplex_uniswap_v3';
+export * from '../test/generated-wrappers/n_f_t_orders';
 export * from '../test/generated-wrappers/native_orders_cancellation';
 export * from '../test/generated-wrappers/native_orders_feature';
 export * from '../test/generated-wrappers/native_orders_info';
@@ -126,6 +147,7 @@ export * from '../test/generated-wrappers/test_call_target';
 export * from '../test/generated-wrappers/test_curve';
 export * from '../test/generated-wrappers/test_delegate_caller';
 export * from '../test/generated-wrappers/test_fee_collector_controller';
+export * from '../test/generated-wrappers/test_fee_recipient';
 export * from '../test/generated-wrappers/test_fill_quote_transformer_bridge';
 export * from '../test/generated-wrappers/test_fill_quote_transformer_exchange';
 export * from '../test/generated-wrappers/test_fill_quote_transformer_host';
@@ -140,13 +162,17 @@ export * from '../test/generated-wrappers/test_meta_transactions_native_orders_f
 export * from '../test/generated-wrappers/test_meta_transactions_transform_erc20_feature';
 export * from '../test/generated-wrappers/test_migrator';
 export * from '../test/generated-wrappers/test_mint_token_erc20_transformer';
+export * from '../test/generated-wrappers/test_mintable_erc1155_token';
 export * from '../test/generated-wrappers/test_mintable_erc20_token';
+export * from '../test/generated-wrappers/test_mintable_erc721_token';
 export * from '../test/generated-wrappers/test_mooniswap';
+export * from '../test/generated-wrappers/test_n_f_t_order_presigner';
 export * from '../test/generated-wrappers/test_native_orders_feature';
 export * from '../test/generated-wrappers/test_no_eth_recipient';
 export * from '../test/generated-wrappers/test_order_signer_registry_with_contract_wallet';
 export * from '../test/generated-wrappers/test_permissionless_transformer_deployer_suicidal';
 export * from '../test/generated-wrappers/test_permissionless_transformer_deployer_transformer';
+export * from '../test/generated-wrappers/test_property_validator';
 export * from '../test/generated-wrappers/test_rfq_origin_registration';
 export * from '../test/generated-wrappers/test_simple_function_registry_feature_impl1';
 export * from '../test/generated-wrappers/test_simple_function_registry_feature_impl2';

contracts/zero-ex/tsconfig.json

@@ -42,11 +42,16 @@
         "test/generated-artifacts/BridgeAdapter.json",
         "test/generated-artifacts/BridgeProtocols.json",
         "test/generated-artifacts/CurveLiquidityProvider.json",
+        "test/generated-artifacts/ERC1155OrdersFeature.json",
+        "test/generated-artifacts/ERC165Feature.json",
+        "test/generated-artifacts/ERC721OrdersFeature.json",
         "test/generated-artifacts/FeeCollector.json",
         "test/generated-artifacts/FeeCollectorController.json",
         "test/generated-artifacts/FillQuoteTransformer.json",
         "test/generated-artifacts/FixinCommon.json",
         "test/generated-artifacts/FixinEIP712.json",
+        "test/generated-artifacts/FixinERC1155Spender.json",
+        "test/generated-artifacts/FixinERC721Spender.json",
         "test/generated-artifacts/FixinProtocolFees.json",
         "test/generated-artifacts/FixinReentrancyGuard.json",
         "test/generated-artifacts/FixinTokenSpender.json",
@@ -56,9 +61,15 @@
         "test/generated-artifacts/IBatchFillNativeOrdersFeature.json",
         "test/generated-artifacts/IBootstrapFeature.json",
         "test/generated-artifacts/IBridgeAdapter.json",
+        "test/generated-artifacts/IERC1155OrdersFeature.json",
+        "test/generated-artifacts/IERC1155Token.json",
+        "test/generated-artifacts/IERC165Feature.json",
         "test/generated-artifacts/IERC20Bridge.json",
         "test/generated-artifacts/IERC20Transformer.json",
+        "test/generated-artifacts/IERC721OrdersFeature.json",
+        "test/generated-artifacts/IERC721Token.json",
         "test/generated-artifacts/IFeature.json",
+        "test/generated-artifacts/IFeeRecipient.json",
         "test/generated-artifacts/IFlashWallet.json",
         "test/generated-artifacts/IFundRecoveryFeature.json",
         "test/generated-artifacts/ILiquidityProvider.json",
@@ -72,8 +83,10 @@
         "test/generated-artifacts/IOtcOrdersFeature.json",
         "test/generated-artifacts/IOwnableFeature.json",
         "test/generated-artifacts/IPancakeSwapFeature.json",
+        "test/generated-artifacts/IPropertyValidator.json",
         "test/generated-artifacts/ISimpleFunctionRegistryFeature.json",
         "test/generated-artifacts/IStaking.json",
+        "test/generated-artifacts/ITakerCallback.json",
         "test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json",
         "test/generated-artifacts/ITokenSpenderFeature.json",
         "test/generated-artifacts/ITransformERC20Feature.json",
@@ -85,12 +98,16 @@
         "test/generated-artifacts/InitialMigration.json",
         "test/generated-artifacts/LibBootstrap.json",
         "test/generated-artifacts/LibCommonRichErrors.json",
+        "test/generated-artifacts/LibERC1155OrdersStorage.json",
         "test/generated-artifacts/LibERC20Transformer.json",
+        "test/generated-artifacts/LibERC721OrdersStorage.json",
         "test/generated-artifacts/LibFeeCollector.json",
         "test/generated-artifacts/LibLiquidityProviderRichErrors.json",
         "test/generated-artifacts/LibMetaTransactionsRichErrors.json",
         "test/generated-artifacts/LibMetaTransactionsStorage.json",
         "test/generated-artifacts/LibMigrate.json",
+        "test/generated-artifacts/LibNFTOrder.json",
+        "test/generated-artifacts/LibNFTOrdersRichErrors.json",
         "test/generated-artifacts/LibNativeOrder.json",
         "test/generated-artifacts/LibNativeOrdersRichErrors.json",
         "test/generated-artifacts/LibNativeOrdersStorage.json",
@@ -112,10 +129,13 @@
         "test/generated-artifacts/LiquidityProviderSandbox.json",
         "test/generated-artifacts/LogMetadataTransformer.json",
         "test/generated-artifacts/MetaTransactionsFeature.json",
+        "test/generated-artifacts/MixinAaveV2.json",
         "test/generated-artifacts/MixinBalancer.json",
         "test/generated-artifacts/MixinBalancerV2.json",
+        "test/generated-artifacts/MixinBalancerV2Batch.json",
         "test/generated-artifacts/MixinBancor.json",
         "test/generated-artifacts/MixinCoFiX.json",
+        "test/generated-artifacts/MixinCompound.json",
         "test/generated-artifacts/MixinCryptoCom.json",
         "test/generated-artifacts/MixinCurve.json",
         "test/generated-artifacts/MixinCurveV2.json",
@@ -142,6 +162,7 @@
         "test/generated-artifacts/MultiplexTransformERC20.json",
         "test/generated-artifacts/MultiplexUniswapV2.json",
         "test/generated-artifacts/MultiplexUniswapV3.json",
+        "test/generated-artifacts/NFTOrders.json",
         "test/generated-artifacts/NativeOrdersCancellation.json",
         "test/generated-artifacts/NativeOrdersFeature.json",
         "test/generated-artifacts/NativeOrdersInfo.json",
@@ -159,6 +180,7 @@
         "test/generated-artifacts/TestCurve.json",
         "test/generated-artifacts/TestDelegateCaller.json",
         "test/generated-artifacts/TestFeeCollectorController.json",
+        "test/generated-artifacts/TestFeeRecipient.json",
         "test/generated-artifacts/TestFillQuoteTransformerBridge.json",
         "test/generated-artifacts/TestFillQuoteTransformerExchange.json",
         "test/generated-artifacts/TestFillQuoteTransformerHost.json",
@@ -173,13 +195,17 @@
         "test/generated-artifacts/TestMetaTransactionsTransformERC20Feature.json",
         "test/generated-artifacts/TestMigrator.json",
         "test/generated-artifacts/TestMintTokenERC20Transformer.json",
+        "test/generated-artifacts/TestMintableERC1155Token.json",
         "test/generated-artifacts/TestMintableERC20Token.json",
+        "test/generated-artifacts/TestMintableERC721Token.json",
         "test/generated-artifacts/TestMooniswap.json",
+        "test/generated-artifacts/TestNFTOrderPresigner.json",
         "test/generated-artifacts/TestNativeOrdersFeature.json",
         "test/generated-artifacts/TestNoEthRecipient.json",
         "test/generated-artifacts/TestOrderSignerRegistryWithContractWallet.json",
         "test/generated-artifacts/TestPermissionlessTransformerDeployerSuicidal.json",
         "test/generated-artifacts/TestPermissionlessTransformerDeployerTransformer.json",
+        "test/generated-artifacts/TestPropertyValidator.json",
         "test/generated-artifacts/TestRfqOriginRegistration.json",
         "test/generated-artifacts/TestSimpleFunctionRegistryFeatureImpl1.json",
         "test/generated-artifacts/TestSimpleFunctionRegistryFeatureImpl2.json",

docs/additional/audits.rst

@@ -4,23 +4,28 @@ Audits
 
 Below are links to our third-party audit reports.
 
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| **Release**      | **Reports**                                                                                                   |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| Exchange V4      | * `Consensys Diligence (December 2020) <https://consensys.net/diligence/audits/2020/12/0x-exchange-v4/>`__    |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| Exchange V3      | * `Trail of Bits <http://zeips.0x.org.s3-website.us-east-2.amazonaws.com/audits/56/trail-of-bits/audit.pdf>`_ |
-|                  | * `Consensys Diligence (Exchange) <https://diligence.consensys.net/audits/2019/09/0x-v3-exchange/>`__         |
-|                  | * `Consensys Diligence (Staking) <https://diligence.consensys.net/audits/2019/10/0x-v3-staking/>`__           |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| Exchange V2.1    | * `First <https://docs.google.com/document/d/1jYv6V21MfCSwCS5fxD6ZyaLWGzkpRSUO0lZpST94XsA/edit>`_             |
-|                  | * `Consensys Diligence <https://github.com/ConsenSys/0x_audit_report_2018-07-23>`_                            |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| MultiAssetProxy  | * `Consensys Diligence <https://github.com/ConsenSys/0x-audit-report-2018-12>`__                              |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| ERC1155Proxy     | * `Consensys Diligence <https://github.com/ConsenSys/0x-audit-report-2019-05>`__                              |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| StaticCallProxy  | * No third-party audit.                                                                                       |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| ERC20BridgeProxy | * No third-party audit.                                                                                       |
-+------------------+---------------------------------------------------------------------------------------------------------------+
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| **Release**          | **Reports**                                                                                                               |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| ERC721OrdersFeature  | * `ABDK Consulting <https://s3.us-east-2.amazonaws.com/zeips.0x.org/audits/abdk-consulting/ABDK_0x_Solidity_v_1_0.pdf>`__ |
+|                      |                                                                                                                           |
+|                      |                                                                                                                           |
+| ERC1155OrdersFeature |                                                                                                                           |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| Exchange V4          | * `Consensys Diligence (December 2020) <https://consensys.net/diligence/audits/2020/12/0x-exchange-v4/>`__                |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| Exchange V3          | * `Trail of Bits <http://zeips.0x.org.s3-website.us-east-2.amazonaws.com/audits/56/trail-of-bits/audit.pdf>`__            |
+|                      | * `Consensys Diligence (Exchange) <https://diligence.consensys.net/audits/2019/09/0x-v3-exchange/>`__                     |
+|                      | * `Consensys Diligence (Staking) <https://diligence.consensys.net/audits/2019/10/0x-v3-staking/>`__                       |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| Exchange V2.1        | * `First <https://docs.google.com/document/d/1jYv6V21MfCSwCS5fxD6ZyaLWGzkpRSUO0lZpST94XsA/edit>`_                         |
+|                      | * `Consensys Diligence <https://github.com/ConsenSys/0x_audit_report_2018-07-23>`_                                        |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| MultiAssetProxy      | * `Consensys Diligence <https://github.com/ConsenSys/0x-audit-report-2018-12>`__                                          |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| ERC1155Proxy         | * `Consensys Diligence <https://github.com/ConsenSys/0x-audit-report-2019-05>`__                                          |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| StaticCallProxy      | * No third-party audit.                                                                                                   |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| ERC20BridgeProxy     | * No third-party audit.                                                                                                   |
++----------------------+---------------------------------------------------------------------------------------------------------------------------+

docs/additional/bounties.rst

@@ -2,47 +2,15 @@
 Bounties
 ###############################
 
-We run an ongoing bug bounty for the 0x Protocol smart contracts! The program is open to anyone and
-rewards up to **$100,000 for critical exploits**. The scope and disclosure instructions are below.
 
-Rewards
--------
-The severity of reported vulnerabilities will be graded according to the `CVSS <https://www.first.org/cvss/>`_ (Common Vulnerability Scoring Standard).
-The following table will serve as a guideline for reward decisions:
+The bug bounties on this page apply only to the *0x smart contracts* on Ethereum mainnet, Binance Smart Chain, Polygon, Avalanche, Fantom, Celo, Optimism and future deployments in other EVM-compatible networks announced through our official communication channels.  
 
-+----------------------------+---------------------+
-| **Exploit Score**          | **Reward**          |
-+----------------------------+---------------------+
-| Critical (CVSS 9.0 - 10.0) | $10,000 - $100,000  |
-+----------------------------+---------------------+
-| High (CVSS 7.0 - 8.9)      | $2,500 - $10,000    |
-+----------------------------+---------------------+
-| Medium (CVSS 4.0 - 6.9)    | $1,000 - $2,500     |
-+----------------------------+---------------------+
-| Low (CVSS 0.0 - 3.9)       | $0 - $1,000         |
-+----------------------------+---------------------+
+Bug reports pertaining to 0x API and 0x web interfaces (e.g. Matcha, 0x.org), both in terms of UI/UX or servers/infrastructure, are not eligible. Only the first reporter of a given contract vulnerability will be rewarded, and findings already discovered as part of a formal audit are ineligible. 
 
-Please note that any rewards will ultimately be awarded at the discretion of ZeroEx Intl. All rewards will be paid out in ZRX. 
+Overview
+--------
 
-Areas of Interest
------------------
-
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Area**                  | **Examples**                                                                                                                                            |
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Loss of funds             | * A user loses funds in a way that they did not explicitly authorize (e.g an account is able to gain access to an ``AssetProxy`` and drain user funds). |
-|                           | * A user authorized a transaction or trade but spends more assets than normally expected (e.g an order is allowed to be over-filled).                   |
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Unintended contract state | * A user is able to update the state of a contract such that it is no longer useable (e.g permanently lock a mutex).                                    |
-|                           | * Any assets get unexpectedly "stuck" in a contract with regular use of the contract's public methods.                                                  |
-|                           | * An action taken in the staking contracts is applied to an incorrect epoch.                                                                            |
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Bypassing time locks      | * The ``ZeroExGovernor`` is allowed to bypass the timelock for transactions where it is not explicitly allowed to do so.                                |
-|                           | * A user is allowed to bypass the ``ZeroExGovernor``.                                                                                                   |
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Incorrect math            | * Overflows or underflow result in unexpected behavior.                                                                                                 |
-|                           | * The staking reward payouts are incorrect.                                                                                                             |
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
+0x has completed smart contract audits with Consensys Diligence, Trail of Bits and ABDK. We run a continuous bug bounty program for the V4 release of the 0x core contracts.
 
 Scope
 -----
@@ -51,14 +19,14 @@ The following contracts are in scope of the bug bounty. Please note that any bug
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | **Release**      | **Contracts**                                                                                                                                                                                                                                                                                 | **Commit Hash**                                                                                                                      |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
-| Exchange V4      | * Documentation at `https://0xprotocol.readthedocs.io/en/latest/ <https://0xprotocol.readthedocs.io/en/latest/>`__                                                                                                                                                                            | `72a74e7c66 <https://github.com/0xProject/protocol/tree/72a74e7c66e27da02dd9f4ce604ad057c740c304/contracts/zero-ex/contracts/src>`__ |
-|                  | * `ZeroEx.sol <https://github.com/0xProject/protocol/blob/72a74e7c66e27da02dd9f4ce604ad057c740c304/contracts/zero-ex/contracts/src/ZeroEx.sol>`__                                                                                                                                             |                                                                                                                                      |
-|                  | * `ZeroExOptimized.sol <https://github.com/0xProject/protocol/blob/72a74e7c66e27da02dd9f4ce604ad057c740c304/contracts/zero-ex/contracts/src/ZeroExOptimized.sol>`__                                                                                                                           |                                                                                                                                      |
-|                  | * `external/*.sol <https://github.com/0xProject/protocol/tree/72a74e7c66e27da02dd9f4ce604ad057c740c304/contracts/zero-ex/contracts/src/external>`__                                                                                                                                           |                                                                                                                                      |
-|                  | * `features/**.sol <https://github.com/0xProject/protocol/tree/72a74e7c66e27da02dd9f4ce604ad057c740c304/contracts/zero-ex/contracts/src/features>`__                                                                                                                                          |                                                                                                                                      |
-|                  | * `fixins/*.sol <https://github.com/0xProject/protocol/tree/72a74e7c66e27da02dd9f4ce604ad057c740c304/contracts/zero-ex/contracts/src/fixins>`__                                                                                                                                               |                                                                                                                                      |
-|                  | * `migrations/*.sol <https://github.com/0xProject/protocol/tree/72a74e7c66e27da02dd9f4ce604ad057c740c304/contracts/zero-ex/contracts/src/migrations>`__                                                                                                                                       |                                                                                                                                      |
-|                  | * `storage/*.sol <https://github.com/0xProject/protocol/tree/72a74e7c66e27da02dd9f4ce604ad057c740c304/contracts/zero-ex/contracts/src/storage>`__                                                                                                                                             |                                                                                                                                      |
+| Exchange V4      | * Documentation at `https://protocol.0x.org/en/latest/ <https://protocol.0x.org/en/latest/>`__                                                                                                                                                                                                | `2cbeb9c <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src>`__           |
+|                  | * `ZeroEx.sol <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src/ZeroEx.sol>`__                                                                                                                                                    |                                                                                                                                      |
+|                  | * `ZeroExOptimized.sol <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src/ZeroExOptimized.sol>`__                                                                                                                                  |                                                                                                                                      |
+|                  | * `external/*.sol <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src/external>`__                                                                                                                                                  |                                                                                                                                      |
+|                  | * `features/**.sol <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src/features>`__                                                                                                                                                 |                                                                                                                                      |
+|                  | * `fixins/*.sol <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src/fixins>`__                                                                                                                                                      |                                                                                                                                      |
+|                  | * `migrations/*.sol <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src/migrations>`__                                                                                                                                              |                                                                                                                                      |
+|                  | * `storage/*.sol <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src/storage>`__                                                                                                                                                    |                                                                                                                                      |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | Exchange V3      | * `ERC20BridgeProxy.sol <https://github.com/0xProject/0x-monorepo/blob/fb8360edfd4f42f2d2b127b95c156eb1b0daa02b/contracts/asset-proxy/contracts/src/ERC20BridgeProxy.sol>`_ (`spec <https://github.com/0xProject/0x-protocol-specification/blob/master/asset-proxy/erc20-bridge-proxy.md>`__) | `fb8360edfd <https://github.com/0xProject/0x-monorepo/tree/fb8360edfd4f42f2d2b127b95c156eb1b0daa02b/contracts>`__                    |
 |                  | * `Exchange.sol <https://github.com/0xProject/0x-monorepo/blob/fb8360edfd4f42f2d2b127b95c156eb1b0daa02b/contracts/exchange/contracts/src/Exchange.sol>`__ (`spec <https://github.com/0xProject/0x-protocol-specification/blob/master/v3/v3-specification.md>`__)                              |                                                                                                                                      |
@@ -67,7 +35,7 @@ The following contracts are in scope of the bug bounty. Please note that any bug
 |                  | * `StakingProxy.sol <https://github.com/0xProject/0x-monorepo/blob/fb8360edfd4f42f2d2b127b95c156eb1b0daa02b/contracts/staking/contracts/src/StakingProxy.sol>`_ (`spec <https://github.com/0xProject/0x-protocol-specification/blob/master/staking/staking-specification.md>`__)              |                                                                                                                                      |
 |                  | * `ZrxVault.sol <https://github.com/0xProject/0x-monorepo/blob/fb8360edfd4f42f2d2b127b95c156eb1b0daa02b/contracts/staking/contracts/src/ZrxVault.sol>`_ (`spec <https://github.com/0xProject/0x-protocol-specification/blob/master/staking/staking-specification.md>`__)                      |                                                                                                                                      |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
-| Exchange V2.1    | * `src/2.0.0/protocol <https://github.com/0xProject/0x-monorepo/tree/ff70c5ecfe28eff14e1a372c5e493b8f5363e1d0/packages/contracts/src/2.0.0/protocol>`_                                                                                                                                        | `ff70c5ecfe <https://github.com/0xProject/0x-monorepo/tree/ff70c5ecfe28eff14e1a372c5e493b8f5363e1d0/contracts>`_                     |
+| Exchange V2.1    | * `src/2.0.0/protocol <https://github.com/0xProject/0x-monorepo/tree/ff70c5ecfe28eff14e1a372c5e493b8f5363e1d0/packages/contracts/src/2.0.0/protocol>`_                                                                                                                                        | `ff70c5ecfe <https://github.com/0xProject/0x-monorepo/tree/ff70c5ecfe28eff14e1a372c5e493b8f5363e1d0/packages/contracts/src/2.0.0>`_  |
 |                  | * `src/2.0.0/utils <https://github.com/0xProject/0x-monorepo/tree/ff70c5ecfe28eff14e1a372c5e493b8f5363e1d0/packages/contracts/src/2.0.0/utils>`_                                                                                                                                              |                                                                                                                                      |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | MultiAssetProxy  | * `MultiAssetProxy.sol <https://github.com/0xProject/0x-monorepo/blob/c4d9ef9f83508154fe9db35796b6b86aeb0f2240/contracts/asset-proxy/contracts/src/MultiAssetProxy.sol>`_                                                                                                                     | `c4d9ef9f83 <https://github.com/0xProject/0x-monorepo/tree/c4d9ef9f83508154fe9db35796b6b86aeb0f2240/contracts>`_                     |
@@ -78,9 +46,37 @@ The following contracts are in scope of the bug bounty. Please note that any bug
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | ERC20BridgeProxy | * `ERC20BridgeProxy.sol <https://github.com/0xProject/0x-monorepo/blob/281658ba349a2c5088b40b503998bea5020284a6/contracts/asset-proxy/contracts/src/ERC20BridgeProxy.sol>`__                                                                                                                  | `281658ba34 <https://github.com/0xProject/0x-monorepo/tree/281658ba349a2c5088b40b503998bea5020284a6/contracts>`_                     |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
-| ExchangeProxy    | * `contracts/src <https://github.com/0xProject/0x-monorepo/tree/7967a8416c76e34ff5a0a4eb80e7b33ff8c0e297/contracts/zero-ex>`__                                                                                                                                                                | `7967a8416c <https://github.com/0xProject/0x-monorepo/tree/7967a8416c76e34ff5a0a4eb80e7b33ff8c0e297/contracts>`_                     |
+| ExchangeProxy    | * `contracts/src <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src>`__                                                                                                                                                            | `2cbeb9c <https://github.com/0xProject/protocol/tree/audit/nft-orders-address-findings/contracts/zero-ex/contracts/src>`_            |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
 
+Bounties
+--------
+The bounty program will pay out rewards according to the severity of a vulnerability. The severity of reported vulnerabilities will be graded according to the `CVSS <https://www.first.org/cvss/>`__ (Common Vulnerability Scoring Standard).
+
+The final reward amount is at the sole discretion of 0x Labs and will be paid in the specified sum in either USD or ETH. 
+
++----------------------------+---------------------+
+| **Exploit Score**          | **Reward**          |
++----------------------------+---------------------+
+| Critical (CVSS 9.0 - 10.0) | up to $1,000,000    |
++----------------------------+---------------------+
+| High (CVSS 7.0 - 8.9)      | up to $350,000      |
++----------------------------+---------------------+
+| Medium (CVSS 4.0 - 6.9)    | up to $35,000       |
++----------------------------+---------------------+
+| Low (CVSS 0.0 - 3.9)       | up to $5,000        |
++----------------------------+---------------------+
+
+Recent Inclusions 
+-----------------
+
++---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Change**                | ****                                                                                                                                                    |
++---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
+| NFT feature               | * Trade ERC721 and ERC1155 assets. See `ZEIP-93 <https://github.com/0xProject/ZEIPs/issues/93>`__ for more details                                      |
++---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
+
+
 Disclosures
 -----------
 Please e-mail all submissions to security@0x.org with the subject "BUG BOUNTY". Your submission 

docs/additional/exceptional_erc20s.rst

@@ -17,3 +17,10 @@ Known tokens:
 - LINK
 - sUSD
 - USDT
+
+Tokens with Fees on Transfer
+----------------------------
+These tokens do not follow the ERC20 specification. As such the protocol expects the transfer to transfer
+the specified amount, or revert. Since tokens with transfer fees do not meet this criteria, the behaviour
+of the protocol with these tokens is unspecified. In most cases it will result in an overall transaction failure
+due to various slippage protections.

docs/additional/releases.rst

@@ -17,10 +17,12 @@ This page outlines upcoming releases and expected changes.
     +---------------------------------------------+---------------------------------------------------------------+----------------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------+
     | **Name**                                    | **Overview**                                                  | **Est Release Date** | **Status**  | **Additional**                                                                                                                      |
     +---------------------------------------------+---------------------------------------------------------------+----------------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------+
-    | `Amaretto`_                                 | Protocol 4.1: Efficiency + Batch Fills                        | 03/15/21             | Development |                                                                                                                                     |
+    | `Nifty`_                                    | ERC721 and ERC1155 support                                    | 02/14/22             | Vote        |                                                                                                                                     |
     +---------------------------------------------+---------------------------------------------------------------+----------------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------+
     | *The following releases have been deployed* |                                                               |                      |             |                                                                                                                                     |
     +---------------------------------------------+---------------------------------------------------------------+----------------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------+
+    | `Amaretto`_                                 | Protocol 4.1: Efficiency + Batch Fills                        | 03/15/21             | Deployed    |                                                                                                                                     |
+    +---------------------------------------------+---------------------------------------------------------------+----------------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------+
     | `Babooshka`_                                | Connect Exchange Proxy to Staking                             | 02/08/21             | Deployed    | `Release Notes <https://github.com/0xProject/0x-migrations/blob/main/src/exchange-proxy/migrations/log/9_babooshka.md>`__           |
     +---------------------------------------------+---------------------------------------------------------------+----------------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------+
     | `Squire`_                                   | Aggregation for `V4 Orders <../basics/orders.html>`_          | 02/04/21             | Deployed    | N/A                                                                                                                                 |
@@ -45,6 +47,19 @@ This page outlines upcoming releases and expected changes.
 Upcoming
 ========
 
+Nifty
+--------
+
+- ERC721 and ERC1155 order types
+- Batch fills for NFT orders
+- Property based orders
+- Ability to receive ETH in NFT orders
+
+
+
+Past
+=====
+
 Amaretto
 --------
 
@@ -53,10 +68,6 @@ Amaretto
 - Mooniswap VIP
 - Curve / Swerve VIP (via PLP Sandbox)
 
-
-Past
-=====
-
 Babooshka
 ----------
 

docs/advanced/erc20_transformations.rst

@@ -57,18 +57,22 @@ Liquidity Aggregation
 
 Liquidity can be pulled from other Decentralized Exchanges (DEX) to supplement native liquidity (0x orders). This is currently used by 0x API to provide the aggregate the best prices across the entire DEX Ecosystem. Check out `https://matcha.xyz <https://matcha.xyz>`_ to see this in action!
 
-Supported DEX's:
+Below are just a few of the Supported DEX's on Ethereum:
 
-* Balancer
+* Balancer v1/v2
+* Bancor v1/v2
 * Curve
-* DoDo
+* Dodo v1/v2
 * Kyber
+* MakerPSM
 * MStable
 * Mooniswap
 * Oasis
 * Shell
 * Sushiswap
-* Uniswap v1/v2
+* Shibaswap
+* Smoothy
+* Uniswap v1/v2/v3
 
 This transformation is implemented by the `FillQuoteTransformer <../architecture/transformers.html>`_. Abi-Encode the following struct to get the ``data``:
 

docs/basics/addresses.rst

@@ -6,16 +6,17 @@ Addresses
 .. note::
     This page is auto-generated. See the `contract-addresses <https://github.com/0xProject/protocol/blob/development/packages/contract-addresses/addresses.json>`_ package for an exhaustive list of contracts across all networks.
 
+    The Exchange Proxy may have different addresses on various networks, see the `Exchange Proxy Addresses <./addresses.html#exchange-proxy-addresses>`__ table for an exhaustive list.
+
 Exchange V4
 ===================
 .. csv-table::
 
-    exchangeProxy, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://etherscan.io/address//0xdef1c0ded9bec7f1a1670819833240f027b25eff>`_
-    exchangeProxyAllowanceTarget, `0xf740b67da229f2f10bcbd38a7979992fcc71b8eb <https://etherscan.io/address//0xf740b67da229f2f10bcbd38a7979992fcc71b8eb>`_
-    exchangeProxyFlashWallet, `0x22f9dcf4647084d6c31b2765f6910cd85c178c18 <https://etherscan.io/address//0x22f9dcf4647084d6c31b2765f6910cd85c178c18>`_
-    exchangeProxyGovernor, `0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e <https://etherscan.io/address//0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e>`_
-    exchangeProxyLiquidityProviderSandbox, `0x407b4128e9ecad8769b2332312a9f655cb9f5f3a <https://etherscan.io/address//0x407b4128e9ecad8769b2332312a9f655cb9f5f3a>`_
-    exchangeProxyTransformerDeployer, `0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb <https://etherscan.io/address//0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb>`_
+    exchangeProxy, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://etherscan.io/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
+    exchangeProxyFlashWallet, `0x22f9dcf4647084d6c31b2765f6910cd85c178c18 <https://etherscan.io/address/0x22f9dcf4647084d6c31b2765f6910cd85c178c18>`__
+    exchangeProxyGovernor, `0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e <https://etherscan.io/address/0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e>`__
+    exchangeProxyLiquidityProviderSandbox, `0x407b4128e9ecad8769b2332312a9f655cb9f5f3a <https://etherscan.io/address/0x407b4128e9ecad8769b2332312a9f655cb9f5f3a>`__
+    exchangeProxyTransformerDeployer, `0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb <https://etherscan.io/address/0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb>`__
 
 
 
@@ -23,10 +24,11 @@ Transformers
 ===================
 .. csv-table::
 
-    wethTransformer, `0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7 <https://etherscan.io/address//0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7>`_
-    payTakerTransformer, `0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e <https://etherscan.io/address//0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e>`_
-    fillQuoteTransformer, `0x5ce5174d7442061135ea849970ffc7763920e0fd <https://etherscan.io/address//0x5ce5174d7442061135ea849970ffc7763920e0fd>`_
-    affiliateFeeTransformer, `0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f <https://etherscan.io/address//0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f>`_
+    wethTransformer, `0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7 <https://etherscan.io/address/0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7>`__
+    payTakerTransformer, `0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e <https://etherscan.io/address/0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e>`__
+    affiliateFeeTransformer, `0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f <https://etherscan.io/address/0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f>`__
+    fillQuoteTransformer, `0xb4fa284689c9784a60d840eb136bb16c5246191f <https://etherscan.io/address/0xb4fa284689c9784a60d840eb136bb16c5246191f>`__
+    positiveSlippageFeeTransformer, `0xa9416ce1dbde8d331210c07b5c253d94ee4cc3fd <https://etherscan.io/address/0xa9416ce1dbde8d331210c07b5c253d94ee4cc3fd>`__
 
 
 
@@ -34,10 +36,10 @@ ZRX / Staking
 ===================
 .. csv-table::
 
-    staking, `0x2a17c35ff147b32f13f19f2e311446eeb02503f3 <https://etherscan.io/address//0x2a17c35ff147b32f13f19f2e311446eeb02503f3>`_
-    stakingProxy, `0xa26e80e7dea86279c6d778d702cc413e6cffa777 <https://etherscan.io/address//0xa26e80e7dea86279c6d778d702cc413e6cffa777>`_
-    zrxToken, `0xe41d2489571d322189246dafa5ebde1f4699f498 <https://etherscan.io/address//0xe41d2489571d322189246dafa5ebde1f4699f498>`_
-    zrxVault, `0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf <https://etherscan.io/address//0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf>`_
+    staking, `0x2a17c35ff147b32f13f19f2e311446eeb02503f3 <https://etherscan.io/address/0x2a17c35ff147b32f13f19f2e311446eeb02503f3>`__
+    stakingProxy, `0xa26e80e7dea86279c6d778d702cc413e6cffa777 <https://etherscan.io/address/0xa26e80e7dea86279c6d778d702cc413e6cffa777>`__
+    zrxToken, `0xe41d2489571d322189246dafa5ebde1f4699f498 <https://etherscan.io/address/0xe41d2489571d322189246dafa5ebde1f4699f498>`__
+    zrxVault, `0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf <https://etherscan.io/address/0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf>`__
 
 
 
@@ -45,9 +47,22 @@ Miscellaneous
 ===================
 .. csv-table::
 
-    devUtils, `0x74134cf88b21383713e096a5ecf59e297dc7f547 <https://etherscan.io/address//0x74134cf88b21383713e096a5ecf59e297dc7f547>`_
-    etherToken, `0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2 <https://etherscan.io/address//0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2>`_
-    erc20BridgeSampler, `0xd8c38704c9937ea3312de29f824b4ad3450a5e61 <https://etherscan.io/address//0xd8c38704c9937ea3312de29f824b4ad3450a5e61>`_
+    devUtils, `0x74134cf88b21383713e096a5ecf59e297dc7f547 <https://etherscan.io/address/0x74134cf88b21383713e096a5ecf59e297dc7f547>`__
+    etherToken, `0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2 <https://etherscan.io/address/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2>`__
+    erc20BridgeSampler, `0xd8c38704c9937ea3312de29f824b4ad3450a5e61 <https://etherscan.io/address/0xd8c38704c9937ea3312de29f824b4ad3450a5e61>`__
 
 
 
+Exchange Proxy Addresses 
+=========================
+Note: Some addresses have changed across various networks
+
+.. csv-table::
+
+    Ethereum, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://etherscan.io/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
+    Optimism, `0xdef1abe32c034e558cdd535791643c58a13acc10 <https://optimistic.etherscan.io/address/0xdef1abe32c034e558cdd535791643c58a13acc10>`__
+    Binance Smart Chain, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://bscscan.com/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
+    Polygon, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://polygonscan.com/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
+    Avalanche, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://snowtrace.io/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
+    Fantom, `0xdef189deaef76e379df891899eb5a00a94cbc250 <https://ftmscan.com/address/0xdef189deaef76e379df891899eb5a00a94cbc250>`__
+    Celo, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://explorer.celo.org/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__

docs/basics/allowances.rst

@@ -2,6 +2,4 @@
 Allowances
 ###############################
 
-Both maker and taker allowance should be be set directly on the `Exchange Proxy contract <./addresses.html#exchange-v4>`_.
-
-For takers, legacy allowances set on the `Allowance Target <./addresses.html#exchange-v4>`_ will continue to work during this transition period but will suffer a gas penalty. It's highly encouraged to migrate allowances over to the Exchange Proxy as soon as possible to avoid interruption.
+Both maker and taker allowance should be be set directly on the `Exchange Proxy contract <./addresses.html#exchange-proxy-addresses>`_.

docs/basics/events.rst

@@ -61,6 +61,18 @@ illustrates how events are emitted when trading through the Exchange Proxy.
 +-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
 | `TransformerMetadata`_        | A general, customizable event emitted that can be emitted by transformers as-needed.                                                                      | FlashWallet         |
 +-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
+| `ERC1155OrderFilled`_         | Emitted when a `V4 ERC1155 Order <./orders.html#erc1155-orders>`_ is filled.                                                                              | ExchangeProxy       |
++-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
+| `ERC721OrderFilled`_          | Emitted when a `V4 ERC721 Order <./orders.html#erc721-orders>`_ is filled.                                                                                | ExchangeProxy       |
++-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
+| `ERC1155OrderCancelled`_      | Emitted when a `V4 ERC1155 Order <./orders.html#erc1155-orders>`_ is cancelled.                                                                           | ExchangeProxy       |
++-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
+| `ERC721OrderCancelled`_       | Emitted when a `V4 ERC721 Order <./orders.html#erc721-orders>`_ is cancelled.                                                                             | ExchangeProxy       |
++-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
+| `ERC1155OrderPreSigned`_      | Emitted when a `V4 ERC1155 Order <./orders.html#erc1155-orders>`_ is signed on-chain.                                                                     | ExchangeProxy       |
++-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
+| `ERC721OrderPreSigned`_       | Emitted when a `V4 ERC721 Order <./orders.html#erc721-orders>`_ is signed on-chain.                                                                       | ExchangeProxy       |
++-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
 
 
 Deployed
@@ -374,6 +386,143 @@ TransformerMetadata
     );
 
 
+ERC721OrderFilled
+-------------------
+
+.. code-block:: solidity
+
+    /// @dev Emitted whenever an `ERC721Order` is filled.
+    /// @param direction Whether the order is selling or
+    ///        buying the ERC721 token.
+    /// @param maker The maker of the order.
+    /// @param taker The taker of the order.
+    /// @param nonce The unique maker nonce in the order.
+    /// @param erc20Token The address of the ERC20 token.
+    /// @param erc20TokenAmount The amount of ERC20 token
+    ///        to sell or buy.
+    /// @param erc721Token The address of the ERC721 token.
+    /// @param erc721TokenId The ID of the ERC721 asset.
+    /// @param matcher If this order was matched with another using `matchERC721Orders()`,
+    ///                this will be the address of the caller. If not, this will be `address(0)`.
+    event ERC721OrderFilled(
+        LibNFTOrder.TradeDirection direction,
+        address maker,
+        address taker,
+        uint256 nonce,
+        IERC20TokenV06 erc20Token,
+        uint256 erc20TokenAmount,
+        IERC721Token erc721Token,
+        uint256 erc721TokenId,
+        address matcher
+    );
+
+ERC721OrderCancelled
+---------------------
+
+.. code-block:: solidity
+
+    /// @dev Emitted whenever an `ERC721Order` is cancelled.
+    /// @param maker The maker of the order.
+    /// @param nonce The nonce of the order that was cancelled.
+    event ERC721OrderCancelled(
+        address maker,
+        uint256 nonce
+    );
+
+ERC721OrderPreSigned
+---------------------
+
+.. code-block:: solidity
+
+
+    /// @dev Emitted when an `ERC721Order` is pre-signed.
+    ///      Contains all the fields of the order.
+    event ERC721OrderPreSigned(
+        LibNFTOrder.TradeDirection direction,
+        address maker,
+        address taker,
+        uint256 expiry,
+        uint256 nonce,
+        IERC20TokenV06 erc20Token,
+        uint256 erc20TokenAmount,
+        LibNFTOrder.Fee[] fees,
+        IERC721Token erc721Token,
+        uint256 erc721TokenId,
+        LibNFTOrder.Property[] erc721TokenProperties
+    );
+
+ERC1155OrderFilled
+-------------------
+
+.. code-block:: solidity
+
+    /// @dev Emitted whenever an `ERC1155Order` is filled.
+    /// @param direction Whether the order is selling or
+    ///        buying the ERC1155 token.
+    /// @param maker The maker of the order.
+    /// @param taker The taker of the order.
+    /// @param nonce The unique maker nonce in the order.
+    /// @param erc20Token The address of the ERC20 token.
+    /// @param erc20FillAmount The amount of ERC20 token filled.
+    /// @param erc1155Token The address of the ERC1155 token.
+    /// @param erc1155TokenId The ID of the ERC1155 asset.
+    /// @param erc1155FillAmount The amount of ERC1155 asset filled.
+    /// @param matcher Currently unused.
+    event ERC1155OrderFilled(
+        LibNFTOrder.TradeDirection direction,
+        address maker,
+        address taker,
+        uint256 nonce,
+        IERC20TokenV06 erc20Token,
+        uint256 erc20FillAmount,
+        IERC1155Token erc1155Token,
+        uint256 erc1155TokenId,
+        uint128 erc1155FillAmount,
+        address matcher
+    );
+
+ERC1155OrderCancelled
+---------------------
+
+.. code-block:: solidity
+
+    /// @dev Emitted whenever an `ERC1155Order` is cancelled.
+    /// @param orderHash The hash the order.
+    /// @param maker The maker of the order.
+    event ERC1155OrderCancelled(
+        bytes32 orderHash,
+        address maker
+    );
+
+ERC1155OrderPreSigned
+---------------------
+
+.. code-block:: solidity
+
+    /// @dev Emitted when an `ERC1155Order` is pre-signed.
+    ///      Contains all the fields of the order.
+    event ERC1155OrderPreSigned(
+        LibNFTOrder.TradeDirection direction,
+        address maker,
+        address taker,
+        uint256 expiry,
+        uint256 nonce,
+        IERC20TokenV06 erc20Token,
+        uint256 erc20TokenAmount,
+        LibNFTOrder.Fee[] fees,
+        IERC1155Token erc1155Token,
+        uint256 erc1155TokenId,
+        LibNFTOrder.Property[] erc1155TokenProperties,
+        uint128 erc1155TokenAmount
+    );
+
+
+
+
+
+
+
+
 
 
 

docs/basics/functions.rst

@@ -67,6 +67,46 @@ Below is a catalog of basic Exchange functionality. For more advanced usage, lik
 | `transferProtocolFeesForPools`_         | Transfers protocol fees from escrow to the 0x Staking System.            |
 |                                         | This should be called near the end of each epoch.                        |
 +-----------------------------------------+--------------------------------------------------------------------------+
+| **NFT Orders**                          | **Overview**                                                             |
++-----------------------------------------+--------------------------------------------------------------------------+
+| `sellERC721`_                           | These are specialised orders for NFT trading                             |
++-----------------------------------------+                                                                          |
+| `buyERC721`_                            |                                                                          |
++-----------------------------------------+                                                                          |
+| `batchBuyERC721s`_                      |                                                                          |
++-----------------------------------------+                                                                          |
+| `matchERC721Orders`_                    |                                                                          |
++-----------------------------------------+                                                                          |
+| `batchMatchERC721Orders`_               |                                                                          |
++-----------------------------------------+                                                                          |
+| `preSignERC721Order`_                   |                                                                          |
++-----------------------------------------+                                                                          |
+| `validateERC721OrderSignature`_         |                                                                          |
++-----------------------------------------+                                                                          |
+| `validateERC721OrderProperties`_        |                                                                          |
++-----------------------------------------+                                                                          |
+| `getERC721OrderStatus`_                 |                                                                          |
++-----------------------------------------+                                                                          |
+| `getERC721OrderHash`_                   |                                                                          |
++-----------------------------------------+                                                                          +
+| `sellERC1155`_                          |                                                                          |
++-----------------------------------------+                                                                          +
+| `buyERC1155`_                           |                                                                          |
++-----------------------------------------+                                                                          +
+| `batchCancelERC1155Orders`_             |                                                                          |
++-----------------------------------------+                                                                          +
+| `batchBuyERC1155s`_                     |                                                                          |
++-----------------------------------------+                                                                          +
+| `preSignERC1155Order`_                  |                                                                          |
++-----------------------------------------+                                                                          +
+| `validateERC1155OrderSignature`_        |                                                                          |
++-----------------------------------------+                                                                          +
+| `validateERC1155OrderProperties`_       |                                                                          |
++-----------------------------------------+                                                                          +
+| `getERC1155OrderInfo`_                  |                                                                          |
++-----------------------------------------+                                                                          +
+| `getERC1155OrderHash`_                  |                                                                          |
++-----------------------------------------+--------------------------------------------------------------------------+
 
 
 Limit Orders
@@ -733,3 +773,490 @@ This function transfers protocol fees from `Fee Collectors <../architecture/fee_
     /// @param poolIds Staking pool IDs
     function transferProtocolFeesForPools(bytes32[] calldata poolIds)
         external;
+
+
+
+NFT Orders
+==========
+
+
+sellERC721
+----------------------------
+
+This function sells an ERC721 token given a buy order.
+
+.. code-block:: solidity
+
+    /// @dev Sells an ERC721 asset to fill the given order.
+    /// @param buyOrder The ERC721 buy order.
+    /// @param signature The order signature from the maker.
+    /// @param erc721TokenId The ID of the ERC721 asset being
+    ///        sold. If the given order specifies properties,
+    ///        the asset must satisfy those properties. Otherwise,
+    ///        it must equal the tokenId in the order.
+    /// @param unwrapNativeToken If this parameter is true and the
+    ///        ERC20 token of the order is e.g. WETH, unwraps the
+    ///        token before transferring it to the taker.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC721OrderCallback` on `msg.sender` after
+    ///        the ERC20 tokens have been transferred to `msg.sender`
+    ///        but before transferring the ERC721 asset to the buyer.
+    function sellERC721(
+        LibNFTOrder.ERC721Order _calldata_ buyOrder,
+        LibSignature.Signature _calldata_ signature,
+        uint256 erc721TokenId,
+        bool unwrapNativeToken,
+        bytes _calldata_ callbackData
+    )
+        _external_;
+
+
+buyERC721
+----------------------------
+
+This function buys an ERC721 token given a sell order.
+
+.. code-block:: solidity
+
+    
+    /// @dev Buys an ERC721 asset by filling the given order.
+    /// @param sellOrder The ERC721 sell order.
+    /// @param signature The order signature.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC721OrderCallback` on `msg.sender` after
+    ///        the ERC721 asset has been transferred to `msg.sender`
+    ///        but before transferring the ERC20 tokens to the seller.
+    ///        Native tokens acquired during the callback can be used
+    ///        to fill the order.
+    function buyERC721(
+        LibNFTOrder.ERC721Order _calldata_ sellOrder,
+        LibSignature.Signature _calldata_ signature,
+        bytes _calldata_ callbackData
+    )
+        _external_
+        _payable_;
+
+
+cancelERC721Order
+----------------------------
+
+This function cancels an ERC721 order using the order `nonce` field.
+
+.. code-block:: solidity
+    
+    /// @dev Cancel a single ERC721 order by its nonce. The caller
+    ///      should be the maker of the order. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonce The order nonce.
+    function cancelERC721Order(uint256 orderNonce)
+        _external_;
+
+
+batchCancelERC721Orders
+----------------------------
+
+This function cancels an number of ERC721 order using the order `nonce` field.
+
+.. code-block:: solidity
+
+    /// @dev Cancel multiple ERC721 orders by their nonces. The caller
+    ///      should be the maker of the orders. Silently succeeds if
+    ///      an order with the same nonce has already been filled or
+    ///      cancelled.
+    /// @param orderNonces The order nonces.
+    function batchCancelERC721Orders(uint256[] _calldata_ orderNonces)
+        _external_;
+
+batchBuyERC721s
+----------------------------
+
+This function buys a number of ERC721's. If you wish the transaction to revert unless ALL NFT's are purchased, set `revertIfIncomplete` to true.
+
+.. code-block:: solidity
+    
+    /// @dev Buys multiple ERC721 assets by filling the
+    ///      given orders.
+    /// @param sellOrders The ERC721 sell orders.
+    /// @param signatures The order signatures.
+    /// @param revertIfIncomplete If true, reverts if this
+    ///        function fails to fill any individual order.
+    /// @return successes An array of booleans corresponding to whether
+    ///         each order in `orders` was successfully filled.
+    function batchBuyERC721s(
+        LibNFTOrder.ERC721Order[] _calldata_ sellOrders,
+        LibSignature.Signature[] _calldata_ signatures,
+        bool revertIfIncomplete
+    )
+        _external_
+        _payable_
+        returns (bool[] _memory_ successes);
+
+matchERC721Orders
+----------------------------
+
+This function matches a buy order and a sell order together. The matcher receives any spread in price.
+
+.. code-block:: solidity
+    
+    /// @dev Matches a pair of complementary orders that have
+    ///      a non-negative spread. Each order is filled at
+    ///      their respective price, and the matcher receives
+    ///      a profit denominated in the ERC20 token.
+    /// @param sellOrder Order selling an ERC721 asset.
+    /// @param buyOrder Order buying an ERC721 asset.
+    /// @param sellOrderSignature Signature for the sell order.
+    /// @param buyOrderSignature Signature for the buy order.
+    /// @return profit The amount of profit earned by the caller
+    ///         of this function (denominated in the ERC20 token
+    ///         of the matched orders).
+    function matchERC721Orders(
+        LibNFTOrder.ERC721Order _calldata_ sellOrder,
+        LibNFTOrder.ERC721Order _calldata_ buyOrder,
+        LibSignature.Signature _calldata_ sellOrderSignature,
+        LibSignature.Signature _calldata_ buyOrderSignature
+    )
+        _external_
+        returns (uint256 profit);
+
+
+batchMatchERC721Orders
+----------------------------
+
+This function matches a buy orders and a sell orders together. The matcher receives any spread in price.
+
+.. code-block:: solidity
+    
+    /// @dev Matches pairs of complementary orders that have
+    ///      non-negative spreads. Each order is filled at
+    ///      their respective price, and the matcher receives
+    ///      a profit denominated in the ERC20 token.
+    /// @param sellOrders Orders selling ERC721 assets.
+    /// @param buyOrders Orders buying ERC721 assets.
+    /// @param sellOrderSignatures Signatures for the sell orders.
+    /// @param buyOrderSignatures Signatures for the buy orders.
+    /// @return profits The amount of profit earned by the caller
+    ///         of this function for each pair of matched orders
+    ///         (denominated in the ERC20 token of the order pair).
+    /// @return successes An array of booleans corresponding to
+    ///         whether each pair of orders was successfully matched.
+    function batchMatchERC721Orders(
+        LibNFTOrder.ERC721Order[] _calldata_ sellOrders,
+        LibNFTOrder.ERC721Order[] _calldata_ buyOrders,
+        LibSignature.Signature[] _calldata_ sellOrderSignatures,
+        LibSignature.Signature[] _calldata_ buyOrderSignatures
+    )
+        _external_
+        returns (uint256[] _memory_ profits, bool[] _memory_ successes);
+    
+    
+preSignERC721Order
+----------------------------
+
+This function pre-signs an order. Useful for contracts that wish to buy or sell an NFT.
+
+.. code-block:: solidity
+
+    /// @dev Approves an ERC721 order on-chain. After pre-signing
+    ///      the order, the `PRESIGNED` signature type will become
+    ///      valid for that order and signer.
+    /// @param order An ERC721 order.
+    function preSignERC721Order(LibNFTOrder.ERC721Order _calldata_ order)
+        _external_;        
+
+validateERC721OrderSignature
+----------------------------
+
+A read function to validate an ERC721 order signature.
+
+.. code-block:: solidity
+
+    /// @dev Checks whether the given signature is valid for the
+    ///      the given ERC721 order. Reverts if not.
+    /// @param order The ERC721 order.
+    /// @param signature The signature to validate.
+    function validateERC721OrderSignature(
+        LibNFTOrder.ERC721Order _calldata_ order,
+        LibSignature.Signature _calldata_ signature
+    )
+        _external_
+        _view_;
+    
+
+validateERC721OrderProperties
+---------------------------------
+
+A read function to validate a property based order with a particular token id.
+
+.. code-block:: solidity
+
+    /// @dev If the given order is buying an ERC721 asset, checks
+    ///      whether or not the given token ID satisfies the required
+    ///      properties specified in the order. If the order does not
+    ///      specify any properties, this function instead checks
+    ///      whether the given token ID matches the ID in the order.
+    ///      Reverts if any checks fail, or if the order is selling
+    ///      an ERC721 asset.
+    /// @param order The ERC721 order.
+    /// @param erc721TokenId The ID of the ERC721 asset.
+    function validateERC721OrderProperties(
+        LibNFTOrder.ERC721Order _calldata_ order,
+        uint256 erc721TokenId
+    )
+        _external_
+        _view_;
+
+
+getERC721OrderStatus
+----------------------------
+
+A read function to return the order status. E.g whether it is filled, cancelled or expired.
+
+.. code-block:: solidity
+    
+    /// @dev Get the current status of an ERC721 order.
+    /// @param order The ERC721 order.
+    /// @return status The status of the order.
+    function getERC721OrderStatus(LibNFTOrder.ERC721Order _calldata_ order)
+        _external_
+        _view_
+        returns (LibNFTOrder.OrderStatus status);
+    
+
+getERC721OrderHash
+----------------------------
+
+A read function to return the uniquie order hash.
+
+.. code-block:: solidity
+
+    /// @dev Get the canonical hash of an ERC721 order.
+    /// @param order The ERC721 order.
+    /// @return orderHash The order hash.
+    function getERC721OrderHash(LibNFTOrder.ERC721Order _calldata_ order)
+        _external_
+        _view_
+        returns (bytes32 orderHash);
+    
+getERC721OrderStatusBitVector
+---------------------------------
+
+.. code-block:: solidity
+
+    /// @dev Get the order status bit vector for the given
+    ///      maker address and nonce range.
+    /// @param maker The maker of the order.
+    /// @param nonceRange Order status bit vectors are indexed
+    ///        by maker address and the upper 248 bits of the
+    ///        order nonce. We define `nonceRange` to be these
+    ///        248 bits.
+    /// @return bitVector The order status bit vector for the
+    ///         given maker and nonce range.
+    function getERC721OrderStatusBitVector(address maker, uint248 nonceRange)
+        _external_
+        _view_
+        returns (uint256 bitVector);
+
+sellERC1155
+----------------------------
+
+Sells an ERC115 token given a buy order. 
+
+.. code-block:: solidity
+
+    /// @dev Sells an ERC1155 asset to fill the given order.
+    /// @param buyOrder The ERC1155 buy order.
+    /// @param signature The order signature from the maker.
+    /// @param erc1155TokenId The ID of the ERC1155 asset being
+    ///        sold. If the given order specifies properties,
+    ///        the asset must satisfy those properties. Otherwise,
+    ///        it must equal the tokenId in the order.
+    /// @param erc1155SellAmount The amount of the ERC1155 asset
+    ///        to sell.
+    /// @param unwrapNativeToken If this parameter is true and the
+    ///        ERC20 token of the order is e.g. WETH, unwraps the
+    ///        token before transferring it to the taker.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC1155OrderCallback` on `msg.sender` after
+    ///        the ERC20 tokens have been transferred to `msg.sender`
+    ///        but before transferring the ERC1155 asset to the buyer.
+    function sellERC1155(
+        LibNFTOrder.ERC1155Order _calldata_ buyOrder,
+        LibSignature.Signature _calldata_ signature,
+        uint256 erc1155TokenId,
+        uint128 erc1155SellAmount,
+        bool unwrapNativeToken,
+        bytes _calldata_ callbackData
+    )
+        _external_;
+    
+
+buyERC1155
+----------------------------
+
+Buys an ERC115 token given a sell order. 
+
+.. code-block:: solidity
+
+    /// @dev Buys an ERC1155 asset by filling the given order.
+    /// @param sellOrder The ERC1155 sell order.
+    /// @param signature The order signature.
+    /// @param erc1155BuyAmount The amount of the ERC1155 asset
+    ///        to buy.
+    /// @param callbackData If this parameter is non-zero, invokes
+    ///        `zeroExERC1155OrderCallback` on `msg.sender` after
+    ///        the ERC1155 asset has been transferred to `msg.sender`
+    ///        but before transferring the ERC20 tokens to the seller.
+    ///        Native tokens acquired during the callback can be used
+    ///        to fill the order.
+    function buyERC1155(
+        LibNFTOrder.ERC1155Order _calldata_ sellOrder,
+        LibSignature.Signature _calldata_ signature,
+        uint128 erc1155BuyAmount,
+        bytes _calldata_ callbackData
+    )
+        _external_
+        _payable_;
+    
+
+cancelERC1155Order
+----------------------------
+
+Cancels an ERC115 order given the order struct. 
+
+.. code-block:: solidity
+
+    /// @dev Cancel a single ERC1155 order. The caller should be the
+    ///      maker of the order. Silently succeeds if the order has
+    ///      already been filled or cancelled.
+    /// @param order The order to cancel.
+    function cancelERC1155Order(LibNFTOrder.ERC1155Order _calldata_ order)
+        _external_;
+
+batchCancelERC1155Orders
+----------------------------
+
+Cancels a number of ERC115 orders. 
+
+.. code-block:: solidity
+
+    /// @dev Cancel multiple ERC1155 orders. The caller should be the
+    ///      maker of the orders. Silently succeeds if an order has
+    ///      already been filled or cancelled.
+    /// @param orders The orders to cancel.
+    function batchCancelERC1155Orders(LibNFTOrder.ERC1155Order[] _calldata_ orders)
+        _external_;
+    
+batchBuyERC1155s
+----------------------------
+
+Buys multiple ERC1155 assets given the sell orders.
+
+.. code-block:: solidity
+
+    /// @dev Buys multiple ERC1155 assets by filling the
+    ///      given orders.
+    /// @param sellOrders The ERC1155 sell orders.
+    /// @param signatures The order signatures.
+    /// @param erc1155TokenAmounts The amounts of the ERC1155 assets
+    ///        to buy for each order.
+    /// @param revertIfIncomplete If true, reverts if this
+    ///        function fails to fill any individual order.
+    /// @return successes An array of booleans corresponding to whether
+    ///         each order in `orders` was successfully filled.
+    function batchBuyERC1155s(
+        LibNFTOrder.ERC1155Order[] _calldata_ sellOrders,
+        LibSignature.Signature[] _calldata_ signatures,
+        uint128[] _calldata_ erc1155TokenAmounts,
+        bool revertIfIncomplete
+    )
+        _external_
+        _payable_
+        returns (bool[] _memory_ successes);
+    
+preSignERC1155Order
+----------------------------
+
+Pre-signs the order on-chain. This is useful for smart contracts.
+
+.. code-block:: solidity
+
+    /// @dev Approves an ERC1155 order on-chain. After pre-signing
+    ///      the order, the `PRESIGNED` signature type will become
+    ///      valid for that order and signer.
+    /// @param order An ERC1155 order.
+    function preSignERC1155Order(LibNFTOrder.ERC1155Order _calldata_ order)
+        _external_;
+
+
+validateERC1155OrderSignature
+---------------------------------
+
+A read function to validate the ERC1155 order signatures.
+
+.. code-block:: solidity
+
+    /// @dev Checks whether the given signature is valid for the
+    ///      the given ERC1155 order. Reverts if not.
+    /// @param order The ERC1155 order.
+    /// @param signature The signature to validate.
+    function validateERC1155OrderSignature(
+        LibNFTOrder.ERC1155Order calldata order,
+        LibSignature.Signature calldata signature
+    )
+        external
+        view;
+
+
+validateERC1155OrderProperties
+---------------------------------
+
+A read function to validate the specific ERC1155 asset against a property based order.
+
+.. code-block:: solidity
+
+    /// @dev If the given order is buying an ERC1155 asset, checks
+    ///      whether or not the given token ID satisfies the required
+    ///      properties specified in the order. If the order does not
+    ///      specify any properties, this function instead checks
+    ///      whether the given token ID matches the ID in the order.
+    ///      Reverts if any checks fail, or if the order is selling
+    ///      an ERC1155 asset.
+    /// @param order The ERC1155 order.
+    /// @param erc1155TokenId The ID of the ERC1155 asset.
+    function validateERC1155OrderProperties(
+        LibNFTOrder.ERC1155Order calldata order,
+        uint256 erc1155TokenId
+    )
+        external
+        view;
+
+getERC1155OrderInfo
+----------------------------
+
+A read function to get the ERC1155 order info. Such as whether it has been cancelled, expired or filled.
+
+.. code-block:: solidity
+
+    /// @dev Get the order info for an ERC1155 order.
+    /// @param order The ERC1155 order.
+    /// @return orderInfo Infor about the order.
+    function getERC1155OrderInfo(LibNFTOrder.ERC1155Order calldata order)
+        external
+        view
+        returns (LibNFTOrder.OrderInfo memory orderInfo);
+
+getERC1155OrderHash
+----------------------------
+
+A read function to calculate the unique order hash.
+
+.. code-block:: solidity
+
+    /// @dev Get the canonical hash of an ERC1155 order.
+    /// @param order The ERC1155 order.
+    /// @return orderHash The order hash.
+    function getERC1155OrderHash(LibNFTOrder.ERC1155Order calldata order)
+        external
+        view
+        returns (bytes32 orderHash);

docs/basics/orders.rst

@@ -89,10 +89,160 @@ The ``RFQOrder`` struct has the following fields:
 +-----------------+-------------+----------------------------------------------------------------------------------------------------------------------------+
 
 
+NFT Orders
+===========
+
+NFT orders in 0x V4 are optimized for this specific use case. They are up to 54% cheaper than alternatives currently on Ethereum.
+Unlike 0x Limit orders, there is a `direction` of the trade, either buy or sell. ERC20's can be exchanged for either ERC721 or ERC1155.
+
+Property based orders can also be created by specifying the properties field in the respective order. 
+
+A number of fees can be embedded in the order.
+
+`NFT Swap SDK <https://docs.swapsdk.xyz/0x-v4>`__ is a friendly library that will help you easily create and consume NFT orders in 0x V4. You can find their `documentation here <https://docs.swapsdk.xyz/0x-v4>`__.
+
+
+ERC721 Orders
+*************
+
+The ``ERC721Order`` struct has the following fields:
+
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| Field                      | Type            | Description                                                                              |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``direction``              | ``enum``        | The trade direction, either sell the NFT or buy the NFT                                  |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``maker``                  | ``address``     | The address of the maker, and signer, of this order. [required]                          |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``taker``                  | ``address``     | Allowed taker address. Set to zero to allow any taker. [optional; default 0]             |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``expiry``                 | ``uint256``     | The Unix timestamp in seconds when this order expires. [required]                        |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``nonce``                  | ``uint256``     | Number used to uniquiely represent this order. Used for cancellations. [required]        |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc20Token``             | ``address``     | The ERC20 token used to pay for the ERC721 token. [required]                             |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc20TokenAmount``       | ``uint256``     | The amount of erc20Token being sold. [required]                                          |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``fees``                   | ``Fees[]``      | An array of structs containing the fee data  [optional]                                  |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc721Token``            | ``address``     | The ERC721 token. [required]                                                             |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc721TokenId``          | ``uint256``     | The ERC721 token id. [required]                                                          |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc721TokenProperties``  | ``Property[]``  | Properties to validate for a property based order. [optional]                            |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+
+ERC1155 Orders
+***************
+
+The ``ERC1155Order`` struct has the following fields:
+
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| Field                      | Type            | Description                                                                              |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``direction``              | ``enum``        | The trade direction, either sell the NFT or buy the NFT                                  |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``maker``                  | ``address``     | The address of the maker, and signer, of this order. [required]                          |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``taker``                  | ``address``     | Allowed taker address. Set to zero to allow any taker. [optional; default 0]             |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``expiry``                 | ``uint256``     | The Unix timestamp in seconds when this order expires. [required]                        |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``nonce``                  | ``uint256``     | Number used to uniquiely represent this order. Used for cancellations. [required]        |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc20Token``             | ``address``     | The ERC20 token used to pay for the ERC721 token. [required]                             |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc20TokenAmount``       | ``uint256``     | The amount of erc20Token being sold. [required]                                          |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``fees``                   | ``Fees[]``      | An array of structs containing the fee data  [optional]                                  |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc1155Token``           | ``address``     | The ERC1155 token. [required]                                                            |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc1155TokenId``         | ``uint256``     | The ERC1155 token id. [required]                                                         |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc1155TokenProperties`` | ``Property[]``  | Properties to validate for a property based order. [optional]                            |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``erc1155TokenAmount``     | ``uin128``      | The ERC1155 amount. [required]                                                           |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+
+NFT Order Property
+******************
+
+For Property based NFT orders, the properties have the following fields:
+
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| Field                      | Type            | Description                                                                              |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``propertyValidator``      | ``address``     | The address of the contract which implements `IPropertyValidator`.                       |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``propertyData``           | ``bytes``       | The address of the maker, and signer, of this order.                                     |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+
+The property validator contract must implement the following interface when Property based orders are used.
+
+.. code-block:: solidity
+
+    /// @dev Checks that the given ERC721/ERC1155 asset satisfies the properties encoded in `propertyData`.
+    ///      Should revert if the asset does not satisfy the specified properties.
+    /// @param tokenAddress The ERC721/ERC1155 token contract address.
+    /// @param tokenId The ERC721/ERC1155 tokenId of the asset to check.
+    /// @param propertyData Encoded properties or auxiliary data needed to perform the check.
+    function validateProperty(
+        address tokenAddress,
+        uint256 tokenId,
+        bytes calldata propertyData
+    )
+        external
+        view;
+
+NFT Order Fee
+**************
+
+For NFT orders with fees, the fees have the following fields:
+
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| Field                      | Type            | Description                                                                              |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``receipient``             | ``address``     | The receipient of the fees.                                                              |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``amount``                 | ``uint256``     | The amount of fee to be paid to recipient.                                               |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+| ``feeData``                | ``bytes``       | If provided the recipient (contract) will be called with this feeData [optional]         |
++----------------------------+-----------------+------------------------------------------------------------------------------------------+
+
+The contract must implement the following interface when the `feeData` is present.
+
+.. code-block:: solidity
+
+    interface IFeeRecipient {
+
+        /// @dev A callback function invoked in the ERC721Feature for each ERC721 
+        ///      order fee that get paid. Integrators can make use of this callback
+        ///      to implement arbitrary fee-handling logic, e.g. splitting the fee 
+        ///      between multiple parties. 
+        /// @param tokenAddress The address of the token in which the received fee is 
+        ///        denominated. `0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE` indicates 
+        ///        that the fee was paid in the native token (e.g. ETH).
+        /// @param amount The amount of the given token received.
+        /// @param feeData Arbitrary data encoded in the `Fee` used by this callback.
+        /// @return success The selector of this function (0x0190805e), 
+        ///         indicating that the callback succeeded.
+        function receiveFeeCallback(
+            address tokenAddress,
+            uint256 amount,
+            bytes calldata feeData
+        )
+            external
+            returns (bytes4 success);
+    }
+
+
+
 How To Sign
 ==============
 
-Both Limit & RFQ orders must be signed by the `maker` or a registered order signer (`registerAllowedOrderSigner <./functions.html#registerallowedrfqorigins>`_). This signature is needed to fill an order, see `Basic Functionality <./functions.html>`_.
+Orders must be signed by the `maker` or a registered order signer (`registerAllowedOrderSigner <./functions.html#registerallowedrfqorigins>`_). This signature is needed to fill an order, see `Basic Functionality <./functions.html>`_.
 
 The protocol accepts signatures defined by the following struct:
 

docs/conf.py

@@ -60,9 +60,9 @@ copyright = u'2016, ZeroEx Inc'
 # built documents.
 #
 # The short X.Y version.
-version = '4.0'
+version = '4.1'
 # The full version, including alpha/beta/rc tags.
-release = '4.0'
+release = '4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/scripts/generate_addresses.py

@@ -12,7 +12,6 @@ sections = [
         "name": "Exchange V4",
         "contracts": [
             'exchangeProxy',
-            'exchangeProxyAllowanceTarget',
             'exchangeProxyFlashWallet',
             'exchangeProxyGovernor',
             'exchangeProxyLiquidityProviderSandbox',
@@ -50,18 +49,43 @@ sections = [
     }
 ]
 
-def printRow(contract, address):
-    etherscanLink = "%s/%s"%("https://etherscan.io/address/", address)
-    print("    %s, `%s <%s>`_"%(contract, address, etherscanLink)) 
+networks = {
+    '1': 'Ethereum',
+    '10': 'Optimism',
+    '56': 'Binance Smart Chain',
+    '137': 'Polygon',
+    '43114': 'Avalanche',
+    '250': 'Fantom',
+    '42220': 'Celo',
+}
 
-def printTable(contracts, addresses):
+etherscanByNetwork = {
+    '1': 'https://etherscan.io/address',
+    '10': 'https://optimistic.etherscan.io/address',
+    '56': 'https://bscscan.com/address',
+    '137': 'https://polygonscan.com/address',
+    '43114': 'https://snowtrace.io/address',
+    '250': 'https://ftmscan.com/address',
+    '42220': 'https://explorer.celo.org/address',
+}
+
+
+def getLinkableAddress(address, network):
+    etherscanLink = "%s/%s"%(etherscanByNetwork[network], address)
+    return "`%s <%s>`__"%(address, etherscanLink)
+
+def printRow(contract, address, network):
+    etherscanLink = "%s/%s"%(etherscanByNetwork[network], address)
+    print("    %s, %s"%(contract, getLinkableAddress(address, network)))
+
+def printTable(contracts, addresses, network):
     print(".. csv-table::\n")
     for contract in contracts:
-        if isinstance(addresses[contract], unicode):
-            printRow(contract, addresses[contract])
+        if isinstance(addresses[contract], str):
+            printRow(contract, addresses[contract], network)
         else:
             for contract,address in addresses[contract].items():
-                printRow(contract, address)
+                printRow(contract, address, network)
                 
 
 print(
@@ -72,6 +96,8 @@ Addresses
 
 .. note::
     This page is auto-generated. See the `contract-addresses <https://github.com/0xProject/protocol/blob/development/packages/contract-addresses/addresses.json>`_ package for an exhaustive list of contracts across all networks.
+
+    The Exchange Proxy may have different addresses on various networks, see the `Exchange Proxy Addresses <./addresses.html#exchange-proxy-addresses>`__ table for an exhaustive list.
 '''
 )
 
@@ -79,6 +105,13 @@ with open('../packages/contract-addresses/addresses.json') as f:
     addresses = json.load(f)
     for section in sections:
         print("%s\n==================="%(section["name"]))
-        printTable(section["contracts"], addresses["1"])
+        printTable(section["contracts"], addresses["1"], "1")
         print("\n\n")
+    print("Exchange Proxy Addresses \n=========================")
+    print("Note: Some addresses have changed across various networks\n")
+    print(".. csv-table::\n")
+    for network in networks:
+        # etherscanLink = "%s/%s"%("https://etherscan.io/address/", address)
+        # print("    %s, `%s <%s>`_"%(contract, address, etherscanLink)) 
+        print("    %s, %s"%(networks[network], getLinkableAddress(addresses[network]["exchangeProxy"], network))) 
 

package.json

@@ -46,7 +46,7 @@
         "test:generate_docs:circleci": "for i in ${npm_package_config_packagesWithDocPages}; do yarn generate_doc --package $i || break -1; done;",
         "bundlewatch": "bundlewatch",
         "lint": "wsrun --fast-exit --parallel --exclude-missing -p $PKG -c lint",
-        "upgrade_org_deps": "node node_modules/@0x/monorepo-scripts/lib/upgrade_deps.js -p '@0x/|ethereum-types'",
+        "upgrade_tools": "node node_modules/@0x/monorepo-scripts/lib/upgrade_deps.js -p '@0x/abi-gen|@0x/assert|@0x/base-contract|@0x/contracts-gen|@0x/dev-utils|@0x/json-schemas|@0x/monorepo-scripts|@0x/sol-compiler|@0x/sol-coverage|@0x/sol-doc|@0x/sol-profiler|@0x/sol-resolver|@0x/sol-trace|@0x/sol-tracing-utils|@0x/subproviders|@0x/tslint-config|@0x/types|@0x/typescript-typings|@0x/utils|@0x/verdaccio|@0x/web3-wrapper|ethereum-types'",
         "upgrade_deps": "node node_modules/@0x/monorepo-scripts/lib/upgrade_deps.js",
         "verdaccio": "docker run --rm -i -p 4873:4873 0xorg/verdaccio"
     },
@@ -60,21 +60,22 @@
         "ignoreDependencyVersionsForPackage": "contract-wrappers"
     },
     "devDependencies": {
-        "@0x/monorepo-scripts": "^3.2.0",
         "@0x-lerna-fork/lerna": "3.16.10",
+        "@0x/monorepo-scripts": "^3.2.4",
         "@0xproject/npm-cli-login": "^0.0.11",
         "async-child-process": "^1.1.1",
         "coveralls": "^3.0.0",
-        "ganache-cli": "6.8.0-istanbul.0",
+        "ganache-cli": "6.12.2",
         "lcov-result-merger": "^3.0.0",
         "lerna": "^3.0.0-beta.25",
         "npm-run-all": "^4.1.2",
         "prettier": "1.19.1",
         "source-map-support": "^0.5.6",
-        "typescript": "4.2.2",
+        "typescript": "4.6.3",
         "wsrun": "^5.2.4"
     },
     "resolutions": {
-        "merkle-patricia-tree": "^2.3.2"
+        "merkle-patricia-tree": "3.0.0",
+        "**/bignumber.js": "^9.0.2"
     }
 }

packages/asset-swapper/CHANGELOG.json

@@ -1,4 +1,407 @@
 [
+    {
+        "version": "16.57.0",
+        "changes": [
+            {
+                "note": "Add BalancerV2 batch swap support",
+                "pr": 462
+            }
+        ],
+        "timestamp": 1650611093
+    },
+    {
+        "version": "16.56.0",
+        "changes": [
+            {
+                "note": "Add estimatedGas to ExtendedQuoteReport",
+                "pr": 463
+            }
+        ],
+        "timestamp": 1650575781
+    },
+    {
+        "version": "16.55.0",
+        "changes": [
+            {
+                "note": "Fix fillRfqOrder VIP being used for swaps that need transformERC20",
+                "pr": 461
+            }
+        ],
+        "timestamp": 1649347667
+    },
+    {
+        "version": "16.54.0",
+        "changes": [
+            {
+                "note": "Add true VIP support for eligible RFQt swaps",
+                "pr": 458
+            }
+        ],
+        "timestamp": 1649215576
+    },
+    {
+        "version": "16.53.0",
+        "changes": [
+            {
+                "note": "Adds support for STG/USDC pool on Curve Mainnet",
+                "pr": 451
+            },
+            {
+                "note": "Use neon-router in asset-swapper tests",
+                "pr": 453
+            },
+            {
+                "note": "Add sampler blocknumber to quote report data",
+                "pr": 448
+            }
+        ],
+        "timestamp": 1648739346
+    },
+    {
+        "version": "16.52.0",
+        "changes": [
+            {
+                "note": "Adds support for mobius money on celo",
+                "pr": 423
+            }
+        ]
+    },
+    {
+        "version": "16.51.0",
+        "changes": [
+            {
+                "note": "Added `Curve` `YFI-ETH` pool",
+                "pr": 444
+            }
+        ],
+        "timestamp": 1646888282
+    },
+    {
+        "version": "16.50.3",
+        "changes": [
+            {
+                "note": "Routing glue optimization",
+                "pr": 439
+            },
+            {
+                "note": "Move VIP source routing into neon-router & disable fallback orders for native/plp",
+                "pr": 440
+            }
+        ],
+        "timestamp": 1646837959
+    },
+    {
+        "version": "16.50.2",
+        "changes": [
+            {
+                "note": "Update `Uniswap_V3` address on `Ropsten`",
+                "pr": 441
+            }
+        ],
+        "timestamp": 1646617024
+    },
+    {
+        "version": "16.50.1",
+        "changes": [
+            {
+                "note": "Add BTRFLY/WETH Curve pool on mainnet",
+                "pr": 437
+            },
+            {
+                "note": "Lower Uniswap V3 Sampler gas allowance",
+                "pr": 438
+            }
+        ],
+        "timestamp": 1646312638
+    },
+    {
+        "version": "16.50.0",
+        "changes": [
+            {
+                "note": "Adding support for Geist on `Fantom`",
+                "pr": 398
+            },
+            {
+                "note": "Improve Uniswap V3 gas schedule",
+                "pr": 424
+            }
+        ],
+        "timestamp": 1646225739
+    },
+    {
+        "version": "16.49.9",
+        "changes": [
+            {
+                "note": "Fix native order scaling & filter out 1 wei quotes",
+                "pr": "430"
+            }
+        ],
+        "timestamp": 1645696356
+    },
+    {
+        "timestamp": 1645569128,
+        "version": "16.49.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "16.49.7",
+        "changes": [
+            {
+                "note": "Fix native order handling for very small quotes and bump `neon-router` dependency",
+                "pr": 425
+            }
+        ],
+        "timestamp": 1645534245
+    },
+    {
+        "version": "16.49.6",
+        "changes": [
+            {
+                "note": "Fixed btrfly routing to include the ohmV2/dai, ohmV2/btfly, and ohmV2/weth pools",
+                "pr": 427
+            }
+        ],
+        "timestamp": 1645113751
+    },
+    {
+        "version": "16.49.5",
+        "changes": [
+            {
+                "note": "Fix scaling 1 base unit to 0, round output to base units",
+                "pr": 422
+            }
+        ],
+        "timestamp": 1644844353
+    },
+    {
+        "version": "16.49.4",
+        "changes": [
+            {
+                "note": "Reverts 'Improve Uniswap V3 gas schedule' due to issue with buys",
+                "pr": 419
+            }
+        ],
+        "timestamp": 1644507275
+    },
+    {
+        "version": "16.49.3",
+        "changes": [
+            {
+                "note": "Fix `slippage` inconsistency when recalculated in exchange proxy quote consumer",
+                "pr": 412
+            },
+            {
+                "note": "Fix incorrect output scaling when input is less than desired amount, update fast-abi",
+                "pr": 401
+            },
+            {
+                "note": "Improve Uniswap V3 gas schedule",
+                "pr": 397
+            },
+            {
+                "note": "Fix add Native as VIP and use Path to compare all sources vs vip only",
+                "pr": 413
+            }
+        ],
+        "timestamp": 1644495123
+    },
+    {
+        "version": "16.49.2",
+        "changes": [
+            {
+                "note": "Fix ABI encoding error with two hop buys due to applying slippage to uint(-1) values",
+                "pr": 410
+            }
+        ],
+        "timestamp": 1643653482
+    },
+    {
+        "version": "16.49.1",
+        "changes": [
+            {
+                "note": "Fix WorstCaseQuoteInfo encoding bug",
+                "pr": 402
+            }
+        ],
+        "timestamp": 1643613597
+    },
+    {
+        "version": "16.49.0",
+        "changes": [
+            {
+                "note": "Add more curve pools",
+                "pr": 409
+            }
+        ],
+        "timestamp": 1643407900
+    },
+    {
+        "version": "16.48.0",
+        "changes": [
+            {
+                "note": "Use `MIM` as an intermediate asset on `Fantom`",
+                "pr": 405
+            }
+        ],
+        "timestamp": 1643148019
+    },
+    {
+        "version": "16.47.0",
+        "changes": [
+            {
+                "note": "Adding support for Synapse on all networks",
+                "pr": 400
+            }
+        ],
+        "timestamp": 1643136662
+    },
+    {
+        "version": "16.46.0",
+        "changes": [
+            {
+                "note": "Enable `Curve` ETH/CVX pool",
+                "pr": 394
+            }
+        ],
+        "timestamp": 1641863395
+    },
+    {
+        "version": "16.45.2",
+        "changes": [
+            {
+                "note": "Handle 0 output samples and negative adjusted rate native orders in routing",
+                "pr": 387
+            }
+        ],
+        "timestamp": 1641827361
+    },
+    {
+        "version": "16.45.1",
+        "changes": [
+            {
+                "note": "Update `Celo` intermediate tokens",
+                "pr": 390
+            }
+        ],
+        "timestamp": 1641359319
+    },
+    {
+        "version": "16.45.0",
+        "changes": [
+            {
+                "note": "Capture router timings",
+                "pr": 388
+            }
+        ],
+        "timestamp": 1641308410
+    },
+    {
+        "version": "16.44.0",
+        "changes": [
+            {
+                "note": "Update neon-router and use router estimated output amount",
+                "pr": 354
+            }
+        ],
+        "timestamp": 1640778328
+    },
+    {
+        "version": "16.43.0",
+        "changes": [
+            {
+                "note": "`UniswapV3` support for `Optimism`",
+                "pr": 385
+            }
+        ],
+        "timestamp": 1640364306
+    },
+    {
+        "version": "16.42.0",
+        "changes": [
+            {
+                "note": "`UniswapV3` support for `Polygon`",
+                "pr": 382
+            },
+            {
+                "note": "Update `Beethoven` Graphql url",
+                "pr": 383
+            }
+        ],
+        "timestamp": 1640124159
+    },
+    {
+        "version": "16.41.0",
+        "changes": [
+            {
+                "note": "Update mcusd contract address, and made celo native asset",
+                "pr": 376
+            }
+        ],
+        "timestamp": 1638827302
+    },
+    {
+        "version": "16.40.0",
+        "changes": [
+            {
+                "note": "Add `AaveV2` and `Compound` deposit/withdrawal liquidity source",
+                "pr": 321
+            }
+        ],
+        "timestamp": 1638390144
+    },
+    {
+        "version": "16.39.0",
+        "changes": [
+            {
+                "note": "Curve ETH/CRV pool",
+                "pr": 378
+            }
+        ]
+    },
+    {
+        "version": "16.38.0",
+        "changes": [
+            {
+                "note": "Capture sampler metrics",
+                "pr": 374
+            }
+        ],
+        "timestamp": 1638228231
+    },
+    {
+        "version": "16.37.0",
+        "changes": [
+            {
+                "note": "Changed Sushiswap router address",
+                "pr": 373
+            }
+        ],
+        "timestamp": 1637349338
+    },
+    {
+        "version": "16.36.0",
+        "changes": [
+            {
+                "note": "Specify liquid routes for FEI/TRIBE FXS/FRAX and OHM/FRAX",
+                "pr": 371
+            }
+        ],
+        "timestamp": 1637290768
+    },
+    {
+        "version": "16.35.0",
+        "changes": [
+            {
+                "note": "Add Beethoven X, MorpheusSwap and JetSwap to Fantom",
+                "pr": 370
+            }
+        ],
+        "timestamp": 1637206290
+    },
     {
         "version": "16.34.0",
         "changes": [

packages/asset-swapper/CHANGELOG.md

@@ -5,6 +5,163 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v16.57.0 - _April 22, 2022_
+
+    * Add BalancerV2 batch swap support (#462)
+
+## v16.56.0 - _April 21, 2022_
+
+    * Add estimatedGas to ExtendedQuoteReport (#463)
+
+## v16.55.0 - _April 7, 2022_
+
+    * Fix fillRfqOrder VIP being used for swaps that need transformERC20 (#461)
+
+## v16.54.0 - _April 6, 2022_
+
+    * Add true VIP support for eligible RFQt swaps (#458)
+
+## v16.53.0 - _March 31, 2022_
+
+    * Adds support for STG/USDC pool on Curve Mainnet (#451)
+    * Use neon-router in asset-swapper tests (#453)
+    * Add sampler blocknumber to quote report data (#448)
+
+## v16.52.0 - _Invalid date_
+
+    * Adds support for mobius money on celo (#423)
+
+## v16.51.0 - _March 10, 2022_
+
+    * Added `Curve` `YFI-ETH` pool (#444)
+
+## v16.50.3 - _March 9, 2022_
+
+    * Routing glue optimization (#439)
+    * Move VIP source routing into neon-router & disable fallback orders for native/plp (#440)
+
+## v16.50.2 - _March 7, 2022_
+
+    * Update `Uniswap_V3` address on `Ropsten` (#441)
+
+## v16.50.1 - _March 3, 2022_
+
+    * Add BTRFLY/WETH Curve pool on mainnet (#437)
+    * Lower Uniswap V3 Sampler gas allowance (#438)
+
+## v16.50.0 - _March 2, 2022_
+
+    * Adding support for Geist on `Fantom` (#398)
+    * Improve Uniswap V3 gas schedule (#424)
+
+## v16.49.9 - _February 24, 2022_
+
+    * Fix native order scaling & filter out 1 wei quotes (#430)
+
+## v16.49.8 - _February 22, 2022_
+
+    * Dependencies updated
+
+## v16.49.7 - _February 22, 2022_
+
+    * Fix native order handling for very small quotes and bump `neon-router` dependency (#425)
+
+## v16.49.6 - _February 17, 2022_
+
+    * Fixed btrfly routing to include the ohmV2/dai, ohmV2/btfly, and ohmV2/weth pools (#427)
+
+## v16.49.5 - _February 14, 2022_
+
+    * Fix scaling 1 base unit to 0, round output to base units (#422)
+
+## v16.49.4 - _February 10, 2022_
+
+    * Reverts 'Improve Uniswap V3 gas schedule' due to issue with buys (#419)
+
+## v16.49.3 - _February 10, 2022_
+
+    * Fix `slippage` inconsistency when recalculated in exchange proxy quote consumer (#412)
+    * Fix incorrect output scaling when input is less than desired amount, update fast-abi (#401)
+    * Improve Uniswap V3 gas schedule (#397)
+    * Fix add Native as VIP and use Path to compare all sources vs vip only (#413)
+
+## v16.49.2 - _January 31, 2022_
+
+    * Fix ABI encoding error with two hop buys due to applying slippage to uint(-1) values (#410)
+
+## v16.49.1 - _January 31, 2022_
+
+    * Fix WorstCaseQuoteInfo encoding bug (#402)
+
+## v16.49.0 - _January 28, 2022_
+
+    * Add more curve pools (#409)
+
+## v16.48.0 - _January 25, 2022_
+
+    * Use `MIM` as an intermediate asset on `Fantom` (#405)
+
+## v16.47.0 - _January 25, 2022_
+
+    * Adding support for Synapse on all networks (#400)
+
+## v16.46.0 - _January 11, 2022_
+
+    * Enable `Curve` ETH/CVX pool (#394)
+
+## v16.45.2 - _January 10, 2022_
+
+    * Handle 0 output samples and negative adjusted rate native orders in routing (#387)
+
+## v16.45.1 - _January 5, 2022_
+
+    * Update `Celo` intermediate tokens (#390)
+
+## v16.45.0 - _January 4, 2022_
+
+    * Capture router timings (#388)
+
+## v16.44.0 - _December 29, 2021_
+
+    * Update neon-router and use router estimated output amount (#354)
+
+## v16.43.0 - _December 24, 2021_
+
+    * `UniswapV3` support for `Optimism` (#385)
+
+## v16.42.0 - _December 21, 2021_
+
+    * `UniswapV3` support for `Polygon` (#382)
+    * Update `Beethoven` Graphql url (#383)
+
+## v16.41.0 - _December 6, 2021_
+
+    * Update mcusd contract address, and made celo native asset (#376)
+
+## v16.40.0 - _December 1, 2021_
+
+    * Add `AaveV2` and `Compound` deposit/withdrawal liquidity source (#321)
+
+## v16.39.0 - _Invalid date_
+
+    * Curve ETH/CRV pool (#378)
+
+## v16.38.0 - _November 29, 2021_
+
+    * Capture sampler metrics (#374)
+
+## v16.37.0 - _November 19, 2021_
+
+    * Changed Sushiswap router address (#373)
+
+## v16.36.0 - _November 19, 2021_
+
+    * Specify liquid routes for FEI/TRIBE FXS/FRAX and OHM/FRAX (#371)
+
+## v16.35.0 - _November 18, 2021_
+
+    * Add Beethoven X, MorpheusSwap and JetSwap to Fantom (#370)
+
 ## v16.34.0 - _November 16, 2021_
 
     * Add support Celo (#367)

packages/asset-swapper/compiler.json

@@ -6,7 +6,7 @@
     "shouldSaveStandardInput": true,
     "compilerSettings": {
         "evmVersion": "istanbul",
-        "optimizer": { "enabled": true, "runs": 200, "details": { "yul": true, "deduplicate": true } },
+        "optimizer": { "enabled": true, "runs": 200, "details": { "yul": false, "deduplicate": true } },
         "outputSelection": {
             "*": {
                 "*": [

packages/asset-swapper/contracts/src/BalancerV2BatchSampler.sol

@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "./interfaces/IBalancerV2Vault.sol";
+import "./BalancerV2Common.sol";
+
+contract BalancerV2BatchSampler is BalancerV2Common {
+
+    // Replaces amount for first step with each takerTokenAmount and calls queryBatchSwap using supplied steps
+    /// @dev Sample sell quotes from Balancer V2 supporting multihops.
+    /// @param swapSteps Array of swap steps (can be >= 1).
+    /// @param swapAssets Array of token address for swaps.
+    /// @param takerTokenAmounts Taker token sell amount for each sample.
+    function sampleMultihopSellsFromBalancerV2(
+        IBalancerV2Vault vault,
+        IBalancerV2Vault.BatchSwapStep[] memory swapSteps,
+        address[] memory swapAssets,
+        uint256[] memory takerTokenAmounts
+    )
+        public
+        returns (uint256[] memory makerTokenAmounts)
+    {
+        uint256 numSamples = takerTokenAmounts.length;
+        makerTokenAmounts = new uint256[](numSamples);
+        IBalancerV2Vault.FundManagement memory swapFunds =
+            _createSwapFunds();
+
+        for (uint256 i = 0; i < numSamples; i++) {
+            swapSteps[0].amount = takerTokenAmounts[i];
+            try
+                // For sells we specify the takerToken which is what the vault will receive from the trade
+                vault.queryBatchSwap(IBalancerV2Vault.SwapKind.GIVEN_IN, swapSteps, swapAssets, swapFunds)
+            // amounts represent pool balance deltas from the swap (incoming balance, outgoing balance)
+            returns (int256[] memory amounts) {
+                // Outgoing balance is negative so we need to flip the sign
+                // Note - queryBatchSwap will return a delta for each token in the assets array and last asset should be tokenOut
+                int256 amountOutFromPool = amounts[amounts.length - 1] * -1;
+                if (amountOutFromPool <= 0) {
+                    break;
+                }
+                makerTokenAmounts[i] = uint256(amountOutFromPool);
+            } catch {
+                // Swallow failures, leaving all results as zero.
+                break;
+            }
+        }
+    }
+
+    // Replaces amount for first step with each makerTokenAmount and calls queryBatchSwap using supplied steps
+    /// @dev Sample buy quotes from Balancer V2 supporting multihops.
+    /// @param swapSteps Array of swap steps (can be >= 1).
+    /// @param swapAssets Array of token address for swaps.
+    /// @param makerTokenAmounts Maker token buy amount for each sample.
+    function sampleMultihopBuysFromBalancerV2(
+        IBalancerV2Vault vault,
+        IBalancerV2Vault.BatchSwapStep[] memory swapSteps,
+        address[] memory swapAssets,
+        uint256[] memory makerTokenAmounts
+    )
+        public
+        returns (uint256[] memory takerTokenAmounts)
+    {
+        uint256 numSamples = makerTokenAmounts.length;
+        takerTokenAmounts = new uint256[](numSamples);
+        IBalancerV2Vault.FundManagement memory swapFunds =
+            _createSwapFunds();
+
+        for (uint256 i = 0; i < numSamples; i++) {
+            swapSteps[0].amount = makerTokenAmounts[i];
+            try
+                // Uses GIVEN_OUT type for Buy
+                vault.queryBatchSwap(IBalancerV2Vault.SwapKind.GIVEN_OUT, swapSteps, swapAssets, swapFunds)
+            // amounts represent pool balance deltas from the swap (incoming balance, outgoing balance)
+            returns (int256[] memory amounts) {
+                int256 amountIntoPool = amounts[0];
+                if (amountIntoPool <= 0) {
+                    break;
+                }
+                takerTokenAmounts[i] = uint256(amountIntoPool);
+            } catch {
+                // Swallow failures, leaving all results as zero.
+                break;
+            }
+        }
+    }
+}

packages/asset-swapper/contracts/src/BalancerV2Common.sol

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "./interfaces/IBalancerV2Vault.sol";
+
+
+contract BalancerV2Common {
+
+    function _createSwapFunds()
+        internal
+        view
+        returns (IBalancerV2Vault.FundManagement memory)
+    {
+        return
+            IBalancerV2Vault.FundManagement({
+                sender: address(this),
+                fromInternalBalance: false,
+                recipient: payable(address(this)),
+                toInternalBalance: false
+            });
+    }
+}

packages/asset-swapper/contracts/src/BalancerV2Sampler.sol

@@ -21,44 +21,11 @@ pragma solidity ^0.6;
 pragma experimental ABIEncoderV2;
 
 import "./SamplerUtils.sol";
+import "./interfaces/IBalancerV2Vault.sol";
+import "./BalancerV2Common.sol";
 
-/// @dev Minimal Balancer V2 Vault interface
-///      for documentation refer to https://github.com/balancer-labs/balancer-core-v2/blob/master/contracts/vault/interfaces/IVault.sol
-interface IBalancerV2Vault {
-    enum SwapKind { GIVEN_IN, GIVEN_OUT }
 
-    struct BatchSwapStep {
-        bytes32 poolId;
-        uint256 assetInIndex;
-        uint256 assetOutIndex;
-        uint256 amount;
-        bytes userData;
-    }
-
-    struct FundManagement {
-        address sender;
-        bool fromInternalBalance;
-        address payable recipient;
-        bool toInternalBalance;
-    }
-
-    function queryBatchSwap(
-        SwapKind kind,
-        BatchSwapStep[] calldata swaps,
-        IAsset[] calldata assets,
-        FundManagement calldata funds
-    ) external returns (int256[] memory assetDeltas);
-}
-interface IAsset {
-    // solhint-disable-previous-line no-empty-blocks
-}
-
-contract BalancerV2Sampler is SamplerUtils {
-
-    struct BalancerV2PoolInfo {
-        bytes32 poolId;
-        address vault;
-    }
+contract BalancerV2Sampler is SamplerUtils, BalancerV2Common {
 
     /// @dev Sample sell quotes from Balancer V2.
     /// @param poolInfo Struct with pool related data
@@ -68,7 +35,7 @@ contract BalancerV2Sampler is SamplerUtils {
     /// @return makerTokenAmounts Maker amounts bought at each taker token
     ///         amount.
     function sampleSellsFromBalancerV2(
-        BalancerV2PoolInfo memory poolInfo,
+        IBalancerV2Vault.BalancerV2PoolInfo memory poolInfo,
         address takerToken,
         address makerToken,
         uint256[] memory takerTokenAmounts
@@ -78,9 +45,9 @@ contract BalancerV2Sampler is SamplerUtils {
     {
         _assertValidPair(makerToken, takerToken);
         IBalancerV2Vault vault = IBalancerV2Vault(poolInfo.vault);
-        IAsset[] memory swapAssets = new IAsset[](2);
-        swapAssets[0] = IAsset(takerToken);
-        swapAssets[1] = IAsset(makerToken);
+        address[] memory swapAssets = new address[](2);
+        swapAssets[0] = takerToken;
+        swapAssets[1] = makerToken;
 
         uint256 numSamples = takerTokenAmounts.length;
         makerTokenAmounts = new uint256[](numSamples);
@@ -97,7 +64,7 @@ contract BalancerV2Sampler is SamplerUtils {
             // amounts represent pool balance deltas from the swap (incoming balance, outgoing balance)
             returns (int256[] memory amounts) {
                 // Outgoing balance is negative so we need to flip the sign
-                int256 amountOutFromPool = amounts[1] * -1;
+                int256 amountOutFromPool = amounts[amounts.length - 1] * -1;
                 if (amountOutFromPool <= 0) {
                     break;
                 }
@@ -117,7 +84,7 @@ contract BalancerV2Sampler is SamplerUtils {
     /// @return takerTokenAmounts Taker amounts sold at each maker token
     ///         amount.
     function sampleBuysFromBalancerV2(
-        BalancerV2PoolInfo memory poolInfo,
+        IBalancerV2Vault.BalancerV2PoolInfo memory poolInfo,
         address takerToken,
         address makerToken,
         uint256[] memory makerTokenAmounts
@@ -127,9 +94,9 @@ contract BalancerV2Sampler is SamplerUtils {
     {
         _assertValidPair(makerToken, takerToken);
         IBalancerV2Vault vault = IBalancerV2Vault(poolInfo.vault);
-        IAsset[] memory swapAssets = new IAsset[](2);
-        swapAssets[0] = IAsset(takerToken);
-        swapAssets[1] = IAsset(makerToken);
+        address[] memory swapAssets = new address[](2);
+        swapAssets[0] = takerToken;
+        swapAssets[1] = makerToken;
 
         uint256 numSamples = makerTokenAmounts.length;
         takerTokenAmounts = new uint256[](numSamples);
@@ -157,7 +124,7 @@ contract BalancerV2Sampler is SamplerUtils {
     }
 
     function _createSwapSteps(
-        BalancerV2PoolInfo memory poolInfo,
+        IBalancerV2Vault.BalancerV2PoolInfo memory poolInfo,
         uint256 amount
     ) private pure returns (IBalancerV2Vault.BatchSwapStep[] memory) {
         IBalancerV2Vault.BatchSwapStep[] memory swapSteps =
@@ -172,18 +139,4 @@ contract BalancerV2Sampler is SamplerUtils {
 
         return swapSteps;
     }
-
-    function _createSwapFunds()
-        private
-        view
-        returns (IBalancerV2Vault.FundManagement memory)
-    {
-        return
-            IBalancerV2Vault.FundManagement({
-                sender: address(this),
-                fromInternalBalance: false,
-                recipient: payable(address(this)),
-                toInternalBalance: false
-            });
-    }
 }

packages/asset-swapper/contracts/src/BancorSampler.sol

@@ -22,9 +22,8 @@ pragma experimental ABIEncoderV2;
 
 import "./interfaces/IBancor.sol";
 
-contract CompilerHack {}
 
-contract BancorSampler is CompilerHack {
+contract BancorSampler {
 
     /// @dev Base gas limit for Bancor calls.
     uint256 constant private BANCOR_CALL_GAS = 300e3; // 300k

packages/asset-swapper/contracts/src/CompoundSampler.sol

@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+import "./SamplerUtils.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+
+// Minimal CToken interface
+interface ICToken {
+    function mint(uint mintAmount) external returns (uint);
+    function redeem(uint redeemTokens) external returns (uint);
+    function redeemUnderlying(uint redeemAmount) external returns (uint);
+    function exchangeRateStored() external view returns (uint);
+    function decimals() external view returns (uint8);
+}
+
+contract CompoundSampler is SamplerUtils {
+    uint256 constant private EXCHANGE_RATE_SCALE = 1e10;
+
+    function sampleSellsFromCompound(
+        ICToken cToken,
+        IERC20TokenV06 takerToken,
+        IERC20TokenV06 makerToken,
+        uint256[] memory takerTokenAmounts
+    )
+        public
+        view
+        returns (uint256[] memory makerTokenAmounts)
+    {
+        uint256 numSamples = takerTokenAmounts.length;
+        makerTokenAmounts = new uint256[](numSamples);
+        // Exchange rate is scaled by 1 * 10^(18 - 8 + Underlying Token Decimals
+        uint256 exchangeRate = cToken.exchangeRateStored();
+        uint256 cTokenDecimals = uint256(cToken.decimals());
+
+        if (address(makerToken) == address(cToken)) {
+            // mint
+            for (uint256 i = 0; i < numSamples; i++) {
+                makerTokenAmounts[i] = (takerTokenAmounts[i] * EXCHANGE_RATE_SCALE * 10 ** cTokenDecimals) / exchangeRate;
+            }
+
+        } else if (address(takerToken) == address(cToken)) {
+            // redeem
+            for (uint256 i = 0; i < numSamples; i++) {
+                makerTokenAmounts[i] = (takerTokenAmounts[i] * exchangeRate) / (EXCHANGE_RATE_SCALE * 10 ** cTokenDecimals);
+            }
+        }
+    }
+
+    function sampleBuysFromCompound(
+        ICToken cToken,
+        IERC20TokenV06 takerToken,
+        IERC20TokenV06 makerToken,
+        uint256[] memory makerTokenAmounts
+    )
+        public
+        view
+        returns (uint256[] memory takerTokenAmounts)
+    {
+        uint256 numSamples = makerTokenAmounts.length;
+        takerTokenAmounts = new uint256[](numSamples);
+        // Exchange rate is scaled by 1 * 10^(18 - 8 + Underlying Token Decimals
+        uint256 exchangeRate = cToken.exchangeRateStored();
+        uint256 cTokenDecimals = uint256(cToken.decimals());
+
+        if (address(makerToken) == address(cToken)) {
+            // mint
+            for (uint256 i = 0; i < numSamples; i++) {
+                takerTokenAmounts[i] = makerTokenAmounts[i] * exchangeRate / (EXCHANGE_RATE_SCALE * 10 ** cTokenDecimals);
+            }
+        } else if (address(takerToken) == address(cToken)) {
+            // redeem
+            for (uint256 i = 0; i < numSamples; i++) {
+                takerTokenAmounts[i] = (makerTokenAmounts[i] * EXCHANGE_RATE_SCALE * 10 ** cTokenDecimals)/exchangeRate;
+            }
+        }
+    }
+}

packages/asset-swapper/contracts/src/ERC20BridgeSampler.sol

@@ -22,7 +22,9 @@ pragma experimental ABIEncoderV2;
 
 import "./BalancerSampler.sol";
 import "./BalancerV2Sampler.sol";
+import "./BalancerV2BatchSampler.sol";
 import "./BancorSampler.sol";
+import "./CompoundSampler.sol";
 import "./CurveSampler.sol";
 import "./DODOSampler.sol";
 import "./DODOV2Sampler.sol";
@@ -31,7 +33,6 @@ import "./KyberDmmSampler.sol";
 import "./LidoSampler.sol";
 import "./LiquidityProviderSampler.sol";
 import "./MakerPSMSampler.sol";
-import "./MultiBridgeSampler.sol";
 import "./MStableSampler.sol";
 import "./MooniswapSampler.sol";
 import "./NativeOrderSampler.sol";
@@ -47,7 +48,9 @@ import "./UtilitySampler.sol";
 contract ERC20BridgeSampler is
     BalancerSampler,
     BalancerV2Sampler,
+    BalancerV2BatchSampler,
     BancorSampler,
+    CompoundSampler,
     CurveSampler,
     DODOSampler,
     DODOV2Sampler,
@@ -58,7 +61,6 @@ contract ERC20BridgeSampler is
     MakerPSMSampler,
     MStableSampler,
     MooniswapSampler,
-    MultiBridgeSampler,
     NativeOrderSampler,
     ShellSampler,
     SmoothySampler,
@@ -90,4 +92,6 @@ contract ERC20BridgeSampler is
             (callResults[i].success, callResults[i].data) = address(this).call(callDatas[i]);
         }
     }
+
+    receive() external payable {}
 }

packages/asset-swapper/contracts/src/MultiBridgeSampler.sol

@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6;
-pragma experimental ABIEncoderV2;
-
-import "./interfaces/IMultiBridge.sol";
-
-
-contract MultiBridgeSampler {
-
-    /// @dev Default gas limit for multibridge calls.
-    uint256 constant private DEFAULT_CALL_GAS = 400e3; // 400k
-
-    /// @dev Sample sell quotes from MultiBridge.
-    /// @param multibridge Address of the MultiBridge contract.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param intermediateToken The address of the intermediate token to
-    ///        use in an indirect route.
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromMultiBridge(
-        address multibridge,
-        address takerToken,
-        address intermediateToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    )
-        public
-        view
-        returns (uint256[] memory makerTokenAmounts)
-    {
-        // Initialize array of maker token amounts.
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-
-        // If no address provided, return all zeros.
-        if (multibridge == address(0)) {
-            return makerTokenAmounts;
-        }
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            (bool didSucceed, bytes memory resultData) =
-                multibridge.staticcall.gas(DEFAULT_CALL_GAS)(
-                    abi.encodeWithSelector(
-                        IMultiBridge(0).getSellQuote.selector,
-                        takerToken,
-                        intermediateToken,
-                        makerToken,
-                        takerTokenAmounts[i]
-                    ));
-            uint256 buyAmount = 0;
-            if (didSucceed) {
-                buyAmount = abi.decode(resultData, (uint256));
-            }
-            // Exit early if the amount is too high for the source to serve
-            if (buyAmount == 0) {
-                break;
-            }
-
-            makerTokenAmounts[i] = buyAmount;
-        }
-    }
-}

packages/asset-swapper/contracts/src/UniswapV3Sampler.sol

@@ -22,17 +22,43 @@ pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
 
-interface IUniswapV3Quoter {
+interface IUniswapV3QuoterV2 {
     function factory()
         external
         view
         returns (IUniswapV3Factory factory);
+
+    // @notice Returns the amount out received for a given exact input swap without executing the swap
+    // @param path The path of the swap, i.e. each token pair and the pool fee
+    // @param amountIn The amount of the first token to swap
+    // @return amountOut The amount of the last token that would be received
+    // @return sqrtPriceX96AfterList List of the sqrt price after the swap for each pool in the path
+    // @return initializedTicksCrossedList List of the initialized ticks that the swap crossed for each pool in the path
+    // @return gasEstimate The estimate of the gas that the swap consumes
     function quoteExactInput(bytes memory path, uint256 amountIn)
         external
-        returns (uint256 amountOut);
+        returns (
+            uint256 amountOut,
+            uint160[] memory sqrtPriceX96AfterList,
+            uint32[] memory initializedTicksCrossedList,
+            uint256 gasEstimate
+        );
+
+    // @notice Returns the amount in required for a given exact output swap without executing the swap
+    // @param path The path of the swap, i.e. each token pair and the pool fee. Path must be provided in reverse order
+    // @param amountOut The amount of the last token to receive
+    // @return amountIn The amount of first token required to be paid
+    // @return sqrtPriceX96AfterList List of the sqrt price after the swap for each pool in the path
+    // @return initializedTicksCrossedList List of the initialized ticks that the swap crossed for each pool in the path
+    // @return gasEstimate The estimate of the gas that the swap consumes
     function quoteExactOutput(bytes memory path, uint256 amountOut)
         external
-        returns (uint256 amountIn);
+        returns (
+            uint256 amountIn,
+            uint160[] memory sqrtPriceX96AfterList,
+            uint32[] memory initializedTicksCrossedList,
+            uint256 gasEstimate
+        );
 }
 
 interface IUniswapV3Factory {
@@ -51,23 +77,25 @@ interface IUniswapV3Pool {
 contract UniswapV3Sampler
 {
     /// @dev Gas limit for UniswapV3 calls. This is 100% a guess.
-    uint256 constant private QUOTE_GAS = 300e3;
+    uint256 constant private QUOTE_GAS = 700e3;
 
     /// @dev Sample sell quotes from UniswapV3.
     /// @param quoter UniswapV3 Quoter contract.
     /// @param path Token route. Should be takerToken -> makerToken
     /// @param takerTokenAmounts Taker token sell amount for each sample.
     /// @return uniswapPaths The encoded uniswap path for each sample.
+    /// @return uniswapGasUsed Estimated amount of gas used
     /// @return makerTokenAmounts Maker amounts bought at each taker token
     ///         amount.
     function sampleSellsFromUniswapV3(
-        IUniswapV3Quoter quoter,
+        IUniswapV3QuoterV2 quoter,
         IERC20TokenV06[] memory path,
         uint256[] memory takerTokenAmounts
     )
         public
         returns (
             bytes[] memory uniswapPaths,
+            uint256[] memory uniswapGasUsed,
             uint256[] memory makerTokenAmounts
         )
     {
@@ -76,31 +104,39 @@ contract UniswapV3Sampler
 
         makerTokenAmounts = new uint256[](takerTokenAmounts.length);
         uniswapPaths = new bytes[](takerTokenAmounts.length);
+        uniswapGasUsed = new uint256[](takerTokenAmounts.length);
 
         for (uint256 i = 0; i < takerTokenAmounts.length; ++i) {
             // Pick the best result from all the paths.
-            bytes memory topUniswapPath;
             uint256 topBuyAmount = 0;
             for (uint256 j = 0; j < poolPaths.length; ++j) {
                 bytes memory uniswapPath = _toUniswapPath(path, poolPaths[j]);
-                try
-                    quoter.quoteExactInput
-                        { gas: QUOTE_GAS }
-                        (uniswapPath, takerTokenAmounts[i])
-                        returns (uint256 buyAmount)
+                try quoter.quoteExactInput
+                    { gas: QUOTE_GAS }
+                    (uniswapPath, takerTokenAmounts[i])
+                    returns (
+                        uint256 buyAmount,
+                        uint160[] memory, /* sqrtPriceX96AfterList */
+                        uint32[] memory, /* initializedTicksCrossedList */
+                        uint256 gasUsed
+                    )
                 {
                     if (topBuyAmount <= buyAmount) {
                         topBuyAmount = buyAmount;
-                        topUniswapPath = uniswapPath;
+                        uniswapPaths[i] = uniswapPath;
+                        uniswapGasUsed[i] = gasUsed;
                     }
-                } catch { }
+                } catch {}
             }
-            // Break early if we can't complete the buys.
+            // Break early if we can't complete the sells.
             if (topBuyAmount == 0) {
+                // HACK(kimpers): To avoid too many local variables, paths and gas used is set directly in the loop
+                // then reset if no valid valid quote was found
+                uniswapPaths[i] = "";
+                uniswapGasUsed[i] = 0;
                 break;
             }
             makerTokenAmounts[i] = topBuyAmount;
-            uniswapPaths[i] = topUniswapPath;
         }
     }
 
@@ -109,16 +145,18 @@ contract UniswapV3Sampler
     /// @param path Token route. Should be takerToken -> makerToken.
     /// @param makerTokenAmounts Maker token buy amount for each sample.
     /// @return uniswapPaths The encoded uniswap path for each sample.
+    /// @return uniswapGasUsed Estimated amount of gas used
     /// @return takerTokenAmounts Taker amounts sold at each maker token
     ///         amount.
     function sampleBuysFromUniswapV3(
-        IUniswapV3Quoter quoter,
+        IUniswapV3QuoterV2 quoter,
         IERC20TokenV06[] memory path,
         uint256[] memory makerTokenAmounts
     )
         public
         returns (
             bytes[] memory uniswapPaths,
+            uint256[] memory uniswapGasUsed,
             uint256[] memory takerTokenAmounts
         )
     {
@@ -128,10 +166,10 @@ contract UniswapV3Sampler
 
         takerTokenAmounts = new uint256[](makerTokenAmounts.length);
         uniswapPaths = new bytes[](makerTokenAmounts.length);
+        uniswapGasUsed = new uint256[](makerTokenAmounts.length);
 
         for (uint256 i = 0; i < makerTokenAmounts.length; ++i) {
             // Pick the best result from all the paths.
-            bytes memory topUniswapPath;
             uint256 topSellAmount = 0;
             for (uint256 j = 0; j < poolPaths.length; ++j) {
                 // quoter requires path to be reversed for buys.
@@ -143,21 +181,30 @@ contract UniswapV3Sampler
                     quoter.quoteExactOutput
                         { gas: QUOTE_GAS }
                         (uniswapPath, makerTokenAmounts[i])
-                        returns (uint256 sellAmount)
+                        returns (
+                            uint256 sellAmount,
+                            uint160[] memory, /* sqrtPriceX96AfterList */
+                            uint32[] memory, /* initializedTicksCrossedList */
+                            uint256 gasUsed
+                        )
                 {
                     if (topSellAmount == 0 || topSellAmount >= sellAmount) {
                         topSellAmount = sellAmount;
                         // But the output path should still be encoded for sells.
-                        topUniswapPath = _toUniswapPath(path, poolPaths[j]);
+                        uniswapPaths[i] = _toUniswapPath(path, poolPaths[j]);
+                        uniswapGasUsed[i] = gasUsed;
                     }
                 } catch {}
             }
             // Break early if we can't complete the buys.
             if (topSellAmount == 0) {
+                // HACK(kimpers): To avoid too many local variables, paths and gas used is set directly in the loop
+                // then reset if no valid valid quote was found
+                uniswapPaths[i] = "";
+                uniswapGasUsed[i] = 0;
                 break;
             }
             takerTokenAmounts[i] = topSellAmount;
-            uniswapPaths[i] = topUniswapPath;
         }
     }
 
@@ -236,6 +283,7 @@ contract UniswapV3Sampler
 
     function _reverseTokenPath(IERC20TokenV06[] memory tokenPath)
         private
+        pure
         returns (IERC20TokenV06[] memory reversed)
     {
         reversed = new IERC20TokenV06[](tokenPath.length);
@@ -246,6 +294,7 @@ contract UniswapV3Sampler
 
     function _reversePoolPath(IUniswapV3Pool[] memory poolPath)
         private
+        pure
         returns (IUniswapV3Pool[] memory reversed)
     {
         reversed = new IUniswapV3Pool[](poolPath.length);

packages/asset-swapper/contracts/src/UtilitySampler.sol

@@ -77,4 +77,19 @@ contract UtilitySampler {
         assembly { size := extcodesize(account) }
         return size > 0;
     }
+
+    function getGasLeft()
+        public
+        returns (uint256)
+    {
+        return gasleft();
+    }
+
+    function getBlockNumber()
+        public
+        view
+        returns (uint256)
+    {
+        return block.number;
+    }
 }

packages/asset-swapper/contracts/src/interfaces/IBalancerV2Vault.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6;
+pragma experimental ABIEncoderV2;
+
+/// @dev Minimal Balancer V2 Vault interface
+///      for documentation refer to https://github.com/balancer-labs/balancer-core-v2/blob/master/contracts/vault/interfaces/IVault.sol
+interface IBalancerV2Vault {
+    enum SwapKind { GIVEN_IN, GIVEN_OUT }
+
+    struct BatchSwapStep {
+        bytes32 poolId;
+        uint256 assetInIndex;
+        uint256 assetOutIndex;
+        uint256 amount;
+        bytes userData;
+    }
+
+    struct FundManagement {
+        address sender;
+        bool fromInternalBalance;
+        address payable recipient;
+        bool toInternalBalance;
+    }
+
+    struct BalancerV2PoolInfo {
+        bytes32 poolId;
+        address vault;
+    }
+
+    function queryBatchSwap(
+        SwapKind kind,
+        BatchSwapStep[] calldata swaps,
+        address[] calldata assets,
+        FundManagement calldata funds
+    ) external returns (int256[] memory assetDeltas);
+}

packages/asset-swapper/contracts/test/DummyLiquidityProvider.sol

@@ -1,39 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.6;
-pragma experimental ABIEncoderV2;
-
-
-contract DummyLiquidityProvider
-{
-    /// @dev Quotes the amount of `makerToken` that would be obtained by
-    ///      selling `sellAmount` of `takerToken`.
-    /// @param sellAmount Amount of `takerToken` to sell.
-    /// @return makerTokenAmount Amount of `makerToken` that would be obtained.
-    function getSellQuote(
-        address, /* takerToken */
-        address, /* makerToken */
-        uint256 sellAmount
-    )
-        external
-        view
-        returns (uint256 makerTokenAmount)
-    {
-        makerTokenAmount = sellAmount - 1;
-    }
-
-    /// @dev Quotes the amount of `takerToken` that would need to be sold in
-    ///      order to obtain `buyAmount` of `makerToken`.
-    /// @param buyAmount Amount of `makerToken` to buy.
-    /// @return takerTokenAmount Amount of `takerToken` that would need to be sold.
-    function getBuyQuote(
-        address, /* takerToken */
-        address, /* makerToken */
-        uint256 buyAmount
-    )
-        external
-        view
-        returns (uint256 takerTokenAmount)
-    {
-        takerTokenAmount = buyAmount + 1;
-    }
-}

packages/asset-swapper/contracts/test/TestERC20BridgeSampler.sol

@@ -1,455 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-pragma solidity ^0.6;
-pragma experimental ABIEncoderV2;
-
-import "../src/ERC20BridgeSampler.sol";
-import "../src/interfaces/IKyberNetwork.sol";
-import "../src/interfaces/IUniswapV2Router01.sol";
-
-
-library LibDeterministicQuotes {
-
-    address private constant WETH_ADDRESS = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
-    uint256 private constant RATE_DENOMINATOR = 1 ether;
-    uint256 private constant MIN_RATE = RATE_DENOMINATOR / 100;
-    uint256 private constant MAX_RATE = 100 * RATE_DENOMINATOR;
-    uint8 private constant MIN_DECIMALS = 4;
-    uint8 private constant MAX_DECIMALS = 20;
-
-    function getDeterministicSellQuote(
-        bytes32 salt,
-        address sellToken,
-        address buyToken,
-        uint256 sellAmount
-    )
-        internal
-        pure
-        returns (uint256 buyAmount)
-    {
-        uint256 sellBase = uint256(10) ** getDeterministicTokenDecimals(sellToken);
-        uint256 buyBase = uint256(10) ** getDeterministicTokenDecimals(buyToken);
-        uint256 rate = getDeterministicRate(salt, sellToken, buyToken);
-        return sellAmount * rate * buyBase / sellBase / RATE_DENOMINATOR;
-    }
-
-    function getDeterministicBuyQuote(
-        bytes32 salt,
-        address sellToken,
-        address buyToken,
-        uint256 buyAmount
-    )
-        internal
-        pure
-        returns (uint256 sellAmount)
-    {
-        uint256 sellBase = uint256(10) ** getDeterministicTokenDecimals(sellToken);
-        uint256 buyBase = uint256(10) ** getDeterministicTokenDecimals(buyToken);
-        uint256 rate = getDeterministicRate(salt, sellToken, buyToken);
-        return buyAmount * RATE_DENOMINATOR * sellBase / rate / buyBase;
-    }
-
-    function getDeterministicTokenDecimals(address token)
-        internal
-        pure
-        returns (uint8 decimals)
-    {
-        if (token == WETH_ADDRESS) {
-            return 18;
-        }
-        bytes32 seed = keccak256(abi.encodePacked(token));
-        return uint8(uint256(seed) % (MAX_DECIMALS - MIN_DECIMALS)) + MIN_DECIMALS;
-    }
-
-    function getDeterministicRate(bytes32 salt, address sellToken, address buyToken)
-        internal
-        pure
-        returns (uint256 rate)
-    {
-        bytes32 seed = keccak256(abi.encodePacked(salt, sellToken, buyToken));
-        return uint256(seed) % (MAX_RATE - MIN_RATE) + MIN_RATE;
-    }
-}
-
-contract TestDeploymentConstants {
-
-    // solhint-disable separate-by-one-line-in-contract
-
-    // Mainnet addresses ///////////////////////////////////////////////////////
-    /// @dev Mainnet address of the WETH contract.
-    address constant private WETH_ADDRESS = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
-
-    /// @dev Overridable way to get the WETH address.
-    /// @return wethAddress The WETH address.
-    function _getWethAddress()
-        internal
-        view
-        returns (address wethAddress)
-    {
-        return WETH_ADDRESS;
-    }
-
-}
-
-contract FailTrigger {
-
-    // Give this address a balance to force operations to fail.
-    address payable constant public FAILURE_ADDRESS = 0xe9dB8717BC5DFB20aaf538b4a5a02B7791FF430C;
-
-    // Funds `FAILURE_ADDRESS`.
-    function enableFailTrigger() external payable {
-        FAILURE_ADDRESS.transfer(msg.value);
-    }
-
-    function _revertIfShouldFail() internal view {
-        if (FAILURE_ADDRESS.balance != 0) {
-            revert("FAIL_TRIGGERED");
-        }
-    }
-}
-
-
-contract TestERC20BridgeSamplerUniswapExchange is
-    IUniswapExchangeQuotes,
-    TestDeploymentConstants,
-    FailTrigger
-{
-    bytes32 constant private BASE_SALT = 0x1d6a6a0506b0b4a554b907a4c29d9f4674e461989d9c1921feb17b26716385ab;
-
-    address public tokenAddress;
-    bytes32 public salt;
-
-    constructor(address _tokenAddress) public {
-        tokenAddress = _tokenAddress;
-        salt = keccak256(abi.encodePacked(BASE_SALT, _tokenAddress));
-    }
-
-    // Deterministic `IUniswapExchangeQuotes.getEthToTokenInputPrice()`.
-    function getEthToTokenInputPrice(
-        uint256 ethSold
-    )
-        override
-        external
-        view
-        returns (uint256 tokensBought)
-    {
-        _revertIfShouldFail();
-        return LibDeterministicQuotes.getDeterministicSellQuote(
-            salt,
-            tokenAddress,
-            _getWethAddress(),
-            ethSold
-        );
-    }
-
-    // Deterministic `IUniswapExchangeQuotes.getEthToTokenOutputPrice()`.
-    function getEthToTokenOutputPrice(
-        uint256 tokensBought
-    )
-        override
-        external
-        view
-        returns (uint256 ethSold)
-    {
-        _revertIfShouldFail();
-        return LibDeterministicQuotes.getDeterministicBuyQuote(
-            salt,
-            _getWethAddress(),
-            tokenAddress,
-            tokensBought
-        );
-    }
-
-    // Deterministic `IUniswapExchangeQuotes.getTokenToEthInputPrice()`.
-    function getTokenToEthInputPrice(
-        uint256 tokensSold
-    )
-        override
-        external
-        view
-        returns (uint256 ethBought)
-    {
-        _revertIfShouldFail();
-        return LibDeterministicQuotes.getDeterministicSellQuote(
-            salt,
-            tokenAddress,
-            _getWethAddress(),
-            tokensSold
-        );
-    }
-
-    // Deterministic `IUniswapExchangeQuotes.getTokenToEthOutputPrice()`.
-    function getTokenToEthOutputPrice(
-        uint256 ethBought
-    )
-        override
-        external
-        view
-        returns (uint256 tokensSold)
-    {
-        _revertIfShouldFail();
-        return LibDeterministicQuotes.getDeterministicBuyQuote(
-            salt,
-            _getWethAddress(),
-            tokenAddress,
-            ethBought
-        );
-    }
-}
-
-
-contract TestERC20BridgeSamplerUniswapV2Router01 is
-    IUniswapV2Router01,
-    TestDeploymentConstants,
-    FailTrigger
-{
-    bytes32 constant private SALT = 0xadc7fcb33c735913b8635927e66896b356a53a912ab2ceff929e60a04b53b3c1;
-
-    // Deterministic `IUniswapV2Router01.getAmountsOut()`.
-    function getAmountsOut(uint256 amountIn, address[] calldata path)
-        override
-        external
-        view
-        returns (uint256[] memory amounts)
-    {
-        require(path.length >= 2, "PATH_TOO_SHORT");
-        _revertIfShouldFail();
-        amounts = new uint256[](path.length);
-        amounts[0] = amountIn;
-        for (uint256 i = 0; i < path.length - 1; ++i) {
-            amounts[i + 1] = LibDeterministicQuotes.getDeterministicSellQuote(
-                SALT,
-                path[i],
-                path[i + 1],
-                amounts[i]
-            );
-        }
-    }
-
-    // Deterministic `IUniswapV2Router01.getAmountsInt()`.
-    function getAmountsIn(uint256 amountOut, address[] calldata path)
-        override
-        external
-        view
-        returns (uint256[] memory amounts)
-    {
-        require(path.length >= 2, "PATH_TOO_SHORT");
-        _revertIfShouldFail();
-        amounts = new uint256[](path.length);
-        amounts[path.length - 1] = amountOut;
-        for (uint256 i = path.length - 1; i > 0; --i) {
-            amounts[i - 1] = LibDeterministicQuotes.getDeterministicBuyQuote(
-                SALT,
-                path[i - 1],
-                path[i],
-                amounts[i]
-            );
-        }
-    }
-}
-
-
-// solhint-disable space-after-comma
-contract TestERC20BridgeSamplerKyberNetwork is
-    TestDeploymentConstants,
-    FailTrigger
-{
-    bytes32 constant private SALT = 0x0ff3ca9d46195c39f9a12afb74207b4970349fb3cfb1e459bbf170298d326bc7;
-    address constant public ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-
-    enum TradeType {BestOfAll, MaskIn, MaskOut, Split}
-    enum ProcessWithRate {NotRequired, Required}
-
-    // IKyberHintHandler
-    function buildTokenToEthHint(
-        address tokenSrc,
-        TradeType /* tokenToEthType */,
-        bytes32[] calldata /* tokenToEthReserveIds */,
-        uint256[] calldata /* tokenToEthSplits */
-    ) external view returns (bytes memory hint)
-    {
-        return abi.encode(tokenSrc);
-    }
-
-    function buildEthToTokenHint(
-        address tokenDest,
-        TradeType /* ethToTokenType */,
-        bytes32[] calldata /* ethToTokenReserveIds */,
-        uint256[] calldata /* ethToTokenSplits */
-    ) external view returns (bytes memory hint)
-    {
-        return abi.encode(tokenDest);
-    }
-
-    // IKyberHintHandler
-    function buildTokenToTokenHint(
-        address tokenSrc,
-        TradeType /* tokenToEthType */,
-        bytes32[] calldata /* tokenToEthReserveIds */,
-        uint256[] calldata /* tokenToEthSplits */,
-        address /* tokenDest  */,
-        TradeType /* EthToTokenType */,
-        bytes32[] calldata /* EthToTokenReserveIds */,
-        uint256[] calldata /* EthToTokenSplits */
-    ) external view returns (bytes memory hint)
-    {
-        return abi.encode(tokenSrc);
-    }
-
-    // IKyberHintHandler
-    function getTradingReserves(
-        address tokenSrc,
-        address tokenDest,
-        bool isTokenToToken,
-        bytes calldata hint
-    )
-        external
-        view
-        returns (
-            bytes32[] memory reserveIds,
-            uint256[] memory splitValuesBps,
-            ProcessWithRate processWithRate
-        )
-    {
-        reserveIds = new bytes32[](1);
-        reserveIds[0] = bytes32(uint256(1));
-        splitValuesBps = new uint256[](0);
-        processWithRate = ProcessWithRate.NotRequired;
-    }
-
-    // Deterministic `IKyberNetworkProxy.getExpectedRateAfterFee()`.
-    function getExpectedRateAfterFee(
-        address fromToken,
-        address toToken,
-        uint256 /* srcQty */,
-        uint256 /* fee */,
-        bytes calldata /* hint */
-    )
-        external
-        view
-        returns
-        (uint256 expectedRate)
-    {
-        _revertIfShouldFail();
-        fromToken = fromToken == ETH_ADDRESS ? _getWethAddress() : fromToken;
-        toToken = toToken == ETH_ADDRESS ? _getWethAddress() : toToken;
-        expectedRate = LibDeterministicQuotes.getDeterministicRate(
-            SALT,
-            fromToken,
-            toToken
-        );
-    }
-
-    // Deterministic `IKyberNetworkProxy.getExpectedRate()`.
-    function getExpectedRate(
-        address fromToken,
-        address toToken,
-        uint256
-    )
-        external
-        view
-        returns (uint256 expectedRate, uint256)
-    {
-        _revertIfShouldFail();
-        fromToken = fromToken == ETH_ADDRESS ? _getWethAddress() : fromToken;
-        toToken = toToken == ETH_ADDRESS ? _getWethAddress() : toToken;
-        expectedRate = LibDeterministicQuotes.getDeterministicRate(
-            SALT,
-            fromToken,
-            toToken
-        );
-    }
-}
-
-
-contract TestERC20BridgeSamplerUniswapExchangeFactory is
-    IUniswapExchangeFactory
-{
-    mapping (address => IUniswapExchangeQuotes) private _exchangesByToken;
-
-    // Creates Uniswap exchange contracts for tokens.
-    function createTokenExchanges(address[] calldata tokenAddresses)
-        external
-    {
-        for (uint256 i = 0; i < tokenAddresses.length; i++) {
-            address tokenAddress = tokenAddresses[i];
-            _exchangesByToken[tokenAddress] =
-                new TestERC20BridgeSamplerUniswapExchange(tokenAddress);
-        }
-    }
-
-    // `IUniswapExchangeFactory.getExchange()`.
-    function getExchange(address tokenAddress)
-        override
-        external
-        view
-        returns (address)
-    {
-        return address(_exchangesByToken[tokenAddress]);
-    }
-}
-
-
-contract TestERC20BridgeSampler is
-    ERC20BridgeSampler,
-    FailTrigger
-{
-    TestERC20BridgeSamplerUniswapExchangeFactory public uniswap;
-    TestERC20BridgeSamplerUniswapV2Router01 public uniswapV2Router;
-    TestERC20BridgeSamplerKyberNetwork public kyber;
-
-    uint8 private constant MAX_ORDER_STATUS = uint8(IExchange.OrderStatus.CANCELLED) + 1;
-
-    constructor() public ERC20BridgeSampler() {
-        uniswap = new TestERC20BridgeSamplerUniswapExchangeFactory();
-        uniswapV2Router = new TestERC20BridgeSamplerUniswapV2Router01();
-        kyber = new TestERC20BridgeSamplerKyberNetwork();
-    }
-
-    // Creates Uniswap exchange contracts for tokens.
-    function createTokenExchanges(address[] calldata tokenAddresses)
-        external
-    {
-        uniswap.createTokenExchanges(tokenAddresses);
-    }
-
-    // Overridden to return deterministic states.
-    function getLimitOrderFillableTakerAmount(
-        IExchange.LimitOrder memory order,
-        IExchange.Signature memory,
-        IExchange
-    )
-        override
-        public
-        view
-        returns (uint256 fillableTakerAmount)
-    {
-        return uint256(keccak256(abi.encode(order.salt))) % order.takerAmount;
-    }
-
-    // Overriden to return deterministic decimals.
-    function _getTokenDecimals(address tokenAddress)
-        override
-        internal
-        view
-        returns (uint8 decimals)
-    {
-        return LibDeterministicQuotes.getDeterministicTokenDecimals(tokenAddress);
-    }
-}