Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:aurora-is-near/aurora-engine int…
Browse files Browse the repository at this point in the history
…o feat/eip-7702
  • Loading branch information
mrLSD committed Dec 24, 2024
2 parents 86ae372 + 074db0d commit a37360e
Show file tree
Hide file tree
Showing 36 changed files with 1,340 additions and 881 deletions.
17 changes: 16 additions & 1 deletion .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@ jobs:
git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
- name: Clone the repository
uses: actions/checkout@v4
- run: cargo make build-contracts
- name: Update Node and Yarn
run: |
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install 18 && nvm alias default 18
npm install -g yarn
echo "$(dirname $(nvm which node))" >> $GITHUB_PATH
- name: Build contracts
run: cargo make build-contracts
- name: Run Contract cargo clippy
run: cargo make clippy
udeps:
Expand All @@ -51,6 +59,13 @@ jobs:
git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
- name: Clone the repository
uses: actions/checkout@v4
- name: Update Node and Yarn
run: |
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install 18 && nvm alias default 18
npm install -g yarn
echo "$(dirname $(nvm which node))" >> $GITHUB_PATH
- name: Run yarn lint
run: cargo make check-contracts
- name: Check committed EvmErc20.bin
Expand Down
28 changes: 24 additions & 4 deletions .github/workflows/scheduled_lints.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
on:
schedule:
- cron: '0 9 * * 1-5'
- cron: '0 8 * * 1-5'

name: Scheduled checks
jobs:
tests:
Expand All @@ -15,8 +16,19 @@ jobs:
- name: Potential broken submodules fix
run: |
git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
- name: Install dependencies
run: |
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
sudo apt update && sudo apt install -y yarn build-essential pkg-config libclang-dev libssl-dev
- name: Clone the repository
uses: actions/checkout@v4
- name: Install Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
cache: false
toolchain: stable
override: false
- name: Cargo Cache
uses: actions/cache@v4
with:
Expand All @@ -30,8 +42,8 @@ jobs:
- name: Setup Node and cache
uses: actions/setup-node@v4
with:
node-version: 16
cache: 'yarn'
node-version: 18
cache: yarn
cache-dependency-path: |
etc/eth-contracts
etc/tests/uniswap
Expand All @@ -58,7 +70,15 @@ jobs:
git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
- name: Clone the repository
uses: actions/checkout@v4
- run: cargo make check
- name: Update Node and Yarn
run: |
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install 18 && nvm alias default 18
npm install -g yarn
echo "$(dirname $(nvm which node))" >> $GITHUB_PATH
- name: Run checks
run: cargo make check
- uses: 8398a7/action-slack@v3
if: failure()
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
- name: Setup Node and cache
uses: actions/setup-node@v4
with:
node-version: 16
cache: 'yarn'
node-version: 18
cache: yarn
cache-dependency-path: |
etc/eth-contracts
etc/tests/uniswap
Expand Down
10 changes: 5 additions & 5 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixes

- Fixed underflow in the modexp gas calculation by [@guidovranken]. ([#883])
- Prevented subtraction underflow in th xcc module by [@guidovranken]. ([#888])
- Prevented subtraction underflow in the xcc module by [@guidovranken]. ([#888])
- Fixed balance and gas overflows in the xcc module by [@guidovranken]. ([#889])

### Changes
Expand Down Expand Up @@ -287,7 +287,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixes

- Use ibig implemenation of modexp by [@birchmd]. ([#778])
- Use ibig implementation of modexp by [@birchmd]. ([#778])

[#778]: https://github.com/aurora-is-near/aurora-engine/pull/778

Expand Down Expand Up @@ -504,9 +504,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changes

- Performance improvements by [@birchmd] and [@matklad]; the engine should now consume much less NEAR gas: ([#427]) ([#438]) ([#439]) ([#445]) ([#446])
- Security improvment: only Engine contract owner can use the `deploy_upgrade` method by [@birchmd]. ([#410])
- Security improvement: only Engine contract owner can use the `deploy_upgrade` method by [@birchmd]. ([#410])
- Bug fix: Engine now returns the error message in the case of a revert during an EVM contract deploy, previously it would always return an address (even when the deploy failed) by [@birchmd]. ([#424])
- Security improvment: Engine will no longer accept EVM transactions without a chain ID as part of their signature by [@birchmd]. This should have no impact on users as all modern Ethereum tooling includes the chain ID. ([#432])
- Security improvement: Engine will no longer accept EVM transactions without a chain ID as part of their signature by [@birchmd]. This should have no impact on users as all modern Ethereum tooling includes the chain ID. ([#432])
- Improvements to code quality by [@mrLSD]: ([#386]) ([#387])
- Improvements and additions to internal tests and benchmarks by [@birchmd]: ([#408]) ([#415]) ([#429])

Expand Down Expand Up @@ -592,7 +592,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Public method for computing Aurora blockhash at a given hight by [@birchmd]. ([#303](https://github.com/aurora-is-near/aurora-engine/pull/303))
- Public method for computing Aurora blockhash at a given height by [@birchmd]. ([#303](https://github.com/aurora-is-near/aurora-engine/pull/303))

### Changed

Expand Down
Loading

0 comments on commit a37360e

Please sign in to comment.