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

Prepare 2.2.0 release candidate #1727

Merged
merged 113 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
118249e
Add deploy test
DimaStebaev Jan 15, 2024
43483ca
Fix upgrade test
DimaStebaev Jan 15, 2024
26f2b9c
Fix upgrade test working directory
DimaStebaev Jan 15, 2024
352fc15
Fix codacy warnings
DimaStebaev Jan 15, 2024
4601260
Change upgrade test working directory
DimaStebaev Jan 15, 2024
8029c3d
Downgrade nodejs
DimaStebaev Jan 15, 2024
99271d9
Remove unnecessary comments
DimaStebaev Jan 16, 2024
fae872b
Merge pull request #1669 from skalenetwork/deploy-fix
DimaStebaev Jan 30, 2024
1190a8c
Merge pull request #1681 from skalenetwork/develop
DmytroNazarenko Mar 5, 2024
a5d86ce
Revert "Revert "Prepare infrastructure for skale-contracts""
DimaStebaev Sep 14, 2023
f187c28
Bump version
DimaStebaev Mar 6, 2024
049879e
Add schain ABI
DimaStebaev Mar 6, 2024
4ef96fa
Commit ABI to the repository
DimaStebaev Mar 6, 2024
5c4cd63
Add a job to commit ABIs
DimaStebaev Mar 15, 2024
9e9a0ee
Remove PR merged condition
DimaStebaev Mar 15, 2024
57169d7
Fix calculate version script path
DimaStebaev Mar 15, 2024
55202e7
Change path to calculate version script
DimaStebaev Mar 15, 2024
4fecb8b
Fix working directory
DimaStebaev Mar 15, 2024
7d11327
Fix path to artifacts
DimaStebaev Mar 15, 2024
ce420ae
Update artifacts name
DimaStebaev Mar 15, 2024
1e1fd78
Add wildcard to artifacts path
DimaStebaev Mar 19, 2024
e52dd9c
Update publish condition
DimaStebaev Mar 20, 2024
b5e7a28
Update deployed version
DimaStebaev Mar 20, 2024
a94ab52
Merge pull request #1590 from skalenetwork/revert-1588-revert-1575-sk…
DimaStebaev Mar 21, 2024
438d7a2
Merge pull request #1693 from skalenetwork/develop
DimaStebaev Mar 21, 2024
af1cbf9
Merge branch 'beta' into release-2.1.0
DimaStebaev Mar 21, 2024
209817c
Replace localhost network with schain
DimaStebaev Mar 22, 2024
e685ebe
Replace localhost with 127.0.0.1
DimaStebaev Mar 22, 2024
afb3e06
Merge pull request #1692 from skalenetwork/release-2.1.0
DimaStebaev Mar 25, 2024
eeb0e0e
Merge pull request #1695 from skalenetwork/beta
DimaStebaev Mar 27, 2024
e8aa7da
Merge branch 'v2.2.0' into release-2.1.0
DimaStebaev Mar 27, 2024
3c667f8
Merge pull request #1697 from skalenetwork/release-2.1.0
DimaStebaev Mar 27, 2024
228428d
Bump version
DimaStebaev Sep 19, 2024
5edc297
Remove proxy folder
DimaStebaev Sep 19, 2024
7da7aba
Fix contracts testing github actions workflow
DimaStebaev Sep 19, 2024
775978f
Fix publishing
DimaStebaev Sep 19, 2024
5f4a6f8
Fix eslint warnings
DimaStebaev Sep 19, 2024
4fcaf0b
Fix paths in upgrade test
DimaStebaev Sep 20, 2024
8680fa2
Move to PoS
DimaStebaev Sep 20, 2024
0d9acf1
Fix paths
DimaStebaev Sep 20, 2024
6640b24
Add code owners
DimaStebaev Sep 20, 2024
47927dd
Fix name
DimaStebaev Sep 20, 2024
dbf34f5
Remove version
DimaStebaev Sep 20, 2024
1d5679f
Configure dependabot
DimaStebaev Sep 20, 2024
366c51a
Update deployment documentation
DimaStebaev Sep 23, 2024
fd0f5db
Merge pull request #1706 from skalenetwork/proxy-folder
DimaStebaev Sep 24, 2024
17d41ed
Update gas price calculation in CommunityPool contract
yavrsky Sep 24, 2024
8d04f4e
Add tests
yavrsky Sep 24, 2024
3f50d25
Rename function to _getMinEthDeposit
yavrsky Oct 7, 2024
68f06c0
Merge pull request #1709 from skalenetwork/gas-wallet-improvement
yavrsky Oct 9, 2024
dc4bd8f
Decrease version
DimaStebaev Oct 14, 2024
a109316
Merge pull request #1712 from skalenetwork/align-release
DmytroNazarenko Oct 14, 2024
aaad0b7
Update README.md
DmytroNazarenko Oct 16, 2024
cbcfbc6
Update README.md
DmytroNazarenko Oct 16, 2024
4723ea5
Merge pull request #1713 from skalenetwork/DmytroNazarenko-patch-2
DmytroNazarenko Oct 16, 2024
35ce204
Add commit reference
DimaStebaev Oct 16, 2024
b80bc41
Merge pull request #1714 from skalenetwork/release-tag
DmytroNazarenko Oct 16, 2024
6972905
Update commit reference
DimaStebaev Oct 16, 2024
189ee99
Merge pull request #1715 from skalenetwork/release-tag
DmytroNazarenko Oct 16, 2024
417fa9a
Update package.json dependencies and fix version path for deployment …
yavrsky Nov 12, 2024
0bd9c2e
Replace hardhat plugins with updated versions for verification and ma…
yavrsky Nov 12, 2024
6245de6
Refactor helper scripts for deployment in tests
yavrsky Nov 12, 2024
2d64d75
Refactor DepositBoxes
yavrsky Nov 12, 2024
0ce05b9
Refactor TokenManagers
yavrsky Nov 12, 2024
1923ff6
FIix solidity compile
yavrsky Nov 12, 2024
a914c09
Refactor CommunityLocker
yavrsky Nov 12, 2024
42646c3
Refactor and add couple tests in CommunityPool
yavrsky Nov 12, 2024
257e758
Refactor ERCOnChain tests and Linker
yavrsky Nov 12, 2024
d37c474
Fix MessageProxy tests
yavrsky Nov 12, 2024
93faa73
Refactor deployMainnet script
yavrsky Nov 12, 2024
09ab382
Refactor upgradeMainnet script
yavrsky Nov 12, 2024
64f5ee5
Fix deploySkaleManagerComponents script
yavrsky Nov 12, 2024
dfe7022
Fix test_upgrade script
yavrsky Nov 12, 2024
9cb2ba2
Add excludes for tsconfig.json
yavrsky Nov 12, 2024
c785000
Fix eslinter
yavrsky Nov 12, 2024
08f460a
Fix calculateGas test
yavrsky Nov 12, 2024
6c044e7
Update test_deploy script to deploy only to mainnet
yavrsky Nov 12, 2024
33c432e
Comment storing new abi after upgrade
yavrsky Nov 12, 2024
e62cfe6
Refactor deployMainnet script
yavrsky Nov 13, 2024
01749f2
Remove stringKeccak256, use ethers.id instead
yavrsky Nov 13, 2024
7feb173
Update TypeScript configuration and refactor BigInt usage in tests
yavrsky Nov 13, 2024
9a0e9a0
Refactor contract interaction to use instance directly instead of get…
yavrsky Nov 13, 2024
db7a09b
Upgrade dependencies for eslint
yavrsky Nov 13, 2024
a4183ff
Add SkaleManagerMock
yavrsky Nov 14, 2024
6915f26
Fix deployMainnet.ts
yavrsky Nov 14, 2024
ba8d003
Add deploy of SkaleManager to deploySkaleManagerComponents script
yavrsky Nov 14, 2024
1931cdf
Fix linters
yavrsky Nov 14, 2024
d10d7e1
Add handler for transaction receipts in calculateGas.ts
yavrsky Nov 14, 2024
975d2f3
Fix linter
yavrsky Nov 14, 2024
912a61a
Add generation of new abi's
yavrsky Nov 15, 2024
88782a8
Fix deploy script for schain part
yavrsky Nov 15, 2024
7be6507
Fix deploySchain.ts
yavrsky Nov 18, 2024
3afbb70
Fix hotfixUpgrade script
yavrsky Nov 18, 2024
53222fe
Fix submitTransaction.ts
yavrsky Nov 18, 2024
630249a
Fix transferOwnership.ts
yavrsky Nov 18, 2024
5041226
Change name for generated abi's
yavrsky Nov 18, 2024
fa75d8d
Fix test_upgrade.sh
yavrsky Nov 18, 2024
8856adc
Fix getVersion
yavrsky Nov 18, 2024
2ced3c5
Use assert to fix eslint no-unused-expressions
yavrsky Nov 18, 2024
e74edcd
Remove unused function stringToHex
yavrsky Nov 18, 2024
61cc023
Rename SkaleManager to SkaleManagerMock
yavrsky Nov 18, 2024
05b7583
Remove .only
yavrsky Nov 18, 2024
3a15d9f
Remove isTrue
yavrsky Nov 18, 2024
1ad91a2
Bump upgrade-tools version
yavrsky Nov 19, 2024
601d265
Merge pull request #1721 from skalenetwork/tech-debt
DmytroNazarenko Nov 19, 2024
16d4a08
Merge pull request #1722 from skalenetwork/v2.2.0
DmytroNazarenko Nov 19, 2024
c466edd
Bump hardhat from 2.22.15 to 2.22.16
dependabot[bot] Nov 19, 2024
73dd696
Merge pull request #1726 from skalenetwork/develop
DmytroNazarenko Nov 19, 2024
b9cdb50
Merge pull request #1724 from skalenetwork/dependabot/npm_and_yarn/ha…
DimaStebaev Nov 19, 2024
6dfcd69
Add rc branch and update calculate_version.sh
yavrsky Nov 20, 2024
bcf9595
Merge branch 'develop' into hotfix-rc
yavrsky Nov 20, 2024
86c207a
Merge pull request #1729 from skalenetwork/hotfix-rc
yavrsky Nov 20, 2024
346a8b9
Merge pull request #1730 from skalenetwork/develop
DmytroNazarenko Nov 20, 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: 3 additions & 1 deletion proxy/.eslintrc.cjs → .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ module.exports = {

},
ignorePatterns: [

"coverage/**",
"typechain-types/**",
"**/venv/**"
]
};
69 changes: 0 additions & 69 deletions .eslintrc.js

