Publish

- @0x/contracts-erc20@3.3.47 - @0x/contracts-treasury@1.4.30 - @0x/contracts-utils@4.8.28 - @0x/contracts-zero-ex@0.37.7 - @0x/asset-swapper@16.66.14 - @0x/protocol-utils@11.16.14
Updated CHANGELOGS & MD docs
2022-10-13 14:12:06 +00:00 · 2022-10-13 14:12:02 +00:00 · 2022-10-12 17:36:25 -07:00 · 2022-10-12 17:10:16 -04:00
22 changed files with 113 additions and 29 deletions
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1665670315,
+        "version": "3.3.47",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1665531940,
        "version": "3.3.46",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v3.3.47 - _October 13, 2022_
+
+    * Dependencies updated
+
 ## v3.3.46 - _October 11, 2022_

    * Dependencies updated
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "3.3.46",
+    "version": "3.3.47",
    "engines": {
        "node": ">=6.12"
    },
@@ -51,9 +51,9 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.1",
-        "@0x/contracts-gen": "^2.0.47",
+        "@0x/contracts-gen": "^2.0.48",
        "@0x/contracts-test-utils": "^5.4.37",
-        "@0x/contracts-utils": "^4.8.27",
+        "@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/erc20/src/artifacts.ts
+++ b/contracts/erc20/src/artifacts.ts
@@ -15,7 +15,7 @@ export const artifacts = {
    DummyERC20Token: DummyERC20Token as ContractArtifact,
    ERC20Token: ERC20Token as ContractArtifact,
    WETH9: WETH9 as ContractArtifact,
-    ZRXToken: (ZRXToken as any) as ContractArtifact,
+    ZRXToken: ZRXToken as any as ContractArtifact,
    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
    DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
 };
