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

chore: sync with osx-plugin-template-hardhat #25

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1b4ff11
chore: merge develop into main (#38)
heueristik Feb 28, 2024
242baa8
feat: change the manifest data json struct
clauBv23 Mar 25, 2024
9def9c7
feat: change the script to get the correct params from the manifest data
clauBv23 Mar 25, 2024
f2c31ad
featL change to ens name
clauBv23 Mar 25, 2024
4b4aeca
feat: remove the ens domain due to it is not used
clauBv23 Mar 25, 2024
1adc665
feat: update deploy script to get the correct repo address
clauBv23 Mar 25, 2024
92f7304
Merge pull request #51 from aragon/OS-1148/improve-plugin-template-ma…
clauBv23 Mar 25, 2024
a7b45c3
feat: added IAction to template
jordaniza Mar 27, 2024
648a3e5
feat: bump matchstick version
clauBv23 Mar 28, 2024
5848694
Merge pull request #52 from aragon/f/iaction
jordaniza Apr 2, 2024
090db96
Merge branch 'develop' into feat/bump-matchstick-as-version
jordaniza Apr 2, 2024
8aab444
Merge pull request #54 from aragon/feat/bump-matchstick-as-version
clauBv23 Apr 2, 2024
99ea1da
fix: remove deprecated networks
clauBv23 Apr 2, 2024
f367715
fix: update the repository in the placeholder
clauBv23 Apr 2, 2024
0343bcb
Merge branch 'feat/bump-matchstick-as-version' into feat/improve-temp…
clauBv23 Apr 2, 2024
39a3b87
Merge pull request #55 from aragon/feat/improve-template-repo
clauBv23 Apr 3, 2024
5d892e4
fix: local deploy script problem with `generateRandomName` (#53)
heueristik Apr 11, 2024
d35e7e1
refactor: split upgrade repo script into two (#60)
heueristik Apr 15, 2024
5b1aada
refactor: remove IAction (#61)
jordaniza Apr 16, 2024
a779deb
chore: refactor helpers (#57)
heueristik Apr 18, 2024
be13d01
chore: bump osx-commons-sdk version (#62)
heueristik Apr 22, 2024
3e9e3b4
chore: sync with `osx-commons` (#63)
heueristik Apr 23, 2024
0671bcd
merge develop into main
heueristik May 3, 2024
c8e3819
chore: removed networks (#65)
heueristik May 3, 2024
f28735c
ci: remove not needed code (#66)
clauBv23 May 7, 2024
1a61f1d
ci: remove the module name and version (#67)
clauBv23 May 8, 2024
88ee6a2
Merge remote-tracking branch 'template/develop' into update-with-temp…
clauBv23 May 10, 2024
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
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# GENERAL

## The network used for testing purposes
NETWORK_NAME="sepolia" # ["mainnet", "sepolia", "polygon", "mumbai","baseMainnet", "baseGoerli", "baseSepolia", "arbitrum", "arbitrumSepolia"]
NETWORK_NAME="sepolia" # ["mainnet", "sepolia", "polygon", "baseMainnet", "arbitrum"]

# CONTRACTS

Expand Down Expand Up @@ -29,4 +29,4 @@ GRAPH_KEY="zzzzzzzzzzzz"
## Subgraph
SUBGRAPH_NAME="osx"
SUBGRAPH_VERSION="v1.0.0"
SUBGRAPH_NETWORK_NAME="mainnet" # ["mainnet", "goerli", "sepolia", "polygon", "polygonMumbai", "base", "baseSepolia", "arbitrum", "arbitrumSepolia"]
SUBGRAPH_NETWORK_NAME="mainnet" # ["mainnet", "sepolia", "polygon", "base", "arbitrum"]
2 changes: 1 addition & 1 deletion USAGE_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ GRAPH_KEY="zzzzzzzzzzzz"
## Subgraph
SUBGRAPH_NAME="osx"
SUBGRAPH_VERSION="v1.0.0"
SUBGRAPH_NETWORK_NAME="mainnet" # ["mainnet", "goerli", "sepolia", "polygon", "polygonMumbai", "base", "baseSepolia", "arbitrum", "arbitrumSepolia"]
SUBGRAPH_NETWORK_NAME="mainnet" # ["mainnet", "sepolia", "polygon", "base", "arbitrum"]
```

- `GRAPH_KEY`: This key will be used for deploying the subgraph.
Expand Down
12 changes: 0 additions & 12 deletions packages/contracts/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,10 @@ const config: HardhatUserConfig = {
etherscan: {
apiKey: {
mainnet: process.env.ETHERSCAN_API_KEY || '',
goerli: process.env.ETHERSCAN_API_KEY || '',
sepolia: process.env.ETHERSCAN_API_KEY || '',
polygon: process.env.POLYGONSCAN_API_KEY || '',
polygonMumbai: process.env.POLYGONSCAN_API_KEY || '',
base: process.env.BASESCAN_API_KEY || '',
baseGoerli: process.env.BASESCAN_API_KEY || '',
arbitrumOne: process.env.ARBISCAN_API_KEY || '',
arbitrumGoerli: process.env.ARBISCAN_API_KEY || '',
},
customChains: [
{
Expand All @@ -142,14 +138,6 @@ const config: HardhatUserConfig = {
browserURL: 'https://basescan.org',
},
},
{
network: 'baseGoerli',
chainId: 84531,
urls: {
apiURL: 'https://api-goerli.basescan.org/api',
browserURL: 'https://goerli.basescan.org',
},
},
],
},

Expand Down
2 changes: 0 additions & 2 deletions packages/contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"name": "@aragon/osx-plugin-template-contracts",
"version": "1.0.0",
"license": "AGPL-3.0-or-later",
"scripts": {
"build": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ describe(`Deployment on network '${productionNetworkName}'`, function () {
it('registers the setup', async () => {
const {pluginRepo} = await loadFixture(fixture);

await pluginRepo['getVersion((uint8,uint16))']({
release: VERSION.release,
build: VERSION.build,
});

const results = await pluginRepo['getVersion((uint8,uint16))']({
release: VERSION.release,
build: VERSION.build,
Expand Down
16 changes: 0 additions & 16 deletions packages/subgraph/manifest/data/arbitrumSepolia.json

This file was deleted.

16 changes: 0 additions & 16 deletions packages/subgraph/manifest/data/baseSepolia.json

This file was deleted.

16 changes: 0 additions & 16 deletions packages/subgraph/manifest/data/mumbai.json

This file was deleted.

5 changes: 3 additions & 2 deletions packages/subgraph/scripts/deploy-subgraph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ echo ''
echo '> Building subgraph'
./scripts/build-subgraph.sh

if [ "$SUBGRAPH_NETWORK_NAME" == 'localhost' ]; then
SUBGRAPH_NETWORK_NAME='goerli'
if [ "$SUBGRAPH_NETWORK_NAME" == 'localhost' ]
then
SUBGRAPH_NETWORK_NAME='sepolia'
fi

# Prepare subgraph name
Expand Down
Loading