alloy-rs · DaniPopes · Mar 13, 2024 · Mar 8, 2024 · Mar 11, 2024 · Mar 11, 2024
@@ -20,11 +20,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: ["stable", "nightly", "1.75"] # MSRV
+        rust: ["stable", "nightly", "1.76"] # MSRV
         flags: ["--no-default-features", "", "--all-features"]
         exclude:
           # Some features have higher MSRV.
-          - rust: "1.75" # MSRV
+          - rust: "1.76" # MSRV
             flags: "--all-features"
     steps:
       - uses: actions/checkout@v3
@@ -43,13 +43,13 @@ jobs:
           cache-on-failure: true
       # Only run tests on latest stable and above
       - name: Install cargo-nextest
-        if: ${{ matrix.rust != '1.75' }} # MSRV
+        if: ${{ matrix.rust != '1.76' }} # MSRV
         uses: taiki-e/install-action@nextest
       - name: build
-        if: ${{ matrix.rust == '1.75' }} # MSRV
+        if: ${{ matrix.rust == '1.76' }} # MSRV
         run: cargo build --workspace ${{ matrix.flags }}
       - name: test
-        if: ${{ matrix.rust != '1.75' }} # MSRV
+        if: ${{ matrix.rust != '1.76' }} # MSRV
         run: cargo nextest run --workspace ${{ matrix.flags }}
 
   doctest:
@@ -80,6 +80,7 @@ jobs:
         run: |
           cargo hack check --workspace --target wasm32-unknown-unknown \
             --exclude alloy-contract \
+            --exclude alloy-internal-test-utils \
             --exclude alloy-network \
             --exclude alloy-node-bindings \
             --exclude alloy-provider \

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.76"
 authors = ["Alloy Contributors"]
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/alloy-rs/next"
@@ -41,19 +41,13 @@ alloy-transport-http = { version = "0.1.0", default-features = false, path = "cr
 alloy-transport-ipc = { version = "0.1.0", default-features = false, path = "crates/transport-ipc" }
 alloy-transport-ws = { version = "0.1.0", default-features = false, path = "crates/transport-ws" }
 
+test-utils = { version = "0.1.0", default-features = false, path = "crates/internal-test-utils", package = "alloy-internal-test-utils" }
+
 alloy-core = { version = "0.6.4", default-features = false, features = ["std"] }
-alloy-dyn-abi = { version = "0.6.4", default-features = false, features = [
-    "std",
-] }
-alloy-json-abi = { version = "0.6.4", default-features = false, features = [
-    "std",
-] }
-alloy-primitives = { version = "0.6.4", default-features = false, features = [
-    "std",
-] }
-alloy-sol-types = { version = "0.6.4", default-features = false, features = [
-    "std",
-] }
+alloy-dyn-abi = { version = "0.6.4", default-features = false, features = ["std"] }
+alloy-json-abi = { version = "0.6.4", default-features = false, features = ["std"] }
+alloy-primitives = { version = "0.6.4", default-features = false, features = ["std"] }
+alloy-sol-types = { version = "0.6.4", default-features = false, features = ["std"] }
 
 alloy-rlp = "0.3"
 
@@ -62,13 +56,8 @@ ethereum_ssz_derive = "0.5"
 ethereum_ssz = "0.5"
 
 # crypto
-elliptic-curve = { version = "0.13", default-features = false, features = [
-    "std",
-] }
-k256 = { version = "0.13", default-features = false, features = [
-    "ecdsa",
-    "std",
-] }
+elliptic-curve = { version = "0.13", default-features = false, features = ["std"] }
+k256 = { version = "0.13", default-features = false, features = ["ecdsa", "std"] }
 sha2 = { version = "0.10", default-features = false, features = ["std"] }
 spki = { version = "0.7", default-features = false, features = ["std"] }
 
@@ -117,4 +106,5 @@ tempfile = "3.10"
 # TODO: Keep around until alloy-contract is stable.
 # This should only be used in `alloy-contract` tests.
 [patch.crates-io]
-alloy-sol-macro = { git = "https://github.com/alloy-rs/core", rev = "ab0cab1047a088be6cffa4e7a2fcde7cf77aa460" }
+# alloy-sol-macro = { git = "https://github.com/alloy-rs/core", rev = "ab0cab1047a088be6cffa4e7a2fcde7cf77aa460" }
+alloy-sol-macro = { git = "https://github.com/alloy-rs/core", branch = "dani/sol-event-filters" }
@@ -84,7 +84,7 @@ When updating this, also update:
 
 Alloy will keep a rolling MSRV (minimum supported rust version) policy of **at
 least** 6 months. When increasing the MSRV, the new Rust version must have been
-released at least six months ago. The current MSRV is 1.75.
+released at least six months ago. The current MSRV is 1.76.
 
 Note that the MSRV is not increased automatically, and only as part of a minor
 release.

@@ -1 +1 @@
-msrv = "1.75"
+msrv = "1.76"
@@ -23,12 +23,13 @@ alloy-primitives.workspace = true
 alloy-sol-types.workspace = true
 
 futures-util.workspace = true
-
+futures.workspace = true
 thiserror.workspace = true
 
 [dev-dependencies]
 alloy-rpc-client.workspace = true
 alloy-transport-http.workspace = true
 alloy-node-bindings.workspace = true
+test-utils.workspace = true
 reqwest.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
@@ -193,7 +193,8 @@ pub struct CallBuilder<N: Network, T, P, D> {
     request: N::TransactionRequest,
     block: Option<BlockId>,
     state: Option<StateOverride>,
-    provider: P,
+    /// The provider.
+    pub provider: P,
     decoder: D,
     transport: PhantomData<T>,
 }
@@ -218,14 +219,18 @@ impl<N: Network, T: Transport + Clone, P: Provider<N, T>> DynCallBuilder<N, T, P
     }
 }
 