--- a/contracts/erc20/test/artifacts.ts
+++ b/contracts/erc20/test/artifacts.ts
@@ -28,7 +28,7 @@ export const artifacts = {
    MintableERC20Token: MintableERC20Token as ContractArtifact,
    UnlimitedAllowanceERC20Token: UnlimitedAllowanceERC20Token as ContractArtifact,
    WETH9: WETH9 as ContractArtifact,
-    ZRXToken: (ZRXToken as any) as ContractArtifact,
+    ZRXToken: ZRXToken as any as ContractArtifact,
    IERC20Token: IERC20Token as ContractArtifact,
    IEtherToken: IEtherToken as ContractArtifact,
    IERC20TokenV06: IERC20TokenV06 as ContractArtifact,
--- a/contracts/treasury/CHANGELOG.json
+++ b/contracts/treasury/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1665670315,
+        "version": "1.4.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1665531940,
        "version": "1.4.29",
--- a/contracts/treasury/CHANGELOG.md
+++ b/contracts/treasury/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v1.4.30 - _October 13, 2022_
+
+    * Dependencies updated
+
 ## v1.4.29 - _October 11, 2022_

    * Dependencies updated
--- a/contracts/treasury/package.json
+++ b/contracts/treasury/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-treasury",
-    "version": "1.4.29",
+    "version": "1.4.30",
    "engines": {
        "node": ">=6.12"
    },
@@ -48,8 +48,8 @@
        "@0x/abi-gen": "^5.8.1",
        "@0x/contract-addresses": "^6.25.0",
        "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.46",
-        "@0x/contracts-gen": "^2.0.47",
+        "@0x/contracts-erc20": "^3.3.47",
+        "@0x/contracts-gen": "^2.0.48",
        "@0x/contracts-staking": "^2.0.45",
        "@0x/contracts-test-utils": "^5.4.37",
        "@0x/sol-compiler": "^4.8.2",
@@ -73,7 +73,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.16.13",
+        "@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,4 +1,13 @@
 [
+    {
+        "timestamp": 1665670315,
+        "version": "4.8.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1665531940,
        "version": "4.8.27",
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.8.28 - _October 13, 2022_
+
+    * Dependencies updated
+
 ## v4.8.27 - _October 11, 2022_

    * Dependencies updated
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.8.27",
+    "version": "4.8.28",
    "engines": {
        "node": ">=6.12"
    },
@@ -50,7 +50,7 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.1",
-        "@0x/contracts-gen": "^2.0.47",
+        "@0x/contracts-gen": "^2.0.48",
        "@0x/contracts-test-utils": "^5.4.37",
        "@0x/dev-utils": "^5.0.0",
        "@0x/order-utils": "^10.4.28",
--- a/contracts/zero-ex/CHANGELOG.json
+++ b/contracts/zero-ex/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1665670315,
+        "version": "0.37.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1665531940,
        "version": "0.37.6",
--- a/contracts/zero-ex/CHANGELOG.md
+++ b/contracts/zero-ex/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.37.7 - _October 13, 2022_
+
+    * Dependencies updated
+
 ## v0.37.6 - _October 11, 2022_

    * Dependencies updated
--- a/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol
@@ -90,8 +90,6 @@ contract FillQuoteTransformer is Transformer {
        IBridgeAdapter.BridgeOrder[] bridgeOrders;
        // Native limit orders. Sorted by fill sequence.
        LimitOrderInfo[] limitOrders;
-        // Otc orders. Sorted by fill sequence.
-        OtcOrderInfo[] otcOrders;
        // Native RFQ orders. Sorted by fill sequence.
        RfqOrderInfo[] rfqOrders;
        // The sequence to fill the orders in. Each item will fill the next
@@ -110,6 +108,8 @@ contract FillQuoteTransformer is Transformer {
        // `address(1)`: Send to the taker.
        // `address(2)`: Send to the sender (caller of `transformERC20()`).
        address payable refundReceiver;
+        // Otc orders. Sorted by fill sequence.
+        OtcOrderInfo[] otcOrders;
    }

    struct FillOrderResults {
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.37.6",
+    "version": "0.37.7",
    "engines": {
        "node": ">=6.12"
    },
@@ -57,8 +57,8 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.1",
        "@0x/contract-addresses": "^6.25.0",
-        "@0x/contracts-erc20": "^3.3.46",
-        "@0x/contracts-gen": "^2.0.47",
+        "@0x/contracts-erc20": "^3.3.47",
+        "@0x/contracts-gen": "^2.0.48",
        "@0x/contracts-test-utils": "^5.4.37",
        "@0x/dev-utils": "^5.0.0",
        "@0x/order-utils": "^10.4.28",
@@ -86,7 +86,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.16.13",
+        "@0x/protocol-utils": "^11.16.14",
        "@0x/subproviders": "^7.0.0",
        "@0x/types": "^3.3.6",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/zero-ex/test/artifacts.ts
+++ b/contracts/zero-ex/test/artifacts.ts
@@ -389,7 +389,8 @@ export const artifacts = {
    TestNoEthRecipient: TestNoEthRecipient as ContractArtifact,
    TestOrderSignerRegistryWithContractWallet: TestOrderSignerRegistryWithContractWallet as ContractArtifact,
    TestPermissionlessTransformerDeployerSuicidal: TestPermissionlessTransformerDeployerSuicidal as ContractArtifact,
-    TestPermissionlessTransformerDeployerTransformer: TestPermissionlessTransformerDeployerTransformer as ContractArtifact,
+    TestPermissionlessTransformerDeployerTransformer:
+        TestPermissionlessTransformerDeployerTransformer as ContractArtifact,
    TestPropertyValidator: TestPropertyValidator as ContractArtifact,
    TestRfqOriginRegistration: TestRfqOriginRegistration as ContractArtifact,
    TestSimpleFunctionRegistryFeatureImpl1: TestSimpleFunctionRegistryFeatureImpl1 as ContractArtifact,
--- a/packages/asset-swapper/package.json
+++ b/packages/asset-swapper/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/asset-swapper",
-    "version": "16.66.13",
+    "version": "16.66.14",
    "private": true,
    "engines": {
        "node": ">=6.12"
@@ -35,13 +35,13 @@
        "@0x/base-contract": "^7.0.0",
        "@0x/contract-addresses": "^6.25.0",
        "@0x/contract-wrappers": "^13.22.6",
-        "@0x/contracts-erc20": "^3.3.46",
-        "@0x/contracts-zero-ex": "^0.37.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.13",
+        "@0x/protocol-utils": "^11.16.14",
        "@0x/quote-server": "^8.0.0",
        "@0x/types": "^3.3.6",
        "@0x/utils": "^7.0.0",
--- a/packages/protocol-utils/CHANGELOG.json
+++ b/packages/protocol-utils/CHANGELOG.json
@@ -1,4 +1,14 @@
 [
+    {
+        "version": "11.16.14",
+        "changes": [
+            {
+                "note": "Fix FQT Otc encoding logic",
+                "pr": "596"
+            }
+        ],
+        "timestamp": 1665670315
+    },
    {
        "timestamp": 1665531940,
        "version": "11.16.13",
--- a/packages/protocol-utils/CHANGELOG.md
+++ b/packages/protocol-utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v11.16.14 - _October 13, 2022_
+
+    * Fix FQT Otc encoding logic (#596)
+
 ## v11.16.13 - _October 11, 2022_

    * Dependencies updated
--- a/packages/protocol-utils/package.json
+++ b/packages/protocol-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/protocol-utils",
-    "version": "11.16.13",
+    "version": "11.16.14",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/protocol-utils/src/transformer_utils.ts
+++ b/packages/protocol-utils/src/transformer_utils.ts
@@ -74,11 +74,6 @@ export const fillQuoteTransformerDataEncoder = AbiEncoder.create([
                type: 'tuple[]',
                components: LIMIT_ORDER_INFO_ABI_COMPONENTS,
            },
-            {
-                name: 'otcOrders',
-                type: 'tuple[]',
-                components: OTC_ORDER_INFO_ABI_COMPONENTS,
-            },
            {
                name: 'rfqOrders',
                type: 'tuple[]',
@@ -87,6 +82,11 @@ export const fillQuoteTransformerDataEncoder = AbiEncoder.create([
            { name: 'fillSequence', type: 'uint8[]' },
            { name: 'fillAmount', type: 'uint256' },
            { name: 'refundReceiver', type: 'address' },
+            {
+                name: 'otcOrders',
+                type: 'tuple[]',
+                components: OTC_ORDER_INFO_ABI_COMPONENTS,
+            },
        ],
    },
 ]);
--- a/yarn.lock
+++ b/yarn.lock
@@ -840,6 +840,23 @@
    prettier "^1.16.3"
    to-snake-case "^1.0.0"

+"@0x/contracts-gen@^2.0.48":
+  version "2.0.48"
+  resolved "https://registry.yarnpkg.com/@0x/contracts-gen/-/contracts-gen-2.0.48.tgz#fa308099246e0b694f4ee5a2d26a83445d2cc945"
+  integrity sha512-tTtrkD0Z28k8Y9feJ45LUXRhQKgwtQqgYMgPSbqBY+IOvXXKaNNmXHe/sy7n1RKJLo171ez6fM6NehA3ls57iw==
+  dependencies:
+    "@0x/sol-compiler" "^4.8.2"
+    "@0x/sol-resolver" "^3.1.13"
+    "@0x/types" "^3.3.7"
+    "@0x/typescript-typings" "^5.3.2"
+    "@0x/utils" "^7.0.0"
+    "@types/node" "12.12.54"
+    ethereum-types "^3.7.1"
+    lodash "^4.17.21"
+    mkdirp "^0.5.1"
+    prettier "^2.7.1"
+    to-snake-case "^1.0.0"
+
 "@0x/contracts-staking@^2.0.45":
  version "2.0.45"
  resolved "https://registry.yarnpkg.com/@0x/contracts-staking/-/contracts-staking-2.0.45.tgz#48a495d7ab1240cb4859e7a2ae6c1c78511bb6ed"
@@ -14011,7 +14028,7 @@ prettier-plugin-solidity@^1.0.0-beta.24:
    solidity-comments-extractor "^0.0.7"
    string-width "^4.2.3"

-prettier@2.7.1, prettier@^2.3.1:
+prettier@2.7.1, prettier@^2.3.1, prettier@^2.7.1:
  version "2.7.1"
  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
Author	SHA1	Message	Date
Github Actions	10af74e616	Publish - @0x/contracts-erc20@3.3.47 - @0x/contracts-treasury@1.4.30 - @0x/contracts-utils@4.8.28 - @0x/contracts-zero-ex@0.37.7 - @0x/asset-swapper@16.66.14 - @0x/protocol-utils@11.16.14	2022-10-13 14:12:06 +00:00
Github Actions	cfb2392ac7	Updated CHANGELOGS & MD docs	2022-10-13 14:12:02 +00:00
Kyu	5a2447bef3	Upgrade `@0x/contracts-gen` (#602 )	2022-10-12 17:36:25 -07:00
Noah Khamliche	bf1b5c4257	Fix: FQT otc order encoding logic (#596 ) * swap rfq and otc in fillQuoteTransformerDataEncoder to match our enum * changelog * fix changelog and move otcOrders field to last in fillQuoteTransformerDataEncoder * prettier * move otcOrders array to end of fqtTransformData Co-authored-by: Noah Khamliche <0xnoah@Noahs-MacBook-Pro-2.local>	2022-10-12 17:10:16 -04:00