Refactor/t775 update dependency bn254 (#797)

* Use forge for testing the BLS signature implementation in solidity. * Remove BN256.G2 dependency and related code. * Remove function *verifyAggSig*. * Point to solidity-bn254 v0.2.0. * Use G2ParsedPoint in diff_test.rs. Co-authored-by: Alex Xiong <[email protected]>
EspressoSystems · Dec 14, 2023 · 2ed2568 · 2ed2568
1 parent 0d12934
commit 2ed2568
Show file tree

Hide file tree

Showing 33 changed files with 318 additions and 1,964 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -9,7 +9,7 @@
 [submodule "lib/bn254"]
 	path = contracts/lib/bn254
 	url = https://github.com/EspressoSystems/solidity-bn254
-	branch = v0.1.1
+	branch = v0.2.0
 [submodule "contracts/lib/solmate"]
 	path = contracts/lib/solmate
 	url = https://github.com/transmissions11/solmate
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contract-bindings/src/bls_helper.rs b/contract-bindings/src/bls_helper.rs
diff --git a/contract-bindings/src/bn256g2.rs b/contract-bindings/src/bn256g2.rs
diff --git a/contract-bindings/src/deploy_hot_shot.rs b/contract-bindings/src/deploy_hot_shot.rs
diff --git a/contract-bindings/src/hot_shot.rs b/contract-bindings/src/hot_shot.rs
diff --git a/contract-bindings/src/lib.rs b/contract-bindings/src/lib.rs
@@ -4,12 +4,9 @@
 //! Do not manually edit these files.
 //! These files may be overwritten by the codegen system at any time.
 pub mod abstract_stake_table;
-pub mod bls_helper;
 pub mod bls_sig;
 pub mod bn254;
-pub mod bn256g2;
 pub mod bytes_lib;
-pub mod deploy_hot_shot;
 pub mod ed_on_bn254;
 pub mod erc20;
 pub mod example_token;

diff --git a/contract-bindings/src/light_client.rs b/contract-bindings/src/light_client.rs
@@ -98,35 +98,35 @@ pub mod light_client {
                                 name: ::std::borrow::ToOwned::to_owned("blockCommRoot"),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
                                 name: ::std::borrow::ToOwned::to_owned("feeLedgerComm"),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
                                 name: ::std::borrow::ToOwned::to_owned("stakeTableBlsKeyComm",),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
                                 name: ::std::borrow::ToOwned::to_owned("stakeTableSchnorrKeyComm",),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
                                 name: ::std::borrow::ToOwned::to_owned("stakeTableAmountComm",),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
@@ -181,35 +181,35 @@ pub mod light_client {
                                 name: ::std::borrow::ToOwned::to_owned("blockCommRoot"),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
                                 name: ::std::borrow::ToOwned::to_owned("feeLedgerComm"),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
                                 name: ::std::borrow::ToOwned::to_owned("stakeTableBlsKeyComm",),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
                                 name: ::std::borrow::ToOwned::to_owned("stakeTableSchnorrKeyComm",),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {
                                 name: ::std::borrow::ToOwned::to_owned("stakeTableAmountComm",),
                                 kind: ::ethers::core::abi::ethabi::ParamType::Uint(256usize,),
                                 internal_type: ::core::option::Option::Some(
-                                    ::std::borrow::ToOwned::to_owned("uint256"),
+                                    ::std::borrow::ToOwned::to_owned("BN254.ScalarField"),
                                 ),
                             },
                             ::ethers::core::abi::ethabi::Param {

diff --git a/contract-bindings/src/plonk_verifier.rs b/contract-bindings/src/plonk_verifier.rs
diff --git a/contract-bindings/src/stake_table.rs b/contract-bindings/src/stake_table.rs
diff --git a/contracts/lib/bn254 b/contracts/lib/bn254
diff --git a/contracts/rust/Cargo.toml b/contracts/rust/Cargo.toml
@@ -14,17 +14,14 @@ ark-ff = "0.4"
 ark-poly = "0.4"
 ark-serialize = "0.4"
 ark-std = { version = "0.4", default-features = false }
-async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer", tag = "1.4.1", features = [
-    "logging-utils",
-] }
 async-std = "1.12.0"
 clap = { version = "^4.4", features = ["derive"] }
 contract-bindings = { path = "../../contract-bindings" }
 crs = { git = "https://github.com/alxiong/crs" }
+diff-test-bn254 = { git = "https://github.com/EspressoSystems/solidity-bn254.git", tag = "v0.2.0" }
 digest = { version = "0.10", default-features = false, features = ["alloc"] }
 ethers = { version = "2.0.4" }
 ethers-providers = "2.0.4"
-ethers-solc = "2.0.4"
 hex = "0.4.3"
 itertools = "0.12.0"
 jf-plonk = { workspace = true }
+35 −17		.github/workflows/test.yml
+21 −0		.gitignore
+3,885 −0		Cargo.lock
+19 −0		Cargo.toml
+13 −0		diff-test/Cargo.toml
+132 −0		diff-test/src/lib.rs
+100 −0		diff-test/src/main.rs
+188 −27		flake.lock
+65 −10		flake.nix
+5 −1		foundry.toml
+7 −0		justfile
+13 −0		shell.nix
+109 −84		src/BN254.sol
+8 −12		src/Utils.sol
+151 −0		test/BN254.t.sol