Use bytes for schnorr sig in stake table contract

Using current jellyfish APIs it's not possible to construct the type
currently used. Since the contract doesn't need it we can send a bytes
type instead.

Author: sveitser

Cargo.lock

@@ -39,9 +39,10 @@ pub use crate::bindings::{
     lightclientv2mock::{self, LightClientV2Mock},
     plonkverifier::PlonkVerifier,
     plonkverifierv2::PlonkVerifierV2,
-    staketablev2 as staketable,
+    staketable::StakeTable,
     staketablev2::{
-        EdOnBN254::EdOnBN254Point as EdOnBN254PointSol, StakeTable, BN254::G2Point as G2PointSol,
+        self, EdOnBN254::EdOnBN254Point as EdOnBN254PointSol, StakeTableV2,
+        BN254::G2Point as G2PointSol,
     },
     timelock::Timelock,
 };
@@ -173,7 +174,7 @@ impl From<LightClientV2Mock::votingStakeTableStateReturn> for StakeTableStateSol
     }
 }
 
-impl From<G1PointSol> for staketable::BN254::G1Point {
+impl From<G1PointSol> for staketablev2::BN254::G1Point {
     fn from(v: G1PointSol) -> Self {
         unsafe { std::mem::transmute(v) }
     }
@@ -182,13 +183,14 @@ impl From<G1PointSol> for staketable::BN254::G1Point {
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use self::{
-    staketable::{EdOnBN254::EdOnBN254Point, BN254::G2Point},
+    staketablev2::{EdOnBN254::EdOnBN254Point, BN254::G2Point},
     StakeTableV2::{
-        ConsensusKeysUpdated, Delegated, Undelegated, ValidatorExit, ValidatorRegistered,
+        ConsensusKeysUpdated, ConsensusKeysUpdatedV2, Delegated, Undelegated, ValidatorExit,
+        ValidatorRegistered, ValidatorRegisteredV2,
     },
 };
 
-impl PartialEq for staketable {
+impl PartialEq for ValidatorRegistered {
     fn eq(&self, other: &Self) -> bool {
         self.account == other.account
             && self.blsVk == other.blsVk
@@ -197,6 +199,17 @@ impl PartialEq for staketable {
     }
 }
 
+impl PartialEq for ValidatorRegisteredV2 {
+    fn eq(&self, other: &Self) -> bool {
+        self.account == other.account
+            && self.blsVk == other.blsVk
+            && self.schnorrVk == other.schnorrVk
+            && self.commission == other.commission
+            && self.blsSig == other.blsSig
+            && self.schnorrSig == other.schnorrSig
+    }
+}
+
 impl PartialEq for ConsensusKeysUpdated {
     fn eq(&self, other: &Self) -> bool {
         self.account == other.account
@@ -205,6 +218,16 @@ impl PartialEq for ConsensusKeysUpdated {
     }
 }
 
+impl PartialEq for ConsensusKeysUpdatedV2 {
+    fn eq(&self, other: &Self) -> bool {
+        self.account == other.account
+            && self.blsVK == other.blsVK
+            && self.schnorrVK == other.schnorrVK
+            && self.blsSig == other.blsSig
+            && self.schnorrSig == other.schnorrSig
+    }
+}
+
 impl Serialize for ValidatorRegistered {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where

contracts/rust/adapter/src/bindings/staketablev2.rs

@@ -20,7 +20,7 @@ contract StakeTableV2 is StakeTable {
         EdOnBN254.EdOnBN254Point schnorrVk,
         uint16 commission,
         BN254.G1Point blsSig,
-        EdOnBN254.EdOnBN254Point schnorrSig
+        bytes schnorrSig
     );
 
     /// @notice A validator updates their consensus keys
@@ -30,7 +30,7 @@ contract StakeTableV2 is StakeTable {
         BN254.G2Point blsVK,
         EdOnBN254.EdOnBN254Point schnorrVK,
         BN254.G1Point blsSig,
-        EdOnBN254.EdOnBN254Point schnorrSig
+        bytes schnorrSig
     );
 
     /// @notice The exit escrow period is updated
@@ -66,7 +66,7 @@ contract StakeTableV2 is StakeTable {
         BN254.G2Point memory blsVK,
         EdOnBN254.EdOnBN254Point memory schnorrVK,
         BN254.G1Point memory blsSig,
-        EdOnBN254.EdOnBN254Point memory schnorrSig,
+        bytes memory schnorrSig,
         uint16 commission
     ) external virtual {
         address validator = msg.sender;
@@ -100,7 +100,7 @@ contract StakeTableV2 is StakeTable {
         BN254.G2Point memory blsVK,
         EdOnBN254.EdOnBN254Point memory schnorrVK,
         BN254.G1Point memory blsSig,
-        EdOnBN254.EdOnBN254Point memory schnorrSig
+        bytes memory schnorrSig
     ) external virtual {
         address validator = msg.sender;
 

contracts/rust/adapter/src/sol_types.rs

@@ -10,6 +10,7 @@ alloy = { workspace = true }
 anyhow = { workspace = true }
 ark-ec = { workspace = true }
 ark-ed-on-bn254 = { workspace = true }
+ark-serialize = { workspace = true }
 clap = { workspace = true }
 clap-serde = "0.5.1"
 clap-serde-derive = "0.2.1"

contracts/src/StakeTableV2.sol

@@ -143,7 +143,7 @@ pub async fn setup_stake_table_contract_for_test(
             commission,
             validator_address,
             bls_key_pair,
-            state_key_pair.ver_key(),
+            state_key_pair,
         )
         .await?;
         assert!(receipt.status());

sequencer-sqlite/Cargo.lock

@@ -136,7 +136,7 @@ impl TestSystem {
             self.commission,
             self.deployer_address,
             self.bls_key_pair.clone(),
-            self.state_key_pair.ver_key(),
+            self.state_key_pair.clone(),
         )
         .await?;
         assert!(receipt.status());

staking-cli/Cargo.toml

@@ -11,10 +11,7 @@ use anyhow::{bail, Result};
 use clap::{Parser, Subcommand};
 use clap_serde_derive::ClapSerde;
 use demo::DelegationConfig;
-pub(crate) use hotshot_types::{
-    light_client::{StateSignKey, StateVerKey},
-    signature_key::BLSPrivKey,
-};
+pub(crate) use hotshot_types::{light_client::StateSignKey, signature_key::BLSPrivKey};
 pub(crate) use jf_signature::bls_over_bn254::KeyPair as BLSKeyPair;
 use parse::Commission;
 use sequencer_utils::logging;

staking-cli/src/demo.rs

@@ -14,6 +14,7 @@ use hotshot_contract_adapter::{
     evm::DecodeRevert as _,
     sol_types::EspToken::{self, EspTokenErrors},
 };
+use hotshot_types::light_client::StateKeyPair;
 use staking_cli::{
     claim::{claim_validator_exit, claim_withdrawal},
     delegation::{approve, delegate, undelegate},
@@ -252,7 +253,7 @@ pub async fn main() -> Result<()> {
                 commission,
                 account,
                 (consensus_private_key).into(),
-                (&state_private_key).into(),
+                StateKeyPair::from_sign_key(state_private_key),
             )
             .await
         },
@@ -266,7 +267,7 @@ pub async fn main() -> Result<()> {
                 stake_table_addr,
                 account,
                 (consensus_private_key).into(),
-                (&state_private_key).into(),
+                StateKeyPair::from_sign_key(state_private_key),
             )
             .await
         },