This file was deleted.

10 changes: 10 additions & 0 deletions .githooks/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

set -e

if [[ $(npx cspell -- --no-summary $1 2> /dev/null) ]]
then
echo "It looks like you have spell-checking errors in your commit message."
npx cspell -- --no-summary $1
exit 1
fi
17 changes: 17 additions & 0 deletions .githooks/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

# cSpell:words gpgsign

set -e

GPG_SIGN_ENABLED=$(git config commit.gpgsign || true)
if ! [[ "$GPG_SIGN_ENABLED" == "true" ]]
then
echo "Enable GPG signature for new commits";
exit 1;
fi

files=$(git diff --cached --name-only)
npx cspell -- --no-summary $files

yarn fullCheck
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* @DimaStebaev @DmytroNazarenko
*.md @skalenetwork/docowners
16 changes: 9 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/proxy"
schedule:
interval: "weekly"
day: "saturday"
allow:
- dependency-type: "production"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "pip"
directory: "/scripts/"
schedule:
interval: "weekly"
3 changes: 2 additions & 1 deletion .github/workflows/issue_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
jobs:
check-linked-issues:
name: Check if pull request has linked issues
if: ${{ !startsWith(github.head_ref, 'dependabot/') }}
runs-on: ubuntu-latest
steps:
- name: Get issues
Expand All @@ -15,5 +16,5 @@ jobs:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
- name: PR has not linked issues
if: join(steps.get-issues.outputs.issues) == ''
run:
run:
exit 1
153 changes: 76 additions & 77 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
name: Build and publish
name: publish

