Merge branch 'main' into remove-function-consructor-artifacts-from-code

OpenZeppelin · Aug 19, 2024 · dbc0268 · dbc0268
2 parents 5f4ebd0 + f68c8c0
commit dbc0268
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/docs/modules/ROOT/pages/tokens.adoc b/docs/modules/ROOT/pages/tokens.adoc
@@ -27,4 +27,4 @@ Even though the concept of a token is simple, they have a variety of complexitie
 You've probably heard of the ERC-20 or ERC-721 token standards, and that's why you're here. Head to our specialized guides to learn more about these:
 
  * xref:erc20.adoc[ERC-20]: the most widespread token standard for fungible assets, albeit somewhat limited by its simplicity.
- * xref:erc721.adoc[ERC-721]: the de-facto solution for non-fungible tokens, often used for collectibles and games.
+ * xref:erc721.adoc[ERC-721]: the de-facto solution for non-fungible tokens, often used for collectibles and games.
diff --git a/examples/erc721-consecutive/tests/erc721-consecutive.rs b/examples/erc721-consecutive/tests/erc721-consecutive.rs
@@ -3,7 +3,6 @@
 use alloy::{
     primitives::{Address, U256},
     sol,
-    sol_types::SolConstructor,
 };
 use alloy_primitives::uint;
 use e2e::{receipt, watch, Account, EventExt, ReceiptExt, Revert};

diff --git a/examples/erc721-metadata/tests/erc721.rs b/examples/erc721-metadata/tests/erc721.rs
@@ -2,13 +2,10 @@
 
 use abi::Erc721;
 use alloy::{
-    network::ReceiptResponse,
     primitives::{Address, U256},
     sol,
-    sol_types::SolConstructor,
 };
 use e2e::{receipt, watch, Account, EventExt, ReceiptExt, Revert};
-use eyre::ContextCompat;
 
 use crate::Erc721MetadataExample::constructorCall;
 

diff --git a/lib/e2e/README.md b/lib/e2e/README.md
@@ -54,7 +54,7 @@ async fn foo(alice: Account, bob: Account) -> eyre::Result<()> {
 ### Contracts
 
 We use `koba` to deploy contracts to the blockchain. This is not required, a
-separate mechanism for deployment can be used. `Deployer` type exposes `Deployer::deploy` 
+separate mechanism for deployment can be used. `Deployer` type exposes `Deployer::deploy`
 method that abstracts away the mechanism used in our workflow.
 
 Given a Solidity contract with a constructor at path `src/constructor.sol` like

diff --git a/scripts/nitro-testnode.sh b/scripts/nitro-testnode.sh
@@ -44,7 +44,7 @@ then
   git clone --recurse-submodules https://github.com/OffchainLabs/nitro-testnode.git
   cd ./nitro-testnode || exit
   # `release` branch.
-  git checkout 7e490fdf8175da1edddd1855ea123499a6afec76 || exit
+  git checkout 8cb6b84e31909157d431e7e4af9fb83799443e00 || exit
 
   ./test-node.bash --no-run --init --no-tokenbridge || exit
 fi