Updated CHANGELOGS & MD docs

Adding github token
Merge branch 'feat/PublishPRs' of https://github.com/0xProject/protocol into feat/PublishPRs
2023-08-24 19:31:29 +00:00 · 2023-08-24 15:29:25 -04:00 · 2023-08-24 15:25:05 -04:00 · 2023-08-24 15:24:28 -04:00 · 2023-08-24 14:45:26 -04:00 · 2023-08-24 14:31:31 -04:00
29 changed files with 57 additions and 148 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -47,20 +47,26 @@ jobs:
            - name: 'install dependencies'
              run: |
                  yarn -D
-            - name: 'build and publish'
+            - name: 'Test Commits'
              run: |
-                  echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > .npmrc
-                  npm run run:publish:gha
-              env:
-                  NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
-                  GITHUB_TOKEN: ${{ github.token }}
-                  PUBLISH_PRERELEASE: ${{ github.event.inputs.prerelease }}
+                  echo "Dummy File" > dummy.txt
+                  git add . --all
+                  git commit -m "Updated CHANGELOGS & MD docs"
+                  git push
+            # - name: 'build and publish'
+            #   run: |
+            #       echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > .npmrc
+            #       npm run run:publish:gha
+            #   env:
+            #       NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+            #       GITHUB_TOKEN: ${{ github.token }}
+            #       PUBLISH_PRERELEASE: ${{ github.event.inputs.prerelease }}
            - name: 'Create PR to merge into ref branch'
              run: |
                  gh pr create \
                    -B ${{ github.ref_name }} \
                    -H $PublishBranch \
-                    --title "Publish: CHANGELOG and Package Version Updates into ${{ github.ref_name }}" \
+                    --title "Published ${{ 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:
@@ -70,8 +76,26 @@ jobs:
                  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 }}" \
+                    --title "Published ${{ github.ref_name }}" \
+                    --body "Syncing CHANGELOG and package version updates from publish action ${{github.run_id}}-${{github.run_number}} into main branch" \
                    --reviewer ${{ github.actor }}
              env:
                  GITHUB_TOKEN: ${{ github.token }}
