Update link to 0x Protocol docs

Previous docs link pointed to deprecated docs page. Updated the link to the latest 0x Protocol orders page
Publish: CHANGELOG and Package Version Updates into development (#748 )
2023-10-24 11:02:11 -07:00 · 2023-08-29 15:10:18 -07:00 · 2023-08-29 14:43:23 -07:00 · 2023-08-24 16:35:11 -04:00
29 changed files with 176 additions and 40 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,19 +1,21 @@
 name: publish

 on:
-  workflow_dispatch:
-      inputs:
-          ci_status:
-              description: 'required CI status'
-              default: 'success'
-              required: true
-          prerelease:
-              description: 'prerelease name'
-              required: false
+    workflow_dispatch:
+        inputs:
+            ci_status:
+                description: 'required CI status'
+                default: 'success'
+                required: true
+            prerelease:
+                description: 'prerelease name'
+                required: false

 jobs:
    publish:
        runs-on: ubuntu-latest
+        env:
+            PublishBranch: publish/${{github.ref_name }}-${{ github.run_id }}-${{ github.run_number }}
        steps:
            - name: 'check successful status'
              run: |
@@ -28,16 +30,20 @@ jobs:
                  version: nightly
            - uses: actions/checkout@v2
              with:
-                ref: ${{ github.ref }}
-                fetch-depth: 0
+                  ref: ${{ github.ref }}
+                  fetch-depth: 0
            - uses: actions/setup-node@v1
              with:
-                node-version: 16
+                  node-version: 16
            - uses: actions/setup-python@v2
            - name: 'configure git'
              run: |
                  git config --global user.email "github-actions@github.com"
                  git config --global user.name "Github Actions"
+            - name: 'Checkout new branch'
+              run: |
+                  git checkout -b $PublishBranch
+                  git push -u origin $PublishBranch
            - name: 'install dependencies'
              run: |
                  yarn -D
@@ -49,9 +55,23 @@ jobs:
                  NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
                  GITHUB_TOKEN: ${{ github.token }}
                  PUBLISH_PRERELEASE: ${{ github.event.inputs.prerelease }}
-            - name: 'merge into main branch'
-              if: github.event.inputs.prerelease == '' # unless it's a prerelease
+            - name: 'Create PR to merge into ref branch'
              run: |
-                  git checkout main && \
-                  git merge ${{ github.ref }} && \
-                  git push
+                  gh pr create \
+                    -B ${{ github.ref_name }} \
+                    -H $PublishBranch \
+                    --title "Publish: CHANGELOG and Package Version Updates into ${{ github.ref_name }}" \
+                    --body "Syncing CHANGELOG and package version updates from publish action ${{github.run_id}}-${{github.run_number}} into ${{ github.ref_name}} branch" \
+                    --reviewer ${{ github.actor }}
+              env:
+                  GITHUB_TOKEN: ${{ github.token }}
+            - name: 'Create PR to merge ref branch into main'
+              run: |
+                  gh pr create \
+                    -B main \
+                    -H ${{ github.ref_name }} \
+                    --title "Publish: Sync ${{ github.ref_name }} into main " \
+                    --body "Syncing ${{ github.ref_name }} back into main after publish action. NOTE: this PR should be merged after CHANGELOG and package version updates have been merged into ${{ github.ref_name }}" \
+                    --reviewer ${{ github.actor }}
+              env:
+                  GITHUB_TOKEN: ${{ github.token }}
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1693346928,
+        "version": "4.0.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1692368658,
        "version": "4.0.12",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.0.13 - _August 29, 2023_
+
+    * Dependencies updated
+
 ## v4.0.12 - _August 18, 2023_

    * Dependencies updated
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "4.0.12",
+    "version": "4.0.13",
    "engines": {
        "node": ">=6.12"
    },
@@ -24,7 +24,7 @@
    },
    "homepage": "https://github.com/0xProject/protocol",
    "devDependencies": {
-        "@0x/contracts-utils": "^4.8.50",
+        "@0x/contracts-utils": "^4.8.51",
        "@0x/ts-doc-gen": "^0.0.28",
        "typedoc": "~0.16.11"
    },
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1693346928,
+        "version": "5.4.59",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1692368658,
        "version": "5.4.58",
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v5.4.59 - _August 29, 2023_
+
+    * Dependencies updated
+
 ## v5.4.58 - _August 18, 2023_

    * 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.58",
+    "version": "5.4.59",
    "engines": {
        "node": ">=6.12"
    },
@@ -41,7 +41,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.36",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.11.0",
+        "@0x/contract-addresses": "^8.12.0",
        "@0x/dev-utils": "^5.0.2",
        "@0x/json-schemas": "^6.4.4",
        "@0x/order-utils": "^10.4.28",
--- a/contracts/treasury/CHANGELOG.json
+++ b/contracts/treasury/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1693346928,
+        "version": "1.4.53",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1692368658,
        "version": "1.4.52",