-impl<N: Network, T: Transport + Clone, P: Provider<N, T>, C: SolCall> SolCallBuilder<N, T, P, C> {
+#[doc(hidden)]
+impl<'a, N: Network, T: Transport + Clone, P: Provider<N, T>, C: SolCall>
+    SolCallBuilder<N, T, &'a P, C>
+{
     // `sol!` macro constructor, see `#[sol(rpc)]`. Not public API.
     // NOTE: please avoid changing this function due to its use in the `sol!` macro.
-    #[doc(hidden)]
-    pub fn new_sol(provider: P, address: &Address, call: &C) -> Self {
+    pub fn new_sol(provider: &'a P, address: &Address, call: &C) -> Self {
         Self::new_inner(provider, call.abi_encode().into(), PhantomData::<C>).to(Some(*address))
     }
+}
 
+impl<N: Network, T: Transport + Clone, P: Provider<N, T>, C: SolCall> SolCallBuilder<N, T, P, C> {
     /// Clears the decoder, returning a raw call builder.
     #[inline]
     pub fn clear_decoder(self) -> RawCallBuilder<N, T, P> {
@@ -393,13 +398,13 @@ impl<N: Network, T: Transport + Clone, P: Provider<N, T>, D: CallDecoder> CallBu
     }
 
     /// Broadcasts the underlying transaction to the network.
-    // TODO: more docs referring to customizing PendingTransaction
+    ///
+    /// See [`Provider::send_transaction`] for more information.
     pub async fn send(
         &self,
-    ) -> Result<impl IntoFuture<Output = Result<Option<N::ReceiptResponse>>> + '_> {
-        let pending = self.provider.send_transaction(self.request.clone()).await?;
-
-        Ok(pending.and_then(|hash| self.provider.get_transaction_receipt(hash)).map_err(Into::into))
+    ) -> Result<impl Future<Output = Result<Option<N::ReceiptResponse>>> + '_> {
+        let builder = self.provider.send_transaction(self.request.clone()).await?;
+        Ok(builder.get_receipt().map_err(Into::into))
     }
 
     /// Calculates the address that will be created by the transaction, if any.
@@ -428,6 +433,13 @@ impl<N: Network, T: Transport, P: Clone, D> CallBuilder<N, T, &P, D> {
 /// [`CallBuilder`] can be turned into a [`Future`] automatically with `.await`.
 ///
 /// Defaults to calling [`CallBuilder::call`].
+///
+/// # Note
+///
+/// This requires `Self: 'static` due to a current limitation in the Rust type system, namely that
+/// the associated future type, the returned future, must be a concrete type (`Box<dyn Future ...>`)
+/// and cannot be an opaque type (`impl Future ...`) because `impl Trait` in this position is not
+/// stable yet. See [rust-lang/rust#63063](https://github.com/rust-lang/rust/issues/63063).
 impl<N, T, P, D> IntoFuture for CallBuilder<N, T, P, D>
 where
     N: Network,
@@ -554,7 +566,6 @@ mod tests {
         );
     }
 
-    // TODO: send_transaction, PendingTransaction
     #[tokio::test(flavor = "multi_thread")]
     async fn deploy_and_call() {
         let (provider, anvil) = spawn_anvil();

@@ -28,3 +28,10 @@ pub enum Error {
     #[error(transparent)]
     TransportError(#[from] TransportError),
 }
+
+impl From<alloy_sol_types::Error> for Error {
+    #[inline]
+    fn from(e: alloy_sol_types::Error) -> Self {
+        Self::AbiError(e.into())
+    }
+}