Revert "update contract fqt in contract-addresses (#604 )"

This reverts commit f347f4392c.
2022-10-21 15:03:11 -04:00
28 changed files with 32 additions and 259 deletions
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,22 +1,4 @@
 [
-    {
-        "timestamp": 1666645023,
-        "version": "3.3.49",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1666381417,
-        "version": "3.3.48",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "timestamp": 1665670315,
        "version": "3.3.47",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,14 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v3.3.49 - _October 24, 2022_
-
-    * Dependencies updated
-
-## v3.3.48 - _October 21, 2022_
-
-    * Dependencies updated
-
 ## v3.3.47 - _October 13, 2022_

    * Dependencies updated
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "3.3.49",
+    "version": "3.3.47",
    "engines": {
        "node": ">=6.12"
    },
@@ -52,8 +52,8 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.1",
        "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.39",
-        "@0x/contracts-utils": "^4.8.30",
+        "@0x/contracts-test-utils": "^5.4.37",
+        "@0x/contracts-utils": "^4.8.28",
        "@0x/dev-utils": "^5.0.0",
        "@0x/sol-compiler": "^4.8.2",
        "@0x/ts-doc-gen": "^0.0.28",
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,22 +1,4 @@
 [
-    {
-        "timestamp": 1666645023,
-        "version": "5.4.39",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1666381417,
-        "version": "5.4.38",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "timestamp": 1665531940,
        "version": "5.4.37",
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,14 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v5.4.39 - _October 24, 2022_
-
-    * Dependencies updated
-
-## v5.4.38 - _October 21, 2022_
-
-    * Dependencies updated
-
 ## v5.4.37 - _October 11, 2022_

    * Dependencies updated
--- a/contracts/test-utils/package.json
+++ b/contracts/test-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-test-utils",
-    "version": "5.4.39",
+    "version": "5.4.37",
    "engines": {
        "node": ">=6.12"
    },
@@ -46,7 +46,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.35",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^7.1.0",
+        "@0x/contract-addresses": "^6.25.0",
        "@0x/dev-utils": "^5.0.0",
        "@0x/json-schemas": "^6.4.4",
        "@0x/order-utils": "^10.4.28",
--- a/contracts/treasury/CHANGELOG.json
+++ b/contracts/treasury/CHANGELOG.json
@@ -1,22 +1,4 @@
 [
-    {
-        "timestamp": 1666645023,
-        "version": "1.4.32",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1666381417,
-        "version": "1.4.31",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "timestamp": 1665670315,
        "version": "1.4.30",
--- a/contracts/treasury/CHANGELOG.md
+++ b/contracts/treasury/CHANGELOG.md
@@ -5,14 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v1.4.32 - _October 24, 2022_
-
-    * Dependencies updated
-
-## v1.4.31 - _October 21, 2022_
-
-    * Dependencies updated
-
 ## v1.4.30 - _October 13, 2022_

    * Dependencies updated
--- a/contracts/treasury/package.json
+++ b/contracts/treasury/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-treasury",
-    "version": "1.4.32",
+    "version": "1.4.30",
    "engines": {
        "node": ">=6.12"
    },
@@ -46,12 +46,12 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.1",
-        "@0x/contract-addresses": "^7.1.0",
+        "@0x/contract-addresses": "^6.25.0",
        "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.49",
+        "@0x/contracts-erc20": "^3.3.47",
        "@0x/contracts-gen": "^2.0.48",
        "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.39",
+        "@0x/contracts-test-utils": "^5.4.37",
        "@0x/sol-compiler": "^4.8.2",
        "@0x/ts-doc-gen": "^0.0.28",
        "@types/isomorphic-fetch": "^0.0.35",
@@ -73,7 +73,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.16.16",
+        "@0x/protocol-utils": "^11.16.14",
        "@0x/subproviders": "^7.0.0",
        "@0x/types": "^3.3.6",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,22 +1,4 @@
 [
-    {
-        "timestamp": 1666645023,
-        "version": "4.8.30",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1666381417,
-        "version": "4.8.29",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "timestamp": 1665670315,
        "version": "4.8.28",
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,14 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v4.8.30 - _October 24, 2022_
-
-    * Dependencies updated
-
-## v4.8.29 - _October 21, 2022_
-
-    * Dependencies updated
-
 ## v4.8.28 - _October 13, 2022_

    * Dependencies updated
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.8.30",
+    "version": "4.8.28",
    "engines": {
        "node": ">=6.12"
    },
@@ -51,7 +51,7 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.1",
        "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.39",
+        "@0x/contracts-test-utils": "^5.4.37",
        "@0x/dev-utils": "^5.0.0",
        "@0x/order-utils": "^10.4.28",
        "@0x/sol-compiler": "^4.8.2",
--- a/contracts/zero-ex/CHANGELOG.json
+++ b/contracts/zero-ex/CHANGELOG.json
@@ -1,22 +1,4 @@
 [
-    {
-        "timestamp": 1666645023,
-        "version": "0.37.9",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1666381417,
-        "version": "0.37.8",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "timestamp": 1665670315,
        "version": "0.37.7",
--- a/contracts/zero-ex/CHANGELOG.md
+++ b/contracts/zero-ex/CHANGELOG.md
@@ -5,14 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v0.37.9 - _October 24, 2022_
-
-    * Dependencies updated
-
-## v0.37.8 - _October 21, 2022_
-
-    * Dependencies updated
-
 ## v0.37.7 - _October 13, 2022_

    * Dependencies updated
--- a/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol
@@ -24,7 +24,6 @@ import "./AbstractBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
 import "./mixins/MixinAaveV2.sol";
 import "./mixins/MixinBalancerV2.sol";
-import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
 import "./mixins/MixinNerve.sol";
@@ -36,7 +35,6 @@ contract FantomBridgeAdapter is
    AbstractBridgeAdapter(250, "Fantom"),
    MixinAaveV2,
    MixinBalancerV2,
-    MixinBalancerV2Batch,
    MixinCurve,
    MixinCurveV2,
    MixinNerve,
@@ -74,11 +72,6 @@ contract FantomBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeBalancerV2Batch(sellAmount, order.bridgeData);
        } else if (protocolId == BridgeProtocols.NERVE) {
            if (dryRun) {
                return (0, true);
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.37.9",
+    "version": "0.37.7",
    "engines": {
        "node": ">=6.12"
    },
@@ -56,10 +56,10 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.1",
-        "@0x/contract-addresses": "^7.1.0",
-        "@0x/contracts-erc20": "^3.3.49",
+        "@0x/contract-addresses": "^6.25.0",
+        "@0x/contracts-erc20": "^3.3.47",
        "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.39",
+        "@0x/contracts-test-utils": "^5.4.37",
        "@0x/dev-utils": "^5.0.0",
        "@0x/order-utils": "^10.4.28",
        "@0x/sol-compiler": "^4.8.2",
@@ -86,7 +86,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.16.16",
+        "@0x/protocol-utils": "^11.16.14",
        "@0x/subproviders": "^7.0.0",
        "@0x/types": "^3.3.6",
        "@0x/typescript-typings": "^5.3.1",
--- a/packages/asset-swapper/package.json
+++ b/packages/asset-swapper/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/asset-swapper",
-    "version": "16.66.16",
+    "version": "16.66.14",
    "private": true,
    "engines": {
        "node": ">=6.12"
@@ -33,15 +33,15 @@
    "dependencies": {
        "@0x/assert": "^3.0.35",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^7.1.0",
-        "@0x/contract-wrappers": "^13.22.8",
-        "@0x/contracts-erc20": "^3.3.49",
-        "@0x/contracts-zero-ex": "^0.37.9",
+        "@0x/contract-addresses": "^6.25.0",
+        "@0x/contract-wrappers": "^13.22.6",
+        "@0x/contracts-erc20": "^3.3.47",
+        "@0x/contracts-zero-ex": "^0.37.7",
        "@0x/dev-utils": "^5.0.0",
        "@0x/fast-abi": "^0.0.5",
        "@0x/json-schemas": "^6.4.4",
        "@0x/neon-router": "^0.3.5",
-        "@0x/protocol-utils": "^11.16.16",
+        "@0x/protocol-utils": "^11.16.14",
        "@0x/quote-server": "^8.0.0",
        "@0x/types": "^3.3.6",
        "@0x/utils": "^7.0.0",
@@ -66,7 +66,7 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.1",
        "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.39",
+        "@0x/contracts-test-utils": "^5.4.37",
        "@0x/sol-compiler": "^4.8.2",
        "@0x/subproviders": "^7.0.0",
        "@0x/ts-doc-gen": "^0.0.28",
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,28 +1,4 @@
 [
-    {
-        "version": "7.1.0",
-        "changes": [
-            {
-                "note": "Add `BalancerV2Batch` support in `FantomBridgeAdapter`",
-                "pr": 607
-            }
-        ],
-        "timestamp": 1666645023
-    },
-    {
-        "version": "7.0.0",
-        "changes": [
-            {
-                "note": "Updated Ethereum FQT to enable RFQT V2",
-                "pr": 604
-            },
-            {
-                "note": "updated changelog",
-                "pr": 605
-            }
-        ],
-        "timestamp": 1666381417
-    },
    {
        "version": "6.25.0",
        "changes": [
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -5,15 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v7.1.0 - _October 24, 2022_
-
-    * Add `BalancerV2Batch` support in `FantomBridgeAdapter` (#607)
-
-## v7.0.0 - _October 21, 2022_
-
-    * Updated Ethereum FQT to enable RFQT V2 (#604)
-    * updated changelog (#605)
-
 ## v6.25.0 - _October 11, 2022_

    * Remove Ropsten and Rinkeby addresses (#597)
--- a/packages/contract-addresses/addresses.json
+++ b/packages/contract-addresses/addresses.json
@@ -18,7 +18,7 @@
            "wethTransformer": "0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7",
            "payTakerTransformer": "0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e",
            "affiliateFeeTransformer": "0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f",
-            "fillQuoteTransformer": "0xd8e10b0689d0b2f28136777635caa4abd2bb9f04",
+            "fillQuoteTransformer": "0xd75a9019a2a1782ea670e4f4a55f04b43514ed53",
            "positiveSlippageFeeTransformer": "0xa9416ce1dbde8d331210c07b5c253d94ee4cc3fd"
        }
    },
@@ -202,7 +202,7 @@
            "wethTransformer": "0x9b6aa8f26a92108e7d1f66373d757bb955112703",
            "payTakerTransformer": "0x32df54951d33d7460e15fa59b1fcc262183ce4c2",
            "affiliateFeeTransformer": "0x67efa679a4b56c38713d478e649c88247f4f8e88",
-            "fillQuoteTransformer": "0x3a1e9825c9966daab30db241a7ee51a8dd7ad74f",
+            "fillQuoteTransformer": "0xe40f81ef6e9c95ba04c659b8d032eab73152aafd",
            "positiveSlippageFeeTransformer": "0xe87d69b285005cc82b53b844322652c49ed64600"
        }
    },
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-addresses",
-    "version": "7.1.0",
+    "version": "6.25.0",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,22 +1,4 @@
 [
-    {
-        "timestamp": 1666645023,
-        "version": "13.22.8",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1666381417,
-        "version": "13.22.7",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "timestamp": 1665531940,
        "version": "13.22.6",
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -5,14 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v13.22.8 - _October 24, 2022_
-
-    * Dependencies updated
-
-## v13.22.7 - _October 21, 2022_
-
-    * Dependencies updated
-
 ## v13.22.6 - _October 11, 2022_

    * Dependencies updated
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-wrappers",
-    "version": "13.22.8",
+    "version": "13.22.6",
    "engines": {
        "node": ">=6.12"
    },
@@ -59,7 +59,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.35",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^7.1.0",
+        "@0x/contract-addresses": "^6.25.0",
        "@0x/json-schemas": "^6.4.4",
        "@0x/types": "^3.3.6",
        "@0x/utils": "^7.0.0",
--- a/packages/protocol-utils/CHANGELOG.json
+++ b/packages/protocol-utils/CHANGELOG.json
@@ -1,22 +1,4 @@
 [
-    {
-        "timestamp": 1666645023,
-        "version": "11.16.16",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1666381417,
-        "version": "11.16.15",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "version": "11.16.14",
        "changes": [
--- a/packages/protocol-utils/CHANGELOG.md
+++ b/packages/protocol-utils/CHANGELOG.md
@@ -5,14 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v11.16.16 - _October 24, 2022_
-
-    * Dependencies updated
-
-## v11.16.15 - _October 21, 2022_
-
-    * Dependencies updated
-
 ## v11.16.14 - _October 13, 2022_

    * Fix FQT Otc encoding logic (#596)
--- a/packages/protocol-utils/package.json
+++ b/packages/protocol-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/protocol-utils",
-    "version": "11.16.16",
+    "version": "11.16.14",
    "engines": {
        "node": ">=6.12"
    },
@@ -65,8 +65,8 @@
    },
    "dependencies": {
        "@0x/assert": "^3.0.35",
-        "@0x/contract-addresses": "^7.1.0",
-        "@0x/contract-wrappers": "^13.22.8",
+        "@0x/contract-addresses": "^6.25.0",
+        "@0x/contract-wrappers": "^13.22.6",
        "@0x/json-schemas": "^6.4.4",
        "@0x/subproviders": "^7.0.0",
        "@0x/utils": "^7.0.0",
--- a/yarn.lock
+++ b/yarn.lock
@@ -773,11 +773,6 @@
    js-sha3 "^0.7.0"
    uuid "^3.3.2"

-"@0x/contract-addresses@^6.12.1", "@0x/contract-addresses@^6.6.0":
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/@0x/contract-addresses/-/contract-addresses-6.25.0.tgz#bb0d138d40924244482336153317f0e8a5d42b0a"
-  integrity sha512-0Kr2sMupS2wNqWLvWg8fnBdOHWwLKjhsIlazUBkDpQWyNOO/eI/bwoxwMOmxf0hVSmSL5/Vn1bulltLBdKIWww==
-
 "@0x/contracts-asset-proxy@^3.7.19":
  version "3.7.19"
  resolved "https://registry.yarnpkg.com/@0x/contracts-asset-proxy/-/contracts-asset-proxy-3.7.19.tgz#ee621a233f4d77b439c74c5b8d70db2e1ed001c4"