Skip to content

Commit

Permalink
Merge pull request #158 from api3dao/main
Browse files Browse the repository at this point in the history
Initiate release
  • Loading branch information
bbenligiray authored Jul 3, 2024
2 parents cedcd48 + 0fc8197 commit d926cf9
Show file tree
Hide file tree
Showing 20 changed files with 4,749 additions and 6,716 deletions.
2 changes: 2 additions & 0 deletions .changeset/green-snails-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/little-pumpkins-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@api3/contracts': major
---

Remove berachain-testnet dAPI support
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
extends: ['./node_modules/@api3/commons/dist/eslint/universal'],
extends: ['plugin:@api3/eslint-plugin-commons/universal'],
parserOptions: {
project: ['./tsconfig.json'],
},
Expand All @@ -12,6 +12,7 @@ module.exports = {
'lodash/prefer-constant': 'off',

'unicorn/filename-case': 'off',
'unicorn/no-anonymous-default-export': 'off',
'unicorn/prefer-export-from': 'off',
'unicorn/prefer-object-from-entries': 'off',
'unicorn/prefer-ternary': 'off',
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/continuous-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: Set up Node
uses: actions/setup-node@v4
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Set up pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: Set up Node
uses: actions/setup-node@v4
Expand All @@ -66,28 +66,28 @@ jobs:
steps:
- name: Clone @api3/contracts
uses: actions/checkout@v4

- name: Set up pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: '20.x'
cache: 'pnpm'

- name: Install dependencies
run: pnpm install

- name: Validate deployment config
run: pnpm validate-deployment-config

- name: Validate deployments
run: pnpm validate-deployments
if: always()

- name: Verify deployments
run: pnpm verify-deployments
if: always()
if: always()
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: Set up Node
uses: actions/setup-node@v4
Expand Down Expand Up @@ -59,4 +59,4 @@ jobs:
if: steps.changesets.outputs.published == 'true'
run: gh pr create -B main -H production --title 'Merge production to main' --body 'This PR is created automatically after a release' --reviewer bbenligiray
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 0 additions & 1 deletion data/chain-support.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"avalanche-testnet",
"base",
"base-sepolia-testnet",
"berachain-testnet",
"bitlayer",
"bitlayer-testnet",
"blast",
Expand Down
1 change: 0 additions & 1 deletion data/manager-multisig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"avalanche-testnet": "0x33E6C2f5Fa6aA18254927F55b0C5b5B975Ec1358",
"base": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
"base-sepolia-testnet": "0x25C6f371Cf8d4200B89dF84f9dE69d011013B086",
"berachain-testnet": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
"bitlayer": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
"bitlayer-testnet": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
"blast": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
Expand Down
13 changes: 5 additions & 8 deletions deploy/3_document.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as fs from 'node:fs';
import * as path from 'node:path';
import { join } from 'node:path';

import { CHAINS } from '@api3/chains';
import type { AddressLike } from 'ethers';
Expand Down Expand Up @@ -37,7 +37,7 @@ module.exports = () => {
...(chainsSupportedByOevAuctions.includes(network) ? ['OevAuctionHouse'] : []),
];
for (const contractName of contractNames) {
const deployment = JSON.parse(fs.readFileSync(path.join('deployments', network, `${contractName}.json`), 'utf8'));
const deployment = JSON.parse(fs.readFileSync(join('deployments', network, `${contractName}.json`), 'utf8'));
references[contractName] = { ...references[contractName], [chainId]: deployment.address };
if (!deployment.receipt) {
throw new Error(`${network} ${contractName} missing deployment tx receipt`);
Expand All @@ -48,13 +48,10 @@ module.exports = () => {
};
}
}
fs.writeFileSync(path.join('deployments', 'addresses.json'), `${JSON.stringify(references, null, 2)}\n`);
fs.writeFileSync(join('deployments', 'addresses.json'), `${JSON.stringify(references, null, 2)}\n`);
fs.writeFileSync(join('deployments', 'block-numbers.json'), `${JSON.stringify(deploymentBlockNumbers, null, 2)}\n`);
fs.writeFileSync(
path.join('deployments', 'block-numbers.json'),
`${JSON.stringify(deploymentBlockNumbers, null, 2)}\n`
);
fs.writeFileSync(
path.join('deployments', 'manager-multisig-addresses.json'),
join('deployments', 'manager-multisig-addresses.json'),
`${JSON.stringify(
Object.entries(managerMultisigAddresses).reduce((acc, [alias, address]) => {
return { ...acc, [CHAINS.find((chain) => chain.alias === alias)!.id]: address };
Expand Down
4 changes: 0 additions & 4 deletions deployments/addresses.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"59902": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
"60808": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
"80002": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
"80085": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
"81457": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
"84532": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
"167000": "0xF6d2675468989387e96127546e0CBC9A384fa418",
Expand Down Expand Up @@ -142,7 +141,6 @@
"59902": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
"60808": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
"80002": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
"80085": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
"81457": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
"84532": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
"167000": "0x2ab9f26E18B64848cd349582ca3B55c2d06f507d",
Expand Down Expand Up @@ -223,7 +221,6 @@
"59902": "0x709944a48cAf83535e43471680fDA4905FB3920a",
"60808": "0x709944a48cAf83535e43471680fDA4905FB3920a",
"80002": "0x709944a48cAf83535e43471680fDA4905FB3920a",
"80085": "0x709944a48cAf83535e43471680fDA4905FB3920a",
"81457": "0x709944a48cAf83535e43471680fDA4905FB3920a",
"84532": "0x709944a48cAf83535e43471680fDA4905FB3920a",
"167000": "0x55Cf1079a115029a879ec3A11Ba5D453272eb61D",
Expand Down Expand Up @@ -304,7 +301,6 @@
"59902": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
"60808": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
"80002": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
"80085": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
"81457": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
"84532": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
"167000": "0x1DCE40DC2AfA7131C4838c8BFf635ae9d198d1cE",
Expand Down
1 change: 0 additions & 1 deletion deployments/berachain-testnet/.chainId

This file was deleted.

Loading

0 comments on commit d926cf9

Please sign in to comment.