From 1b27dfab82f97420ad755ac58591a72a3f312a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Migone?= Date: Thu, 14 Mar 2024 14:51:01 -0300 Subject: [PATCH] chore: bump contracts package version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomás Migone --- .github/workflows/ci-token-dist.yml | 4 +- packages/contracts/CHANGELOG.md | 6 +++ .../contracts/contracts/arbitrum/Arbitrum.md | 5 +++ packages/contracts/package.json | 6 +-- packages/contracts/scripts/build | 12 +++++- packages/contracts/scripts/prepack | 20 ---------- packages/contracts/scripts/test | 1 - packages/sdk/CHANGELOG.md | 6 +++ packages/sdk/package.json | 4 +- packages/token-distribution/CHANGELOG.md | 7 ++++ packages/token-distribution/package.json | 6 +-- yarn.lock | 38 ++++++++++++++----- 12 files changed, 75 insertions(+), 40 deletions(-) create mode 100644 packages/contracts/contracts/arbitrum/Arbitrum.md delete mode 100755 packages/contracts/scripts/prepack create mode 100644 packages/token-distribution/CHANGELOG.md diff --git a/.github/workflows/ci-token-dist.yml b/.github/workflows/ci-token-dist.yml index 76922ff9d..7b0bd8767 100644 --- a/.github/workflows/ci-token-dist.yml +++ b/.github/workflows/ci-token-dist.yml @@ -23,4 +23,6 @@ jobs: - name: Set up environment uses: ./.github/actions/setup - name: Run tests - run: yarn test \ No newline at end of file + run: | + pushd packages/token-distribution + yarn test \ No newline at end of file diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md index 802cff94c..cdbb2c892 100644 --- a/packages/contracts/CHANGELOG.md +++ b/packages/contracts/CHANGELOG.md @@ -1,5 +1,11 @@ # @graphprotocol/contracts +## 7.0.0 + +### Major Changes + +- 9686ce1: Add Horizon staking interface + ## 6.2.1 ### Patch Changes diff --git a/packages/contracts/contracts/arbitrum/Arbitrum.md b/packages/contracts/contracts/arbitrum/Arbitrum.md new file mode 100644 index 000000000..abc87553e --- /dev/null +++ b/packages/contracts/contracts/arbitrum/Arbitrum.md @@ -0,0 +1,5 @@ +# Arbitrum contracts + +These contracts have been copied from the [Arbitrum repo](https://github.com/OffchainLabs/arbitrum). + +They are also available as part of the npm packages [arb-bridge-eth](https://www.npmjs.com/package/arb-bridge-eth) and [arb-bridge-peripherals](https://www.npmjs.com/package/arb-bridge-peripherals). The reason for copying them rather than installing those packages is the contracts only support Solidity `^0.6.11`, so we had to change the version to `^0.7.6` for it to be compatible with our other contracts. diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 4e95a8f3c..6dea50dad 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@graphprotocol/contracts", - "version": "6.2.1", + "version": "7.0.0", "description": "Contracts for the Graph Protocol", "directories": { "test": "test" @@ -75,13 +75,13 @@ "solidity-coverage": "^0.7.16", "ts-node": "^10.9.1", "typechain": "^5.0.0", - "typescript": "^4.7.4", + "typescript": "^5.2.2", "winston": "^3.3.3", "yaml": "^1.10.2", "yargs": "^17.0.0" }, "scripts": { - "prepack": "scripts/prepack", + "prepack": "SKIP_LOAD=true scripts/build", "build": "SKIP_LOAD=true scripts/build", "clean": "rm -rf build/ cache/ dist/", "compile": "hardhat compile", diff --git a/packages/contracts/scripts/build b/packages/contracts/scripts/build index df72b9f62..e330635ba 100755 --- a/packages/contracts/scripts/build +++ b/packages/contracts/scripts/build @@ -1,6 +1,16 @@ #!/bin/bash +TYPECHAIN_DIR=dist/types + set -eo pipefail -# Build +# Build contracts +yarn clean yarn compile + +# Refresh distribution folder +rm -rf dist && mkdir -p ${TYPECHAIN_DIR} +cp -R build/abis/ dist/abis +cp -R build/types/ ${TYPECHAIN_DIR} + +tsc --esModuleInterop \ No newline at end of file diff --git a/packages/contracts/scripts/prepack b/packages/contracts/scripts/prepack deleted file mode 100755 index bc0e54391..000000000 --- a/packages/contracts/scripts/prepack +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -TYPECHAIN_DIR=dist/types - -set -eo pipefail -set +o noglob - -# Build contracts -yarn clean -yarn build - -# Refresh distribution folder -rm -rf dist && mkdir -p ${TYPECHAIN_DIR} -cp -R build/abis/ dist/abis -cp -R build/types/ ${TYPECHAIN_DIR} - -# Build and create TS declarations -pushd ${TYPECHAIN_DIR} -ls *.ts **/*.ts | xargs tsc --esModuleInterop -popd diff --git a/packages/contracts/scripts/test b/packages/contracts/scripts/test index 376090d90..4156166ae 100755 --- a/packages/contracts/scripts/test +++ b/packages/contracts/scripts/test @@ -6,7 +6,6 @@ source $(pwd)/scripts/evm ### Setup EVM # Ensure we compiled sources - yarn build ### Cleanup diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md index 20a787d51..9cc5a8e17 100644 --- a/packages/sdk/CHANGELOG.md +++ b/packages/sdk/CHANGELOG.md @@ -1,5 +1,11 @@ # @graphprotocol/sdk +## 0.5.1 + +### Patch Changes + +- Bump contracts dependency + ## 0.5.0 ### Minor Changes diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 18497431e..6083abdcb 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@graphprotocol/sdk", - "version": "0.5.0", + "version": "0.5.1", "description": "TypeScript based SDK to interact with The Graph protocol contracts", "main": "build/index.js", "types": "src/index.ts", @@ -21,7 +21,7 @@ "@arbitrum/sdk": "~3.1.13", "@ethersproject/experimental": "^5.7.0", "@graphprotocol/common-ts": "^2.0.7", - "@graphprotocol/contracts": "workspace:^6.2.0", + "@graphprotocol/contracts": "workspace:^7.0.0", "@nomicfoundation/hardhat-network-helpers": "^1.0.9", "@nomiclabs/hardhat-ethers": "^2.2.3", "debug": "^4.3.4", diff --git a/packages/token-distribution/CHANGELOG.md b/packages/token-distribution/CHANGELOG.md new file mode 100644 index 000000000..2809305b6 --- /dev/null +++ b/packages/token-distribution/CHANGELOG.md @@ -0,0 +1,7 @@ +# @graphprotocol/token-distribution + +## 1.2.1 + +### Patch Changes + +- Bump contracts dependency diff --git a/packages/token-distribution/package.json b/packages/token-distribution/package.json index 37069fc41..097bc13e0 100644 --- a/packages/token-distribution/package.json +++ b/packages/token-distribution/package.json @@ -1,6 +1,6 @@ { "name": "@graphprotocol/token-distribution", - "version": "1.2.0", + "version": "1.2.1", "description": "Graph Token Distribution", "main": "index.js", "scripts": { @@ -31,7 +31,7 @@ "devDependencies": { "@ethersproject/experimental": "^5.0.7", "@graphprotocol/client-cli": "^2.0.2", - "@graphprotocol/contracts": "^5.0.0", + "@graphprotocol/contracts": "workspace:^7.0.0", "@nomiclabs/hardhat-ethers": "^2.0.0", "@nomiclabs/hardhat-etherscan": "^3.1.7", "@nomiclabs/hardhat-waffle": "^2.0.0", @@ -65,6 +65,6 @@ "solhint-plugin-prettier": "^0.1.0", "ts-node": "^10.9.1", "typechain": "^5.0.0", - "typescript": "^4.0.2" + "typescript": "^5.2.2" } } diff --git a/yarn.lock b/yarn.lock index da96ff202..14e5dcb52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2607,7 +2607,7 @@ __metadata: languageName: node linkType: hard -"@graphprotocol/contracts@npm:5.3.3, @graphprotocol/contracts@npm:^5.0.0": +"@graphprotocol/contracts@npm:5.3.3": version: 5.3.3 resolution: "@graphprotocol/contracts@npm:5.3.3" dependencies: @@ -2617,7 +2617,7 @@ __metadata: languageName: node linkType: hard -"@graphprotocol/contracts@workspace:^6.2.0, @graphprotocol/contracts@workspace:packages/contracts": +"@graphprotocol/contracts@workspace:^7.0.0, @graphprotocol/contracts@workspace:packages/contracts": version: 0.0.0-use.local resolution: "@graphprotocol/contracts@workspace:packages/contracts" dependencies: @@ -2681,7 +2681,7 @@ __metadata: solidity-coverage: "npm:^0.7.16" ts-node: "npm:^10.9.1" typechain: "npm:^5.0.0" - typescript: "npm:^4.7.4" + typescript: "npm:^5.2.2" winston: "npm:^3.3.3" yaml: "npm:^1.10.2" yargs: "npm:^17.0.0" @@ -2707,7 +2707,7 @@ __metadata: "@arbitrum/sdk": "npm:~3.1.13" "@ethersproject/experimental": "npm:^5.7.0" "@graphprotocol/common-ts": "npm:^2.0.7" - "@graphprotocol/contracts": "workspace:^6.2.0" + "@graphprotocol/contracts": "workspace:^7.0.0" "@nomicfoundation/hardhat-network-helpers": "npm:^1.0.9" "@nomiclabs/hardhat-ethers": "npm:^2.2.3" "@types/chai": "npm:^4.3.9" @@ -2744,7 +2744,7 @@ __metadata: dependencies: "@ethersproject/experimental": "npm:^5.0.7" "@graphprotocol/client-cli": "npm:^2.0.2" - "@graphprotocol/contracts": "npm:^5.0.0" + "@graphprotocol/contracts": "workspace:^7.0.0" "@nomiclabs/hardhat-ethers": "npm:^2.0.0" "@nomiclabs/hardhat-etherscan": "npm:^3.1.7" "@nomiclabs/hardhat-waffle": "npm:^2.0.0" @@ -2778,7 +2778,7 @@ __metadata: solhint-plugin-prettier: "npm:^0.1.0" ts-node: "npm:^10.9.1" typechain: "npm:^5.0.0" - typescript: "npm:^4.0.2" + typescript: "npm:^5.2.2" languageName: unknown linkType: soft @@ -21601,7 +21601,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.0.2, typescript@npm:^4.7.4": +"typescript@npm:^4.0.2": version: 4.9.5 resolution: "typescript@npm:4.9.5" bin: @@ -21621,13 +21621,23 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^4.0.2#optional!builtin, typescript@patch:typescript@npm%3A^4.7.4#optional!builtin": +"typescript@npm:^5.2.2": + version: 5.4.2 + resolution: "typescript@npm:5.4.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 583ff68cafb0c076695f72d61df6feee71689568179fb0d3a4834dac343df6b6ed7cf7b6f6c801fa52d43cd1d324e2f2d8ae4497b09f9e6cfe3d80a6d6c9ca52 + languageName: node + linkType: hard + +"typescript@patch:typescript@npm%3A^4.0.2#optional!builtin": version: 4.9.5 resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin::version=4.9.5&hash=289587" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: e3333f887c6829dfe0ab6c1dbe0dd1e3e2aeb56c66460cb85c5440c566f900c833d370ca34eb47558c0c69e78ced4bfe09b8f4f98b6de7afed9b84b8d1dd06a1 + checksum: 583ff68cafb0c076695f72d61df6feee71689568179fb0d3a4834dac343df6b6ed7cf7b6f6c801fa52d43cd1d324e2f2d8ae4497b09f9e6cfe3d80a6d6c9ca52 languageName: node linkType: hard @@ -21641,6 +21651,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin": + version: 5.4.2 + resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin::version=5.4.2&hash=e012d7" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 22e2f213c3ffe5960c5eaec6c95c04e01858fed57a94be250746f540b935b2c18c3c3fc80d3ab65d28c0aba1eb76284557ba3bf521d28caee811c44ba2b648f9 + languageName: node + linkType: hard + "typewise-core@npm:^1.2, typewise-core@npm:^1.2.0": version: 1.2.0 resolution: "typewise-core@npm:1.2.0"