Merge branch 'main' into erc1155

OpenZeppelin · Sep 21, 2024 · 4cbbeb7 · 4cbbeb7
2 parents 1b2d10e + b1eef80
commit 4cbbeb7
Show file tree

Hide file tree

Showing 19 changed files with 97 additions and 46 deletions.
diff --git a/.github/workflows/check-publish.yml b/.github/workflows/check-publish.yml
@@ -0,0 +1,42 @@
+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
+
+        # 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
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,6 +50,7 @@ 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"
@@ -97,6 +98,14 @@ syn = { version = "2.0.58", features = ["full"] }
 proc-macro2 = "1.0.79"
 quote = "1.0.35"
 
+# members
+openzeppelin-stylus = { path = "contracts" }
+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"

diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -4,15 +4,15 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives = { workspace = true, features = ["tiny-keccak"] }
 alloy.workspace = true
 tokio.workspace = true
 eyre.workspace = true
 koba.workspace = true
-e2e = { path = "../lib/e2e" }
+e2e.workspace = true
 serde = "1.0.203"
 keccak-const = "0.2.0"
diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml
@@ -6,7 +6,7 @@ edition.workspace = true
 keywords.workspace = true
 license.workspace = true
 repository.workspace = true
-version = "0.1.0-rc"
+version.workspace = true
 
 [dependencies]
 alloy-primitives.workspace = true
@@ -18,7 +18,7 @@ keccak-const.workspace = true
 
 [dev-dependencies]
 alloy-primitives = { workspace = true, features = ["arbitrary"] }
-motsu = { path = "../lib/motsu" }
+motsu.workspace = true
 rand.workspace = true
 
 [features]

diff --git a/examples/access-control/Cargo.toml b/examples/access-control/Cargo.toml
@@ -4,18 +4,18 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives.workspace = true
 stylus-sdk.workspace = true
 stylus-proc.workspace = true
 mini-alloc.workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-e2e = { path = "../../lib/e2e" }
+e2e.workspace = true
 tokio.workspace = true
 eyre.workspace = true
 

diff --git a/examples/basic/token/Cargo.toml b/examples/basic/token/Cargo.toml
@@ -4,10 +4,10 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives.workspace = true
 stylus-sdk.workspace = true
 stylus-proc.workspace = true

diff --git a/examples/ecdsa/Cargo.toml b/examples/ecdsa/Cargo.toml
@@ -4,18 +4,18 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives.workspace = true
 stylus-sdk.workspace = true
 stylus-proc.workspace = true
 mini-alloc.workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-e2e = { path = "../../lib/e2e" }
+e2e.workspace = true
 tokio.workspace = true
 eyre.workspace = true
 

diff --git a/examples/erc20-permit/Cargo.toml b/examples/erc20-permit/Cargo.toml
@@ -4,10 +4,10 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives = { workspace = true, features = ["tiny-keccak"] }
 stylus-sdk.workspace = true
 stylus-proc.workspace = true
@@ -17,7 +17,7 @@ mini-alloc.workspace = true
 alloy.workspace = true
 eyre.workspace = true
 tokio.workspace = true
-e2e = { path = "../../lib/e2e" }
+e2e.workspace = true
 
 [features]
 e2e = []

diff --git a/examples/erc20/Cargo.toml b/examples/erc20/Cargo.toml
@@ -4,10 +4,10 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives.workspace = true
 stylus-sdk.workspace = true
 stylus-proc.workspace = true
@@ -17,7 +17,7 @@ mini-alloc.workspace = true
 alloy.workspace = true
 eyre.workspace = true
 tokio.workspace = true
-e2e = { path = "../../lib/e2e" }
+e2e.workspace = true
 
 [features]
 e2e = []

diff --git a/examples/erc721-consecutive/Cargo.toml b/examples/erc721-consecutive/Cargo.toml
@@ -4,10 +4,10 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives.workspace = true
 alloy-sol-types.workspace = true
 stylus-sdk.workspace = true
@@ -16,7 +16,7 @@ mini-alloc.workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-e2e = { path = "../../lib/e2e" }
+e2e.workspace = true
 tokio.workspace = true
 eyre.workspace = true
 rand.workspace = true

diff --git a/examples/erc721-metadata/Cargo.toml b/examples/erc721-metadata/Cargo.toml
@@ -4,18 +4,18 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives.workspace = true
 stylus-sdk.workspace = true
 stylus-proc.workspace = true
 mini-alloc.workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-e2e = { path = "../../lib/e2e" }
+e2e.workspace = true
 tokio.workspace = true
 eyre.workspace = true
 rand.workspace = true

diff --git a/examples/erc721/Cargo.toml b/examples/erc721/Cargo.toml
@@ -4,18 +4,18 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-stylus = { path = "../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives.workspace = true
 stylus-sdk.workspace = true
 stylus-proc.workspace = true
 mini-alloc.workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-e2e = { path = "../../lib/e2e" }
+e2e.workspace = true
 tokio.workspace = true
 eyre.workspace = true
 rand.workspace = true

diff --git a/examples/merkle-proofs/Cargo.toml b/examples/merkle-proofs/Cargo.toml
@@ -4,10 +4,10 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 publish = false
-version = "0.0.0"
+version.workspace = true
 
 [dependencies]
-openzeppelin-crypto = { path = "../../lib/crypto" }
+openzeppelin-crypto.workspace = true
 alloy-primitives.workspace = true
 alloy-sol-types.workspace = true
 stylus-sdk.workspace = true

diff --git a/examples/ownable/Cargo.toml b/examples/ownable/Cargo.toml
@@ -7,15 +7,15 @@ publish = false
 version = "0.0.0"
 
 [dependencies]
-openzeppelin-stylus = { path = "../../contracts" }
+openzeppelin-stylus.workspace = true
 alloy-primitives.workspace = true
 stylus-sdk.workspace = true
 stylus-proc.workspace = true
 mini-alloc.workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-e2e = { path = "../../lib/e2e" }
+e2e.workspace = true
 tokio.workspace = true
 eyre.workspace = true
 

diff --git a/lib/crypto/Cargo.toml b/lib/crypto/Cargo.toml
@@ -6,7 +6,7 @@ edition.workspace = true
 keywords.workspace = true
 license.workspace = true
 repository.workspace = true
-version = "0.1.0-rc"
+version.workspace = true
 
 [dependencies]
 mini-alloc.workspace = true