Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove subgraph #123

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,3 @@ ETHERSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
POLYGONSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
BASESCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
ARBISCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"

# SUBGRAPH

## The Graph credentials
GRAPH_KEY="zzzzzzzzzzzz"

## Subgraph
SUBGRAPH_NAME="osx"
SUBGRAPH_VERSION="alice-debug-1s"
SUBGRAPH_NETWORK_NAME="goerli" # ["mainnet", "goerli", "polygon", "polygonMumbai"]
7 changes: 0 additions & 7 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ sdk:
- 'sdk/*'
- '.github/workflows/sdk-*.yml'

subgraph:
- changed-files:
- any-glob-to-any-file:
- 'subgraph/**/*'
- 'subgraph/*'
- '.github/workflows/subgraph-*.yml'

configs:
- changed-files:
- any-glob-to-any-file:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/formatting-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,5 @@ jobs:
- name: 'Lint sdk ts and js'
run: yarn lint:sdk:ts >> $GITHUB_STEP_SUMMARY

- name: 'Lint subgraph ts and js'
run: yarn lint:subgraph:ts >> $GITHUB_STEP_SUMMARY

- name: 'Lint configs ts and js'
run: yarn lint:configs:ts >> $GITHUB_STEP_SUMMARY
4 changes: 2 additions & 2 deletions .github/workflows/reusable-check-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ jobs:
uses: actions/checkout@v3
- name: Get version from git tag
id: tag-info
# Expected format: X.Y.Z-sdk or X.Y.Z-subgraph or X.Y.Z-contracts
# Expected format: X.Y.Z-sdk or X.Y.Z-contracts
# Version = sed removes package name
# Package = splits by - and returns the last element
run: |
GITHUB_REF="${{ inputs.ref }}"
TAG=${GITHUB_REF##*/}
VERSION=$(echo "$TAG" | sed -E 's/-(sdk|subgraph|contracts|configs|artifacts)//')
VERSION=$(echo "$TAG" | sed -E 's/-(sdk|contracts|configs|artifacts)//')
PACKAGE=${TAG##*-}
echo "package=$PACKAGE" >> $GITHUB_OUTPUT
echo "version=$VERSION" >> $GITHUB_OUTPUT
27 changes: 0 additions & 27 deletions .github/workflows/subgraph-publish.yml

This file was deleted.

38 changes: 0 additions & 38 deletions .github/workflows/subgraph-tests.yml

This file was deleted.

1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ coverage.json
package-lock.json
pnpm-lock.yaml
yarn.lock
extended-schema.ts
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ The root folder of the repo includes four subfolders:
├── configs
├── contracts
├── sdk
├── subgraph
├── ...
└── package.json
```
Expand All @@ -21,8 +20,6 @@ The root folder of the repo includes four subfolders:
- The `contracts` folder contains Solidity smart contracts being used by the OSx framework and for plugin development.
- The `sdk` folder contains various JS/TS helper functions that can be used in the OSx repo and plugin repos for
for testing and deployment.
- The `subgraph` contains various JS/TS helper functions that can be used in the OSx repo and plugin repos for
subgraph development.

The root-level `package.json` file contains global `dev-dependencies` for formatting and linting. After installing the dependencies with

Expand Down Expand Up @@ -61,7 +58,6 @@ yarn lint
To be able to work on the contracts, make sure that you have created an `.env` file from the `.env.example` file and put in the API keys for

- [Alchemy](https://www.alchemy.com) that we use as the web3 provider
- [Alchemy Subgraphs](https://www.alchemy.com/subgraphs) that we use as the subgraph provider
- the block explorer that you want to use depending on the networks that you want to deploy to

You can also change the default hardhat private key (`PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"`).
Expand Down
2 changes: 1 addition & 1 deletion configs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This includes:
- Networks
- if it is a testnet or not
- chain ID
- alias for ethers and Alchemy subgraph
- alias for ethers
- Deployments of the OSx protocol grouped by network
- Version
- Contract name
Expand Down
22 changes: 5 additions & 17 deletions configs/src/networks/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export const networks: NetworkConfigs = {
aliases: {
ethers5: 'matic',
ethers6: 'matic',
alchemySubgraphs: 'matic',
},
},
[SupportedNetworks.MUMBAI]: {
Expand All @@ -52,51 +51,40 @@ export const networks: NetworkConfigs = {
aliases: {
ethers5: 'maticmum',
ethers6: 'matic-mumbai',
alchemySubgraphs: 'mumbai',
},
},
[SupportedNetworks.BASE]: {
isTestnet: false,
chainId: 8453,
gasPrice: 1000,
name: SupportedNetworks.BASE,
aliases: {
alchemySubgraphs: 'base',
},
aliases: {},
},
[SupportedNetworks.BASE_GOERLI]: {
isTestnet: true,
chainId: 84531,
gasPrice: 1000000,
name: SupportedNetworks.BASE_GOERLI,
aliases: {
alchemySubgraphs: 'base-testnet',
},
aliases: {},
},
[SupportedNetworks.BASE_SEPOLIA]: {
isTestnet: true,
chainId: 84532,
gasPrice: 1000000,
name: SupportedNetworks.BASE_SEPOLIA,
aliases: {
alchemySubgraphs: 'base-sepolia',
},
aliases: {},
},
[SupportedNetworks.ARBITRUM]: {
isTestnet: false,
chainId: 42161,
name: SupportedNetworks.ARBITRUM,
aliases: {
alchemySubgraphs: 'arbitrum-one',
},
aliases: {},
},
[SupportedNetworks.ARBITRUM_SEPOLIA]: {
isTestnet: true,
chainId: 421614,
name: SupportedNetworks.ARBITRUM_SEPOLIA,
aliases: {
alchemySubgraphs: 'arbitrum-sepolia',
},
aliases: {},
},
[SupportedNetworks.ZKSYNC_SEPOLIA]: {
chainId: 300,
Expand Down
1 change: 0 additions & 1 deletion configs/src/networks/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
export enum SupportedAliases {
ETHERS_5 = 'ethers5',
ETHERS_6 = 'ethers6',
ALCHEMY_SUBGRAPHS = 'alchemySubgraphs',
}

export enum SupportedNetworks {
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"lint:contracts:sol": "solhint --max-warnings 0 \"contracts/src/**/*.sol\"",
"lint:contracts:ts": "eslint --ext .js,.ts ./contracts/",
"lint:sdk:ts": "eslint --ext .js,.ts ./sdk/",
"lint:subgraph:ts": "eslint --ext .js,.ts ./subgraph/",
"prettier:check": "prettier --check \"**/*.{js,json,md,sol,ts,yml}\"",
"prettier:write": "prettier --write \"**/*.{js,json,md,sol,ts,yml}\""
}
Expand Down
3 changes: 1 addition & 2 deletions sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@

- common helper functionality for
- web3 interaction
- subgraph interaction
- file storage on IPFS
- retrieving addresses of deployed Aragon OSx framework contracts
- contract deployment
- contract testing
- base classes for creating custom JS clients on top of the built-in one.

- Extendable JS client with built-in Web3, Subgraph and IPFS
- Extendable JS client with built-in Web3 and IPFS
- Extendable context for holding inheritable configuration

## Installation
Expand Down
11 changes: 0 additions & 11 deletions subgraph/.eslintrc.yml

This file was deleted.

45 changes: 0 additions & 45 deletions subgraph/CHANGELOG.md

This file was deleted.

54 changes: 0 additions & 54 deletions subgraph/README.md

This file was deleted.

1 change: 0 additions & 1 deletion subgraph/index.ts

This file was deleted.

Loading
Loading