--- 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.53 - _August 29, 2023_
+
+    * Dependencies updated
+
 ## v1.4.52 - _August 18, 2023_

    * Dependencies updated
--- a/contracts/treasury/package.json
+++ b/contracts/treasury/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-treasury",
-    "version": "1.4.52",
+    "version": "1.4.53",
    "engines": {
        "node": ">=6.12"
    },
@@ -46,12 +46,12 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.5",
-        "@0x/contract-addresses": "^8.11.0",
+        "@0x/contract-addresses": "^8.12.0",
        "@0x/contracts-asset-proxy": "^3.7.19",
        "@0x/contracts-erc20": "3.3.57",
        "@0x/contracts-gen": "^2.0.50",
        "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.58",
+        "@0x/contracts-test-utils": "^5.4.59",
        "@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.24.0",
+        "@0x/protocol-utils": "^11.24.1",
        "@0x/subproviders": "^8.0.1",
        "@0x/types": "^3.3.7",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1693346928,
+        "version": "4.8.51",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1692368658,
        "version": "4.8.50",
--- 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.51 - _August 29, 2023_
+
+    * Dependencies updated
+
 ## v4.8.50 - _August 18, 2023_

    * Dependencies updated
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.8.50",
+    "version": "4.8.51",
    "engines": {
        "node": ">=6.12"
    },
@@ -45,7 +45,7 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.5",
        "@0x/contracts-gen": "^2.0.50",
-        "@0x/contracts-test-utils": "^5.4.58",
+        "@0x/contracts-test-utils": "^5.4.59",
        "@0x/dev-utils": "^5.0.2",
        "@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,4 +1,13 @@
 [
+    {
+        "version": "0.48.0",
+        "changes": [
+            {
+                "note": "Add VelodromeV2 support on Base"
+            }
+        ],
+        "timestamp": 1693346928
+    },
    {
        "version": "0.47.0",
        "changes": [
--- 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.48.0 - _August 29, 2023_
+
+    * Add VelodromeV2 support on Base
+
 ## v0.47.0 - _August 18, 2023_

    * Add MaverickV1 support on Ethereum, BSC, and Base
--- a/contracts/zero-ex/contracts/src/transformers/bridges/BaseBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/BaseBridgeAdapter.sol
@@ -24,6 +24,7 @@ import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
 import "./mixins/MixinMaverickV1.sol";
 import "./mixins/MixinSolidly.sol";
+import "./mixins/MixinVelodromeV2.sol";

 contract BaseBridgeAdapter is
    AbstractBridgeAdapter(8453, "Base"),
@@ -33,7 +34,8 @@ contract BaseBridgeAdapter is
    MixinCurve,
    MixinCurveV2,
    MixinMaverickV1,
-    MixinSolidly
+    MixinSolidly,
+    MixinVelodromeV2
 {
    constructor(IEtherToken weth) public MixinCurve(weth) {}

@@ -80,6 +82,11 @@ contract BaseBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeMaverickV1(sellToken, buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.VELODROMEV2) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeVelodromeV2(sellToken, sellAmount, order.bridgeData);
        }
        emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);
    }
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.47.0",
+    "version": "0.48.0",
    "engines": {
        "node": ">=6.12"
    },
@@ -51,10 +51,10 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.5",
-        "@0x/contract-addresses": "^8.11.0",
+        "@0x/contract-addresses": "^8.12.0",
        "@0x/contracts-erc20": "^3.3.57",
        "@0x/contracts-gen": "^2.0.50",
-        "@0x/contracts-test-utils": "^5.4.58",
+        "@0x/contracts-test-utils": "^5.4.59",
        "@0x/dev-utils": "^5.0.2",
        "@0x/order-utils": "^10.4.28",
        "@0x/sol-compiler": "^4.8.2",
@@ -80,7 +80,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.24.0",
+        "@0x/protocol-utils": "^11.24.1",
        "@0x/subproviders": "^8.0.1",
        "@0x/types": "^3.3.7",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/zero-ex/tests/transformers/bridges/BaseBridgeAdapterTest.t.sol
+++ b/contracts/zero-ex/tests/transformers/bridges/BaseBridgeAdapterTest.t.sol
@@ -36,4 +36,12 @@ contract BaseBridgeAdapterTest is Test {
    function testSupportMaverickV1() public {
        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.MAVERICKV1) << 128)));
    }
