Merge branch 'main' into fix/flake

.envrc

@@ -1 +1,3 @@
 use nix
+watch_file flake.nix
+watch_file flake.lock

.github/workflows/build_static.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Enable Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          key: "${{ matrix.arch }}"
+          key: "v1-${{ matrix.arch }}"
 
       - name: Initialize Nix Environment
         run: |

README.md

@@ -98,7 +98,7 @@ forge test
 In order to avoid constant warnings about checksum mismatches with [svm-rs](https://github.com/roynalnaruto/svm-rs)
 managed `solc` we set `FOUNDRY_SRC` to solc installed via flake.nix.
 
-- To use the contrats from rust generate the rust contracts bindings: `just update-contract-bindings`.
+- To use the contrats from rust generate the rust contracts bindings: `just gen-bindings`.
 
 To generate documentation in `./docs` for solidity code run
 

contract-bindings/Cargo.toml

@@ -6,3 +6,4 @@ edition = "2021"
 
 [dependencies]
 ethers = { version = "2", default-features = false, features = ["abigen"] }
+serde = "1"

contract-bindings/src/bls_helper.rs

@@ -254,6 +254,8 @@ pub mod bls_helper {
         Clone,
         ::ethers::contract::EthError,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -267,6 +269,8 @@ pub mod bls_helper {
         Clone,
         ::ethers::contract::EthCall,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -282,6 +286,8 @@ pub mod bls_helper {
         Clone,
         ::ethers::contract::EthCall,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -297,6 +303,8 @@ pub mod bls_helper {
         Clone,
         ::ethers::contract::EthCall,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -313,7 +321,16 @@ pub mod bls_helper {
         pub pk: G2Point,
     }
     ///Container type for all of the contract's call
-    #[derive(Clone, ::ethers::contract::EthAbiType, Debug, PartialEq, Eq, Hash)]
+    #[derive(
+        Clone,
+        ::ethers::contract::EthAbiType,
+        serde::Serialize,
+        serde::Deserialize,
+        Debug,
+        PartialEq,
+        Eq,
+        Hash,
+    )]
     pub enum BLSHelperCalls {
         HashToCurve(HashToCurveCall),
         HashToField(HashToFieldCall),
@@ -375,6 +392,8 @@ pub mod bls_helper {
         Clone,
         ::ethers::contract::EthAbiType,
         ::ethers::contract::EthAbiCodec,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -390,6 +409,8 @@ pub mod bls_helper {
         Clone,
         ::ethers::contract::EthAbiType,
         ::ethers::contract::EthAbiCodec,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,

contract-bindings/src/bls_sig.rs

@@ -127,6 +127,8 @@ pub mod bls_sig {
         Clone,
         ::ethers::contract::EthError,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,

contract-bindings/src/bn254.rs

@@ -170,6 +170,8 @@ pub mod bn254 {
         Clone,
         ::ethers::contract::EthCall,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -183,6 +185,8 @@ pub mod bn254 {
         Clone,
         ::ethers::contract::EthCall,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -192,7 +196,16 @@ pub mod bn254 {
     #[ethcall(name = "R_MOD", abi = "R_MOD()")]
     pub struct RModCall;
     ///Container type for all of the contract's call
-    #[derive(Clone, ::ethers::contract::EthAbiType, Debug, PartialEq, Eq, Hash)]
+    #[derive(
+        Clone,
+        ::ethers::contract::EthAbiType,
+        serde::Serialize,
+        serde::Deserialize,
+        Debug,
+        PartialEq,
+        Eq,
+        Hash,
+    )]
     pub enum BN254Calls {
         PMod(PModCall),
         RMod(RModCall),
@@ -242,6 +255,8 @@ pub mod bn254 {
         Clone,
         ::ethers::contract::EthAbiType,
         ::ethers::contract::EthAbiCodec,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -254,6 +269,8 @@ pub mod bn254 {
         Clone,
         ::ethers::contract::EthAbiType,
         ::ethers::contract::EthAbiCodec,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,

contract-bindings/src/deploy_hot_shot.rs

@@ -162,6 +162,8 @@ pub mod deploy_hot_shot {
         Clone,
         ::ethers::contract::EthCall,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -175,6 +177,8 @@ pub mod deploy_hot_shot {
         Clone,
         ::ethers::contract::EthCall,
         ::ethers::contract::EthDisplay,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,
@@ -184,7 +188,16 @@ pub mod deploy_hot_shot {
     #[ethcall(name = "run", abi = "run()")]
     pub struct RunCall;
     ///Container type for all of the contract's call
-    #[derive(Clone, ::ethers::contract::EthAbiType, Debug, PartialEq, Eq, Hash)]
+    #[derive(
+        Clone,
+        ::ethers::contract::EthAbiType,
+        serde::Serialize,
+        serde::Deserialize,
+        Debug,
+        PartialEq,
+        Eq,
+        Hash,
+    )]
     pub enum DeployHotShotCalls {
         IsScript(IsScriptCall),
         Run(RunCall),
@@ -234,6 +247,8 @@ pub mod deploy_hot_shot {
         Clone,
         ::ethers::contract::EthAbiType,
         ::ethers::contract::EthAbiCodec,
+        serde::Serialize,
+        serde::Deserialize,
         Default,
         Debug,
         PartialEq,