+
+              # uses: peter-evans/create-pull-request@v5
+              # with:
+              #     token: ${{ github.token }}
+              #     base: ${{ github.ref_name }}
+              #     branch: 'publish/${{ github.ref_name }}-${{ github.run_id }}-${{ github.run_number }}'
+              #     title: 'Published ${{ github.ref_name }}'
+              #     body: 'Syncing CHANGELOG and package version updates from publish action ${{github.run_id}}-${{github.run_number}} into ${{ github.ref_name}} branch'
+              #     reviewers: ${{ github.actor }}
+            # - name: 'Create PR to merge ref branch into main'
+            #   uses: peter-evans/create-pull-request@v5
+            #   with:
+            #       token: ${{ github.token }}
+            #       base: main
+            #       branch: ${{ github.ref_name }}
+            #       title: 'Published ${{ github.ref_name }}'
+            #       body: 'Syncing CHANGELOG and package version updates from published ${{ github.ref_name }} branch into main branch'
+            #       reviewers: ${{ github.actor }}
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,13 +1,4 @@
 [
-    {
-        "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,10 +5,6 @@ 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.13",
+    "version": "4.0.12",
    "engines": {
        "node": ">=6.12"
    },
@@ -24,7 +24,7 @@
    },
    "homepage": "https://github.com/0xProject/protocol",
    "devDependencies": {
-        "@0x/contracts-utils": "^4.8.51",
+        "@0x/contracts-utils": "^4.8.50",
        "@0x/ts-doc-gen": "^0.0.28",
        "typedoc": "~0.16.11"
    },
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,13 +1,4 @@
 [
-    {
-        "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,10 +5,6 @@ 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.59",
+    "version": "5.4.58",
    "engines": {
        "node": ">=6.12"
    },
@@ -41,7 +41,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.36",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.12.0",
+        "@0x/contract-addresses": "^8.11.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,13 +1,4 @@
 [
-    {
-        "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,10 +5,6 @@ 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.53",
+    "version": "1.4.52",
    "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.12.0",
+        "@0x/contract-addresses": "^8.11.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.59",
+        "@0x/contracts-test-utils": "^5.4.58",
        "@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.1",
+        "@0x/protocol-utils": "^11.24.0",
        "@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,13 +1,4 @@
 [
-    {
-        "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,10 +5,6 @@ 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.51",
+    "version": "4.8.50",
    "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.59",
+        "@0x/contracts-test-utils": "^5.4.58",
        "@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,13 +1,4 @@
 [
-    {
-        "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,10 +5,6 @@ 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,7 +24,6 @@ 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"),
@@ -34,8 +33,7 @@ contract BaseBridgeAdapter is
    MixinCurve,
    MixinCurveV2,
    MixinMaverickV1,
-    MixinSolidly,
-    MixinVelodromeV2
+    MixinSolidly
 {
    constructor(IEtherToken weth) public MixinCurve(weth) {}

@@ -82,11 +80,6 @@ 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.48.0",
+    "version": "0.47.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.12.0",
+        "@0x/contract-addresses": "^8.11.0",
        "@0x/contracts-erc20": "^3.3.57",
        "@0x/contracts-gen": "^2.0.50",
-        "@0x/contracts-test-utils": "^5.4.59",
+        "@0x/contracts-test-utils": "^5.4.58",
        "@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.1",
+        "@0x/protocol-utils": "^11.24.0",
        "@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,12 +36,4 @@ 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/dummy.txt
+++ b/dummy.txt
@@ -0,0 +1 @@
+Dummy File
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,13 +1,4 @@
 [
-	{
-		"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,9 +6,6 @@ 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": "0x2c46d57bb5af87a13a51dd5b62ba7d3bc7e12e9c",
+            "fillQuoteTransformer": "0xab93d03a3e7e51ec5edaef75d27f20917da4c18e",
            "positiveSlippageFeeTransformer": "0xf98a130d3b4029c70e6d93098cb82a003421341e"
        }
    }
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-addresses",
-    "version": "8.12.0",
+    "version": "8.11.0",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,13 +1,4 @@
 [
-	{
-		"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,9 +6,6 @@ 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.7",
+    "version": "13.23.6",
    "engines": {
        "node": ">=6.12"
    },
@@ -59,7 +59,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.36",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.12.0",
+        "@0x/contract-addresses": "^8.11.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,13 +1,4 @@
 [
-	{
-		"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,9 +6,6 @@ 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/package.json
+++ b/packages/protocol-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/protocol-utils",
-    "version": "11.24.1",
+    "version": "11.24.0",
    "engines": {
        "node": ">=6.12"
    },
@@ -62,8 +62,8 @@
    },
    "dependencies": {
        "@0x/assert": "^3.0.36",
-        "@0x/contract-addresses": "^8.12.0",
-        "@0x/contract-wrappers": "^13.23.7",
+        "@0x/contract-addresses": "^8.11.0",
+        "@0x/contract-wrappers": "^13.23.6",
        "@0x/json-schemas": "^6.4.4",
        "@0x/subproviders": "^8.0.1",
        "@0x/utils": "^7.0.0",
Author	SHA1	Message	Date
Github Actions	ce370cb7b4	Updated CHANGELOGS & MD docs	2023-08-24 19:31:29 +00:00
Savarn Dontamsetti	8f0c556d1f	Adding github token	2023-08-24 15:29:25 -04:00
Savarn Dontamsetti	9f7518cc1a	Merge branch 'feat/PublishPRs' of https://github.com/0xProject/protocol into feat/PublishPRs	2023-08-24 15:25:05 -04:00
Savarn Dontamsetti	6168931608	Using gh instead of third party action	2023-08-24 15:24:28 -04:00
Savarn Dontamsetti	9b53c9f939	Change github.ref to github.ref_name	2023-08-24 14:45:26 -04:00
Savarn Dontamsetti	518d2e55b4	Don't delete the branch after PR creation	2023-08-24 14:31:31 -04:00
Savarn Dontamsetti	b2d1a2fab9	More formatting fixes	2023-08-24 14:08:11 -04:00
Savarn Dontamsetti	ff531fc7e9	Fix missing closing bracket	2023-08-24 13:59:33 -04:00
Savarn Dontamsetti	230f0d57ee	Adding test commits	2023-08-24 13:56:35 -04:00
Savarn Dontamsetti	1ca6815f2c	Fix Formatting 3	2023-08-24 13:41:19 -04:00
Savarn Dontamsetti	db6013b594	Fix Formatting	2023-08-24 13:40:10 -04:00
Savarn Dontamsetti	ce9a48c102	Fix Formatting	2023-08-24 13:39:00 -04:00
Savarn Dontamsetti	25374cdf47	Formatting	2023-08-24 10:33:50 -04:00
Savarn Dontamsetti	7be1954010	Create PRs to reflect publish changes	2023-08-24 10:28:37 -04:00
Github Actions	48cc9d2dc1	Merge branch 'refs/heads/development'	2023-08-18 14:24:54 +00:00
Github Actions	bd02e7b3d5	Merge branch 'refs/heads/development'	2023-08-09 21:43:47 +00:00
Github Actions	9da449ec32	Merge branch 'refs/heads/development'	2023-07-21 21:29:05 +00:00
Github Actions	f59d2438b0	Merge branch 'refs/heads/development'	2023-07-19 18:30:57 +00:00
Github Actions	fcdebe6b01	Merge branch 'refs/heads/development'	2023-05-10 20:04:52 +00:00
Github Actions	c4a83f211f	Merge branch 'refs/heads/development'	2023-05-01 21:26:04 +00:00
Github Actions	e086caa94b	Merge branch 'refs/heads/development'	2023-04-24 11:12:43 +00:00
abls	53e83e74e2	Merge branch 'development'	2023-04-24 02:14:12 -07:00
Github Actions	0179320e55	Publish - @0x/contracts-erc20@4.0.4 - @0x/contracts-test-utils@5.4.51 - @0x/contracts-treasury@1.4.44 - @0x/contracts-utils@4.8.42 - @0x/contracts-zero-ex@0.40.0 - @0x/contract-addresses@8.3.0 - @0x/contract-wrappers@13.22.20 - @0x/protocol-utils@11.19.0	2023-04-17 02:08:56 +00:00