# cspell:words PYPI_TOKEN ncipollo

on:
pull_request:
Expand All @@ -7,98 +9,90 @@ on:
- 'v*.*.*'
- develop
- beta
- release-candidate
- stable
push:
tags:
- 'custom-release-*'
DmytroNazarenko marked this conversation as resolved.
Show resolved Hide resolved

env:
NODE_VERSION: 18
PYTHON_VERSION: 3.8

jobs:
build:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true

if: github.event_name != 'pull_request' || github.event.pull_request.merged == true

env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
PROXY_DIR: "proxy"
steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
outputs:
version: ${{ steps.version.outputs.version }}

- uses: actions/cache@v2
steps:
- uses: actions/checkout@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
submodules: recursive

- name: Install NODE JS
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: ${{ env.NODE_VERSION }}
cache: 'yarn'

- name: Install Python 3.8
uses: actions/setup-python@v2
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: ${{ env.PYTHON_VERSION }}
cache: 'pip'
cache-dependency-path: predeployed/test/requirements.txt

- name: Prepare for pip package building
run: |
python3 -m pip install --upgrade build
python3 -m pip install --user --upgrade twine

- name: Install project
working-directory: ${{env.PROXY_DIR}}
run: |
yarn install
run: yarn install

- name: Calculate version
id: version
run: |
export BRANCH=${GITHUB_REF##*/}
echo "Branch $BRANCH"
export VERSION=$(bash ./scripts/calculate_version.sh)
echo "VERSION=$VERSION" >> $GITHUB_ENV
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
echo "Version $VERSION"
( test $BRANCH = "stable" && export PRERELEASE=false ) || export PRERELEASE=true
echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV

- name: Generate Manifest
working-directory: ${{env.PROXY_DIR}}
run: |
npx hardhat run migrations/generateManifest.ts
run: npx hardhat run migrations/generateManifest.ts

- name: Install python testing staff
working-directory: ${{env.PROXY_DIR}}
run: pip3 install -r predeployed/test/requirements.txt

- name: Build predeployed pip package
working-directory: ${{env.PROXY_DIR}}
env:
VERSION: ${{ env.VERSION }}
run: |
./predeployed/scripts/build_package.sh
run: ./predeployed/scripts/build_package.sh

- name: Publish predeployed pip package
working-directory: ${{env.PROXY_DIR}}
env:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
run: |
./predeployed/scripts/publish_package.sh
run: ./predeployed/scripts/publish_package.sh

- name: Generate mainnet ABIs
env:
VERSION: ${{ env.VERSION }}
run: npx hardhat run scripts/generateAbi.ts

- name: Generate ABIs
working-directory: ${{env.PROXY_DIR}}/predeployed
- name: Generate predeployed ABIs
working-directory: predeployed
env:
VERSION: ${{ env.VERSION }}
run: |
Expand All @@ -108,47 +102,52 @@ jobs:
mkdir data
python scripts/generate_abi.py > data/ima-$VERSION-predeployed-abi.json

- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Store artifacts
uses: actions/upload-artifact@v4
with:
tag_name: ${{ env.VERSION }}
release_name: ${{ env.VERSION }}
draft: false
prerelease: ${{ env.PRERELEASE }}

- name: Upload Release Assets
id: upload-release-assets
uses: dwenegar/upload-release-assets@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
release_id: ${{ steps.create_release.outputs.id }}
assets_path: proxy/predeployed/dist/
name: data
path: data

- name: Upload Release Assets
id: upload-static-data
uses: dwenegar/upload-release-assets@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
release_id: ${{ steps.create_release.outputs.id }}
assets_path: proxy/predeployed/data/

- name: Upload Release Assets
id: upload-manifest-data
uses: dwenegar/upload-release-assets@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create Release
uses: ncipollo/release-action@v1
with:
release_id: ${{ steps.create_release.outputs.id }}
assets_path: proxy/data/ima-schain-*-manifest.json
tag: ${{ env.VERSION }}
commit: ${{ github.sha }}
prerelease: ${{ env.PRERELEASE }}
artifacts: "predeployed/dist/*,\
predeployed/data/*,\
data/ima-schain-*-manifest.json,\
data/*-abi.json"

- name: Build and publish image
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: scripts/build_and_publish_image.sh

abi:
runs-on: ubuntu-latest

needs:
build

env:
VERSION: ${{ needs.build.outputs.version }}

steps:
- uses: actions/checkout@v4
with:
ref: abi

- name: Load artifacts
uses: actions/download-artifact@v4
with:
name: data

- name: Commit ABI
uses: EndBug/add-and-commit@v9
with:
default_author: github_actions
message: "Add ABI for version ${{ env.VERSION }}"
add: "*-abi.json"
Loading
Loading