Merge branch 'main' into issue-1623

Signed-off-by: xermicus <cyrill@parity.io>
hyperledger · Feb 28, 2024 · a9b7e02 · a9b7e02
2 parents 4d3b541 + 5cab937
commit a9b7e02
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v3.1.0
       with:
         submodules: recursive
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - name: Build
       run: cargo build --verbose --release
     - name: Run tests
@@ -38,7 +38,7 @@ jobs:
       uses: actions/checkout@v3.1.0
       with:
         submodules: recursive
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - name: Build
       run: cargo build --verbose --release
     - name: Run tests
@@ -65,7 +65,7 @@ jobs:
       run: unzip c:\llvm.zip -d c:/
     - name: Add LLVM to Path
       run: echo "c:\llvm16.0\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
       with:
         components: clippy
     - name: Build
@@ -88,7 +88,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - name: Get LLVM
       run: curl -sSL --output llvm16.0-mac-arm.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm16-0/llvm16.0-mac-arm.tar.xz
     - name: Extract LLVM
@@ -118,7 +118,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - name: Get LLVM
       run: wget -q -O llvm16.0-mac-intel.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm16-0/llvm16.0-mac-intel.tar.xz
     - name: Extract LLVM

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -63,7 +63,7 @@ jobs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.72.0
+        toolchain: 1.74.0
         components: |
           llvm-tools
           clippy
@@ -117,7 +117,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - name: Build
       run: cargo build --verbose
     - name: Run tests
@@ -144,7 +144,7 @@ jobs:
     # Use C:\ as D:\ might run out of space
     - name: "Use C: for rust temporary files"
       run: echo "CARGO_TARGET_DIR=C:\target" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
       with:
         components: clippy
     # We run clippy on Linux in the lint job above, but this does not check #[cfg(windows)] items
@@ -170,7 +170,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - name: Get LLVM
       run: curl -sSL --output llvm16.0-mac-arm.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm16-0/llvm16.0-mac-arm.tar.xz
     - name: Extract LLVM
@@ -196,7 +196,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - name: Get LLVM
       run: wget -q -O llvm16.0-mac-intel.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm16-0/llvm16.0-mac-intel.tar.xz
     - name: Extract LLVM
@@ -258,7 +258,7 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: '16'
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - name: Setup yarn
       run: npm install -g yarn
     - uses: actions/download-artifact@v3
@@ -309,7 +309,7 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: '16'
-    - uses: dtolnay/rust-toolchain@1.72.0
+    - uses: dtolnay/rust-toolchain@1.74.0
     - uses: actions/download-artifact@v3
       with:
         name: solang-linux-x86-64
@@ -486,7 +486,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.72.0
+          toolchain: 1.74.0
           components: llvm-tools
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov

diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 build = "build.rs"
 description = "Solang Solidity Compiler"
 keywords = [ "solidity", "compiler", "solana", "polkadot", "substrate" ]
-rust-version = "1.72.0"
+rust-version = "1.74.0"
 edition = "2021"
 exclude = [ "/.*", "/docs",  "/examples", "/solana-library", "/tests", "/integration", "/vscode", "/testdata" ]
 
@@ -21,8 +21,8 @@ rand = "0.8"
 num-bigint = { version = "0.4", features = ["rand"]}
 num-traits = "0.2"
 num-integer = "0.1"
-clap = {version = "4.1", features = ["derive"]}
-clap_complete = "4.1"
+clap = {version = "4.5", features = ["derive"]}
+clap_complete = "4.5"
 hex = "0.4"
 tiny-keccak = { version = "2.0", features = ["keccak"] }
 serde_json = "1.0"

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ COPY . src
 WORKDIR /src/stdlib/
 RUN make
 
-RUN rustup default 1.72.0
+RUN rustup default 1.74.0
 
 WORKDIR /src
 RUN cargo build --release

diff --git a/docs/installing.rst b/docs/installing.rst
@@ -89,7 +89,7 @@ Option 5: Build Solang from source
 
 In order to build Solang from source, you will need:
 
-* Rust version 1.72.0 or higher
+* Rust version 1.74.0 or higher
 * A C++ compiler with support for C++17
 * A build of LLVM based on the Solana LLVM tree. There are a few LLVM patches required that are not upstream yet.