refactor (#40)

* refactor

Author: 0g-peterzhb

.github/actions/setup-rust/action.yml

@@ -2,11 +2,11 @@ name: Setup Rust (cache & toolchain)
 runs:
   using: composite
   steps:
-    - name: Install toolchain 1.75.0
+    - name: Install toolchain 1.78.0
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.75.0
+        toolchain: 1.78.0
         components: rustfmt, clippy
 
     - uses: Swatinem/rust-cache@v2

.github/workflows/cc.yml

@@ -29,7 +29,7 @@ jobs:
         swap-storage: true
 
     - name: Checkout sources
-      uses: actions/checkout@v3
+      uses: actions/checkout@v5
       with:
         submodules: recursive
 
@@ -45,10 +45,13 @@ jobs:
         RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Copt-level=0 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests'
 
     - id: coverage
-      uses: actions-rs/grcov@v0.1
+      uses: SierraSoftworks/setup-grcov@v1
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        version: 0.9.1
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         file: ${{ steps.coverage.outputs.report }}
         # Disable to avoid CI failure as following:

.github/workflows/rust.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Setup Rust (cache & toolchain)
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Setup Rust (cache & toolchain)
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Setup Rust (cache & toolchain)

.github/workflows/tests.yml

@@ -29,8 +29,9 @@ jobs:
         swap-storage: true
 
     - name: Checkout sources
-      uses: actions/checkout@v3
+      uses: actions/checkout@v5
       with:
+        persist-credentials: false   # prevents writing the extraheader
         submodules: recursive
 
     - name: Setup Rust (cache & toolchain)
@@ -39,10 +40,10 @@ jobs:
     - name: Build
       run: cargo build --release --verbose
 
-    - name: Set up Python 3.9
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: '3.9'
+        python-version: '3.11'
         cache: 'pip'
 
     - name: Install dependencies

Cargo.lock

@@ -16,11 +16,11 @@ enr = { path = "version-meld/enr" }
 discv5 = { path = "version-meld/discv5" }
 
 [workspace.dependencies]
-append_merkle = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
-merkle_light = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
-merkle_tree = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
-shared_types = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
-task_executor = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
-storage = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54", package = "storage" }
-contract-interface = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
+append_merkle = { git = "https://github.com/0gfoundation/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
+merkle_light = { git = "https://github.com/0gfoundation/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
+merkle_tree = { git = "https://github.com/0gfoundation/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
+shared_types = { git = "https://github.com/0gfoundation/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
+task_executor = { git = "https://github.com/0gfoundation/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
+storage = { git = "https://github.com/0gfoundation/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54", package = "storage" }
+contract-interface = { git = "https://github.com/0gfoundation/0g-storage-node.git",rev = "96f846073f111adfa31df926be0e4a25e0b85f54" }
 metrics = { git = "https://github.com/Conflux-Chain/conflux-rust.git", rev = "992ebc5483d937c8f6b883e266f8ed2a67a7fa9a" }

Cargo.toml

@@ -17,7 +17,7 @@ tokio = { version = "1.19.2", features = ["macros", "sync"] }
 tracing = "0.1.35"
 merkle_light = { workspace = true }
 merkle_tree = { workspace = true }
-zgs_rpc = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "96f846073f111adfa31df926be0e4a25e0b85f54", package = "rpc" }
+zgs_rpc = { git = "https://github.com/0gfoundation/0g-storage-node.git", rev = "96f846073f111adfa31df926be0e4a25e0b85f54", package = "rpc" }
 futures-channel = "^0.3"
 ethereum-types = "0.14"
 storage_with_stream = { path = "../storage_with_stream" }

node/rpc/Cargo.toml

@@ -20,8 +20,8 @@ ethers = { version = "^2", features = ["ws"] }
 serde_json = "1.0.127"
 storage_with_stream = { path = "../storage_with_stream" }
 rpc = {path = "../rpc"}
-zgs_rpc = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "96f846073f111adfa31df926be0e4a25e0b85f54", package = "rpc" }
-zgs_storage = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "96f846073f111adfa31df926be0e4a25e0b85f54", package = "storage" }
+zgs_rpc = { git = "https://github.com/0gfoundation/0g-storage-node.git", rev = "96f846073f111adfa31df926be0e4a25e0b85f54", package = "rpc" }
+zgs_storage = { git = "https://github.com/0gfoundation/0g-storage-node.git", rev = "96f846073f111adfa31df926be0e4a25e0b85f54", package = "storage" }
 contract-interface = { workspace = true }
 rusqlite = { version = "0.28.0", features = ["bundled"] }
 tracing = "0.1.35"

node/stream/Cargo.toml

@@ -1,10 +1,10 @@
 jsonrpcclient==4.0.3
 pyyaml==6.0.1
-pysha3==1.0.2
-coincurve==18.0.0
-eth-utils==3.0.0
+safe-pysha3==1.0.4
+coincurve==20.0.0
+eth-utils==5.1.0
 py-ecc==7.0.0
-web3==6.14.0
+web3==7.5.0
 eth_tester
 cffi==1.16.0
-rtoml==0.10.0
+rtoml==0.11.0

requirements.txt

@@ -1 +1 @@
-1.75.0
+1.78.0