Skip to content

Commit

Permalink
chore: bump contracts package version
Browse files Browse the repository at this point in the history
Signed-off-by: Tomás Migone <tomas@edgeandnode.com>
  • Loading branch information
tmigone committed Mar 21, 2024
1 parent 075d270 commit 1b27dfa
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 40 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci-token-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ jobs:
- name: Set up environment
uses: ./.github/actions/setup
- name: Run tests
run: yarn test
run: |
pushd packages/token-distribution
yarn test
6 changes: 6 additions & 0 deletions packages/contracts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @graphprotocol/contracts

## 7.0.0

### Major Changes

- 9686ce1: Add Horizon staking interface

## 6.2.1

### Patch Changes
Expand Down
5 changes: 5 additions & 0 deletions packages/contracts/contracts/arbitrum/Arbitrum.md
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 3 additions & 3 deletions packages/contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphprotocol/contracts",
"version": "6.2.1",
"version": "7.0.0",
"description": "Contracts for the Graph Protocol",
"directories": {
"test": "test"
Expand Down Expand Up @@ -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",
Expand Down
12 changes: 11 additions & 1 deletion packages/contracts/scripts/build
Original file line number Diff line number Diff line change
@@ -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
20 changes: 0 additions & 20 deletions packages/contracts/scripts/prepack

This file was deleted.

1 change: 0 additions & 1 deletion packages/contracts/scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ source $(pwd)/scripts/evm
### Setup EVM

# Ensure we compiled sources

yarn build

### Cleanup
Expand Down
6 changes: 6 additions & 0 deletions packages/sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @graphprotocol/sdk

## 0.5.1

### Patch Changes

- Bump contracts dependency

## 0.5.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/sdk/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
7 changes: 7 additions & 0 deletions packages/token-distribution/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# @graphprotocol/token-distribution

## 1.2.1

### Patch Changes

- Bump contracts dependency
6 changes: 3 additions & 3 deletions packages/token-distribution/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphprotocol/token-distribution",
"version": "1.2.0",
"version": "1.2.1",
"description": "Graph Token Distribution",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
38 changes: 29 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand All @@ -21621,13 +21621,23 @@ __metadata:
languageName: node
linkType: hard

"typescript@patch:typescript@npm%3A^4.0.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.7.4#optional!builtin<compat/typescript>":
"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<compat/typescript>":
version: 4.9.5
resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>::version=4.9.5&hash=289587"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: e3333f887c6829dfe0ab6c1dbe0dd1e3e2aeb56c66460cb85c5440c566f900c833d370ca34eb47558c0c69e78ced4bfe09b8f4f98b6de7afed9b84b8d1dd06a1
checksum: 583ff68cafb0c076695f72d61df6feee71689568179fb0d3a4834dac343df6b6ed7cf7b6f6c801fa52d43cd1d324e2f2d8ae4497b09f9e6cfe3d80a6d6c9ca52
languageName: node
linkType: hard

Expand All @@ -21641,6 +21651,16 @@ __metadata:
languageName: node
linkType: hard

"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>":
version: 5.4.2
resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin<compat/typescript>::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"
Expand Down

0 comments on commit 1b27dfa

Please sign in to comment.