Bump to latest Ethers (#26)

* chore: bump ethers

* fix: adjust ethers breaking changes

1. Use the abigen'd ::deploy methods
2. Use Anvil instead of Ganache

* silence warning

* fix: replace abi with full verifier artifact

* ci: use anvil instead of the node stack

* chore: remove ethers-solc

* fix: return error instead of raise

17c0834abf
this api got deprecated and would panic instead of generating an error that can behandled

* lints

* minimfy json

.github/workflows/ci.yml

@@ -19,21 +19,11 @@ jobs:
           toolchain: stable
           override: true
 
-      - name: Install node
-        uses: actions/setup-node@v1
+      # Install for Anvil
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
         with:
-          node-version: 10
-
-      - name: Install ganache
-        run: npm install -g ganache-cli
-
-      - name: Install Solc
-        run: |
-            mkdir -p "$HOME/bin"
-            wget -q https://github.com/ethereum/solidity/releases/download/v0.7.6/solc-static-linux -O $HOME/bin/solc
-            chmod u+x "$HOME/bin/solc"
-            export PATH=$HOME/bin:$PATH
-            solc --version
+          version: nightly
 
       - uses: Swatinem/rust-cache@v1
         with:

src/circom/circuit.rs

@@ -13,7 +13,7 @@ pub struct CircomCircuit<E: PairingEngine> {
     pub witness: Option<Vec<E::Fr>>,
 }
 
-impl<'a, E: PairingEngine> CircomCircuit<E> {
+impl<E: PairingEngine> CircomCircuit<E> {
     pub fn get_public_inputs(&self) -> Option<Vec<E::Fr>> {
         match &self.witness {
             None => None,

src/witness/witness_calculator.rs

@@ -307,14 +307,14 @@ mod runtime {
     pub fn error(store: &Store) -> Function {
         #[allow(unused)]
         #[allow(clippy::many_single_char_names)]
-        fn func(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32) {
+        fn func(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32) -> Result<(), RuntimeError> {
             // NOTE: We can also get more information why it is failing, see p2str etc here:
             // https://github.com/iden3/circom_runtime/blob/master/js/witness_calculator.js#L52-L64
             println!(
                 "runtime error, exiting early: {0} {1} {2} {3} {4} {5}",
                 a, b, c, d, e, f
             );
-            RuntimeError::raise(Box::new(ExitCode(1)));
+            Err(RuntimeError::user(Box::new(ExitCode(1))))
         }
         Function::new_native(store, func)
     }

tests/groth16.rs

@@ -56,7 +56,7 @@ fn groth16_proof_wrong_input() {
     let mut rng = thread_rng();
     let _params = generate_random_parameters::<Bn254, _, _>(circom, &mut rng).unwrap();
 
-    builder.build().unwrap_err();
+    let _ = builder.build().unwrap_err();
 }
 
 #[test]

tests/solidity.rs

@@ -6,11 +6,11 @@ use ark_bn254::Bn254;
 use ark_groth16::{create_random_proof as prove, generate_random_parameters};
 
 use ethers::{
-    contract::{abigen, ContractError, ContractFactory},
+    contract::ContractError,
+    prelude::abigen,
     providers::{Http, Middleware, Provider},
-    utils::{compile_and_launch_ganache, Ganache, Solc},
+    utils::Anvil,
 };
-
 use std::{convert::TryFrom, sync::Arc};
 
 #[tokio::test]
@@ -35,33 +35,22 @@ async fn solidity_verifier() -> Result<()> {
     let proof = prove(circom, &params, &mut rng)?;
 
     // launch the network & compile the verifier
-    let (compiled, ganache) =
-        compile_and_launch_ganache(Solc::new("./tests/verifier.sol"), Ganache::new()).await?;
-    let acc = ganache.addresses()[0];
-    let provider = Provider::<Http>::try_from(ganache.endpoint())?;
+    let anvil = Anvil::new().spawn();
+    let acc = anvil.addresses()[0];
+    let provider = Provider::<Http>::try_from(anvil.endpoint())?;
     let provider = provider.with_sender(acc);
     let provider = Arc::new(provider);
 
     // deploy the verifier
-    let contract = {
-        let contract = compiled
-            .get("TestVerifier")
-            .expect("could not find contract");
-
-        let factory = ContractFactory::new(
-            contract.abi.clone(),
-            contract.bytecode.clone(),
-            provider.clone(),
-        );
-        let contract = factory.deploy(())?.send().await?;
-        let addr = contract.address();
-        Groth16Verifier::new(addr, provider)
-    };
+    let contract = Groth16Verifier::deploy(provider.clone(), ())?
+        .send()
+        .await?;
 
     // check the proof
     let verified = contract
         .check_proof(proof, params.vk, inputs.as_slice())
         .await?;
+
     assert!(verified);
 
     Ok(())
@@ -70,8 +59,8 @@ async fn solidity_verifier() -> Result<()> {
 // We need to implement the conversion from the Ark-Circom's internal Ethereum types to
 // the ones expected by the abigen'd types. Could we maybe provide a convenience
 // macro for these, given that there's room for implementation error?
-abigen!(Groth16Verifier, "./tests/verifier_abi.json");
-use groth16verifier_mod::{G1Point, G2Point, Proof, VerifyingKey};
+abigen!(Groth16Verifier, "./tests/verifier_artifact.json");
+use groth_16_verifier::{G1Point, G2Point, Proof, VerifyingKey};
 impl From<ethereum::G1> for G1Point {
     fn from(src: ethereum::G1) -> Self {
         Self { x: src.x, y: src.y }

tests/verifier_abi.json

@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"uint256[]","name":"input","type":"uint256[]"},{"components":[{"components":[{"internalType":"uint256","name":"X","type":"uint256"},{"internalType":"uint256","name":"Y","type":"uint256"}],"internalType":"struct Pairing.G1Point","name":"A","type":"tuple"},{"components":[{"internalType":"uint256[2]","name":"X","type":"uint256[2]"},{"internalType":"uint256[2]","name":"Y","type":"uint256[2]"}],"internalType":"struct Pairing.G2Point","name":"B","type":"tuple"},{"components":[{"internalType":"uint256","name":"X","type":"uint256"},{"internalType":"uint256","name":"Y","type":"uint256"}],"internalType":"struct Pairing.G1Point","name":"C","type":"tuple"}],"internalType":"struct Verifier.Proof","name":"proof","type":"tuple"},{"components":[{"components":[{"internalType":"uint256","name":"X","type":"uint256"},{"internalType":"uint256","name":"Y","type":"uint256"}],"internalType":"struct Pairing.G1Point","name":"alfa1","type":"tuple"},{"components":[{"internalType":"uint256[2]","name":"X","type":"uint256[2]"},{"internalType":"uint256[2]","name":"Y","type":"uint256[2]"}],"internalType":"struct Pairing.G2Point","name":"beta2","type":"tuple"},{"components":[{"internalType":"uint256[2]","name":"X","type":"uint256[2]"},{"internalType":"uint256[2]","name":"Y","type":"uint256[2]"}],"internalType":"struct Pairing.G2Point","name":"gamma2","type":"tuple"},{"components":[{"internalType":"uint256[2]","name":"X","type":"uint256[2]"},{"internalType":"uint256[2]","name":"Y","type":"uint256[2]"}],"internalType":"struct Pairing.G2Point","name":"delta2","type":"tuple"},{"components":[{"internalType":"uint256","name":"X","type":"uint256"},{"internalType":"uint256","name":"Y","type":"uint256"}],"internalType":"struct Pairing.G1Point[]","name":"IC","type":"tuple[]"}],"internalType":"struct Verifier.VerifyingKey","name":"vk","type":"tuple"}],"name":"verify","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"}]