+
+    function testSupportSolidly() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.SOLIDLY) << 128)));
+    }
+
+    function testSupportVelodromeV2() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.VELODROMEV2) << 128)));
+    }
 }
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+	{
+		"version": "8.12.0",
+		"changes": [
+			{
+				"note": "Add VelodromeV2 support on Base"
+			}
+		],
+		"timestamp": 1693346928
+	},
 	{
 		"version": "8.11.0",
 		"changes": [
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -6,6 +6,9 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v8.12.0 - _August 29, 2023_
+
+    * Add VelodromeV2 support on Base
 ## v8.11.0 - _August 18, 2023_

    * Add MaverickV1 support on Ethereum, BSC, and Base
--- a/packages/contract-addresses/addresses.json
+++ b/packages/contract-addresses/addresses.json
@@ -271,7 +271,7 @@
            "wethTransformer": "0x63186ea36e78ecbf0128e448362f1b81e9bf7412",
            "payTakerTransformer": "0x5cc22a0e06ea11097c612a962e63674b90e96099",
            "affiliateFeeTransformer": "0x9e52d8b32d835206d09810c310593bcc77264066",
-            "fillQuoteTransformer": "0xab93d03a3e7e51ec5edaef75d27f20917da4c18e",
+            "fillQuoteTransformer": "0x2c46d57bb5af87a13a51dd5b62ba7d3bc7e12e9c",
            "positiveSlippageFeeTransformer": "0xf98a130d3b4029c70e6d93098cb82a003421341e"
        }
    }
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-addresses",
-    "version": "8.11.0",
+    "version": "8.12.0",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+	{
+		"timestamp": 1693346928,
+		"version": "13.23.7",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
 	{
 		"timestamp": 1692368658,
 		"version": "13.23.6",
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -6,6 +6,9 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v13.23.7 - _August 29, 2023_
+
+    * Dependencies updated
 ## v13.23.6 - _August 18, 2023_

    * Dependencies updated
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-wrappers",
-    "version": "13.23.6",
+    "version": "13.23.7",
    "engines": {
        "node": ">=6.12"
    },
@@ -59,7 +59,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.36",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.11.0",
+        "@0x/contract-addresses": "^8.12.0",
        "@0x/json-schemas": "^6.4.4",
        "@0x/types": "^3.3.7",
        "@0x/utils": "^7.0.0",
--- a/packages/protocol-utils/CHANGELOG.json
+++ b/packages/protocol-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+	{
+		"timestamp": 1693346928,
+		"version": "11.24.1",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
 	{
 		"version": "11.24.0",
 		"changes": [
--- a/packages/protocol-utils/CHANGELOG.md
+++ b/packages/protocol-utils/CHANGELOG.md
@@ -6,6 +6,9 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v11.24.1 - _August 29, 2023_
+
+    * Dependencies updated
 ## v11.24.0 - _August 18, 2023_

    * Add MaverickV1 support on Ethereum, BSC, and Base
--- a/packages/protocol-utils/README.md
+++ b/packages/protocol-utils/README.md
@@ -8,7 +8,7 @@
 -   Signatures
 -   EIP712 hashing

-### Read the [Documentation](https://0x.org/docs/protocol/protocol-utils).
+### Read the [Documentation](https://docs.0xprotocol.org/en/latest/basics/orders.html).

 ## Installation

--- a/packages/protocol-utils/package.json
+++ b/packages/protocol-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/protocol-utils",
-    "version": "11.24.0",
+    "version": "11.24.1",
    "engines": {
        "node": ">=6.12"
    },
@@ -62,8 +62,8 @@
    },
    "dependencies": {
        "@0x/assert": "^3.0.36",
-        "@0x/contract-addresses": "^8.11.0",
-        "@0x/contract-wrappers": "^13.23.6",
+        "@0x/contract-addresses": "^8.12.0",
+        "@0x/contract-wrappers": "^13.23.7",
        "@0x/json-schemas": "^6.4.4",
        "@0x/subproviders": "^8.0.1",
        "@0x/utils": "^7.0.0",
Author	SHA1	Message	Date
Jessica Lin	631a4ca00e	Update link to 0x Protocol docs Previous docs link pointed to deprecated docs page. Updated the link to the latest 0x Protocol orders page	2023-10-24 11:02:11 -07:00
github-actions[bot]	b19e29e03d	Publish: CHANGELOG and Package Version Updates into development (#748 ) * Updated CHANGELOGS & MD docs * Publish - @0x/contracts-erc20@4.0.13 - @0x/contracts-test-utils@5.4.59 - @0x/contracts-treasury@1.4.53 - @0x/contracts-utils@4.8.51 - @0x/contracts-zero-ex@0.48.0 - @0x/contract-addresses@8.12.0 - @0x/contract-wrappers@13.23.7 - @0x/protocol-utils@11.24.1 --------- Co-authored-by: Github Actions <github-actions@github.com>	2023-08-29 15:10:18 -07:00
Kyu	e5cbfd87bc	Add Velodrome V2 support on Base (#747 )	2023-08-29 14:43:23 -07:00
Savarn Dontamsetti (Sav)	5a49be1322	Create PRs to reflect publish changes (#743 ) * Create PRs to reflect publish changes * Using gh instead of third party action * Adding github token	2023-08-24 16:35:11 -04:00