From 7c8dd64ae63f3d16ff74459df1600e2a2af8d226 Mon Sep 17 00:00:00 2001 From: Vid Kersic Date: Sat, 28 Oct 2023 12:31:22 +0200 Subject: [PATCH 1/2] chore: move to org --- Cargo.toml | 2 +- Dockerfile | 2 +- README.md | 10 +++++----- crates/uopool/src/utils.rs | 2 +- docker-compose.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3d784cf0..56d65b4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ authors = ["Vid Kersic "] version = "0.3.0-alpha" edition = "2021" license = "MIT OR Apache-2.0" -repository = "https://github.com/Vid201/silius" +repository = "https://github.com/silius-rs/silius" rust-version = "1.71.1" [workspace.dependencies] diff --git a/Dockerfile b/Dockerfile index 75259de0..18dd0a09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,4 +35,4 @@ EXPOSE 3000 3001 ENTRYPOINT ["usr/local/bin/silius"] -LABEL org.opencontainers.image.source=https://github.com/Vid201/silius +LABEL org.opencontainers.image.source=https://github.com/silius-rs/silius diff --git a/README.md b/README.md index 9a3d480c..d21e4cbd 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ #

Silius

-![CI workflow](https://github.com/vid201/silius/actions/workflows/ci.yml/badge.svg) -![Docker workflow](https://github.com/vid201/silius/actions/workflows/publish_image.yml/badge.svg) +![CI workflow](https://github.com/silius-rs/silius/actions/workflows/ci.yml/badge.svg) +![Docker workflow](https://github.com/silius-rs/silius/actions/workflows/publish_image.yml/badge.svg) [![Telegram Group](https://img.shields.io/endpoint?color=neon&style=flat-square&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2F%2BsKeRcN4j3MM3NmNk)](https://t.me/+sKeRcN4j3MM3NmNk) -[![GitHub stars](https://img.shields.io/github/stars/vid201/silius.svg?style=social&label=Star&maxAge=2592000)](https://github.com/vid201/silius/stargazers/) -[![GitHub forks](https://img.shields.io/github/forks/vid201/silius.svg?style=social&label=Fork&maxAge=2592000)](https://github.com/vid201/silius/network/) +[![GitHub stars](https://img.shields.io/github/stars/silius-rs/silius.svg?style=social&label=Star&maxAge=2592000)](https://github.com/silius-rs/silius/stargazers/) +[![GitHub forks](https://img.shields.io/github/forks/silius-rs/silius.svg?style=social&label=Fork&maxAge=2592000)](https://github.com/silius-rs/silius/network/)

Silius - ERC-4337 (Account Abstraction) bundler implementation in Rust.

@@ -69,7 +69,7 @@ cargo run --release -- rpc --http --ws ### Docker ```bash -docker run --net=host -v ./bundler-spec-tests/keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266:/data/silius/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 -v ./db:/data/silius/db ghcr.io/vid201/silius:latest bundler --eth-client-address http://127.0.0.1:8545 --datadir data/silius --mnemonic-file data/silius/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --entry-points 0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789 --http --http.addr 0.0.0.0 --http.port 3000 --http.api eth,debug,web3 --ws --ws.addr 0.0.0.0 --ws.port 3001 --ws.api eth,debug,web3 --eth-client-proxy-address http://127.0.0.1:8545 +docker run --net=host -v ./bundler-spec-tests/keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266:/data/silius/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 -v ./db:/data/silius/db ghcr.io/silius-rs/silius:latest bundler --eth-client-address http://127.0.0.1:8545 --datadir data/silius --mnemonic-file data/silius/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --entry-points 0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789 --http --http.addr 0.0.0.0 --http.port 3000 --http.api eth,debug,web3 --ws --ws.addr 0.0.0.0 --ws.port 3001 --ws.api eth,debug,web3 --eth-client-proxy-address http://127.0.0.1:8545 ``` ## Supported networks diff --git a/crates/uopool/src/utils.rs b/crates/uopool/src/utils.rs index bd3177b6..7f41dd12 100644 --- a/crates/uopool/src/utils.rs +++ b/crates/uopool/src/utils.rs @@ -241,7 +241,7 @@ pub mod tests { } /// This test occurred overflow when previous `calculate_pre_verification_gas` is used. - /// previous `calculate_pre_verification_gas` is https://github.com/Vid201/silius/blob/bd79ea0e610adff8d77ba128f53befa8401a4d77/crates/uopool/src/utils.rs#L63-L84 + /// previous `calculate_pre_verification_gas` is https://github.com/silius-rs/silius/blob/bd79ea0e610adff8d77ba128f53befa8401a4d77/crates/uopool/src/utils.rs#L63-L84 #[test] fn pre_verification_gas_calculation_overflow() { let gas_oh = Overhead { diff --git a/docker-compose.yml b/docker-compose.yml index a746860c..b1d8d2bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: silius: - image: ghcr.io/vid201/silius:latest + image: ghcr.io/silius-rs/silius:latest network_mode: host volumes: - ./bundler-spec-tests/keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266:/data/silius/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 From 90e96dbd166b321238eea4aeb7d112f8c1088e3b Mon Sep 17 00:00:00 2001 From: Vid Kersic Date: Sat, 28 Oct 2023 15:45:24 +0200 Subject: [PATCH 2/2] fix: ci --- .github/workflows/ci.yml | 2 +- bundler-spec-tests/launcher.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8476afdd..b7332527 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,7 +94,7 @@ jobs: - run: pip install jq yq - - run: pdm install && git submodule update --init --recursive && cd @account-abstraction && git fetch --all --tags && git checkout tags/v0.6.0 -b v0.6.0 && yarn && yarn compile && cd ../spec && yarn && yarn build + - run: pdm install && git submodule update --init --recursive && cd @account-abstraction && git fetch --all --tags && git checkout v0.6.0 && yarn && yarn compile && cd ../spec && yarn && yarn build && cd .. - uses: actions/download-artifact@v3 with: diff --git a/bundler-spec-tests/launcher.sh b/bundler-spec-tests/launcher.sh index d51e26e5..36dfe3be 100755 --- a/bundler-spec-tests/launcher.sh +++ b/bundler-spec-tests/launcher.sh @@ -10,10 +10,9 @@ case $1 in start) docker-compose up -d - sleep 2 silius bundler \ --verbosity 4 \ - --eth-client-address ws://127.0.0.1:8546 \ + --eth-client-address http://127.0.0.1:8545 \ --mnemonic-file keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 \ --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 \ --entry-points 0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789 \ @@ -26,11 +25,12 @@ case $1 in --ws.port 3001 \ --ws.api eth,debug,web3 & echo $! > bundler.pid popd - cd @account-abstraction && yarn deploy --network localhost + cd @account-abstraction && yarn deploy --network localhost ;; stop) docker-compose down kill $(cat bundler.pid) + rm bundler.pid ;; *)