merge main

.github/workflows/check-publish.yml

@@ -0,0 +1,45 @@
+name: check-publish
+# This workflow checks that the libraries can be published on crates.io.
+permissions:
+ contents: read
+on:
+ push:
+ branches: [ main ]
+ pull_request:
+concurrency:
+ group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+env:
+ CARGO_TERM_COLOR: always
+jobs:
+ check-publish:
+ name: Check publish on crates.io
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: set up rust
+ uses: dtolnay/rust-toolchain@master
+ id: toolchain
+ with:
+ target: wasm32-unknown-unknown
+ components: rust-src
+ toolchain: nightly-2024-01-01
+
+ - uses: Swatinem/rust-cache@v2
+
+ - name: check motsu-proc
+ run: cargo publish -p motsu-proc --dry-run
+
+ - name: check motsu
+ run: cargo publish -p motsu --dry-run
+
+ - name: check openzeppelin-crypto
+ run: cargo publish -p openzeppelin-crypto --target wasm32-unknown-unknown --dry-run
+
+ - name: check openzeppelin-stylus-proc
+ run: cargo publish -p openzeppelin-stylus-proc --target wasm32-unknown-unknown --dry-run
+
+ # TODO: https://github.com/OpenZeppelin/rust-contracts-stylus/issues/291
+ # - name: check openzeppelin-stylus
+ # run: cargo publish -p openzeppelin-stylus --target wasm32-unknown-unknown --dry-run

.github/workflows/check.yml

@@ -110,4 +110,4 @@ jobs:
  - name: Checkout Actions Repository
  uses: actions/checkout@v4
  - name: Check spelling of files in the workspace
- uses: crate-ci/typos@v1.24.1
+ uses: crate-ci/typos@v1.25.0

.github/workflows/e2e-tests.yml

@@ -43,7 +43,7 @@ jobs:
 
  - name: install solc
  run: |
- curl -LO https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
+ curl -LO https://github.com/ethereum/solidity/releases/download/v0.8.24/solc-static-linux
  sudo mv solc-static-linux /usr/bin/solc
  sudo chmod a+x /usr/bin/solc
 

.github/workflows/gas-bench.yml

@@ -31,9 +31,12 @@ jobs:
  with:
  key: "gas-bench"
 
+ - name: install cargo-stylus
+ run: cargo install cargo-stylus@0.5.1
+
  - name: install solc
  run: |
- curl -LO https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
+ curl -LO https://github.com/ethereum/solidity/releases/download/v0.8.24/solc-static-linux
  sudo mv solc-static-linux /usr/bin/solc
  sudo chmod a+x /usr/bin/solc
 

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
  "contracts",
+ "contracts-proc",
  "lib/crypto",
  "lib/motsu",
  "lib/motsu-proc",
@@ -21,6 +22,7 @@ members = [
 ]
 default-members = [
  "contracts",
+ "contracts-proc",
  "lib/crypto",
  "lib/motsu",
  "lib/motsu-proc",
@@ -46,8 +48,8 @@ resolver = "2"
 authors = ["OpenZeppelin"]
 edition = "2021"
 license = "MIT"
-keywords = ["arbitrum", "ethereum", "stylus"]
 repository = "https://github.com/OpenZeppelin/rust-contracts-stylus"
+version = "0.1.0-rc"
 
 [workspace.lints.rust]
 missing_docs = "warn"
@@ -61,7 +63,6 @@ all = "warn"
 [workspace.dependencies]
 # stylus-related
 stylus-sdk = { version = "=0.6.0", default-features = false }
-stylus-proc = { version = "=0.6.0", default-features = false }
 mini-alloc = "0.4.2"
 
 alloy = { version = "0.1.4", features = [
@@ -89,12 +90,22 @@ rand = "0.8.5"
 regex = "1.10.4"
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 tokio = { version = "1.12.0", features = ["full"] }
+futures = "0.3.30"
 
 # procedural macros
 syn = { version = "2.0.58", features = ["full"] }
 proc-macro2 = "1.0.79"
 quote = "1.0.35"
 
+# members
+openzeppelin-stylus = { path = "contracts" }
+openzeppelin-stylus-proc = { path = "contracts-proc" }
+openzeppelin-crypto = { path = "lib/crypto" }
+motsu = { path = "lib/motsu"}
+motsu-proc = { path = "lib/motsu-proc", version = "0.1.0" }
+e2e = { path = "lib/e2e" }
+e2e-proc = {path = "lib/e2e-proc"}
+
 [profile.release]
 codegen-units = 1
 panic = "abort"