Merge pull request #790 from ergoplatform/precomputedtables

Use precomputed tables

Author: sethdusek

bindings/ergo-lib-python/src/multi_sig/hints.rs

@@ -113,7 +113,7 @@ fn extract_image(py: Python, image: &SigmaBoolean) -> PyResult<Py<PyAny>> {
 fn extract_commitment(py: Python, commitment: &FirstProverMessage) -> PyResult<Py<PyAny>> {
     match commitment {
         FirstProverMessage::FirstDlogProverMessage(ref first_dlog_prover_message) => {
-            Ok(Py::new(py, EcPoint::from(first_dlog_prover_message.a().clone()))?.into_any())
+            Ok(Py::new(py, EcPoint::from(*first_dlog_prover_message.a()))?.into_any())
         }
         FirstProverMessage::FirstDhtProverMessage(_) => Err(PyNotImplementedError::new_err(
             "ProveDHTuple is not supported",

bindings/ergo-lib-python/src/sigma_protocol.rs

@@ -16,7 +16,7 @@ impl ProveDlog {
     }
     #[getter]
     fn h(&self) -> EcPoint {
-        (*self.0.h).clone().into()
+        (*self.0.h).into()
     }
     fn __repr__(&self) -> String {
         format!("{:?}", self.0)

bindings/ergo-lib-python/src/wallet/ext_pub_key.rs

@@ -32,7 +32,7 @@ impl ExtPubKey {
         ))
     }
     fn public_key(&self) -> EcPoint {
-        self.0.public_key.clone().into()
+        self.0.public_key.into()
     }
     fn address(&self) -> Address {
         address::Address::from(self.0.clone()).into()

bindings/ergo-lib-wasm/src/transaction.rs

@@ -401,7 +401,7 @@ impl UnsignedTransaction {
 
     /// Returns distinct token id from output_candidates as array of byte arrays
     pub fn distinct_token_ids(&self) -> Vec<Uint8Array> {
-        distinct_token_ids(self.0.output_candidates.clone())
+        distinct_token_ids(&self.0.output_candidates)
             .iter()
             .map(|id| Uint8Array::from(id.as_ref()))
             .collect()

ergo-chain-types/Cargo.toml

@@ -32,6 +32,13 @@ core2 = { workspace = true }
 default = ["std", "json"]
 arbitrary = ["proptest", "proptest-derive", "std"]
 json = ["serde", "serde_json", "serde_with"]
-std = ["dep:url", "base16/std", "base64/std", "serde/std"]
+std = [
+    "dep:url",
+    "base16/std",
+    "base64/std",
+    "serde/std",
+    "k256/precomputed-tables",
+    "k256/std",
+]
 
 [dev-dependencies]

ergo-chain-types/src/ec_point.rs

@@ -4,14 +4,15 @@ use alloc::string::String;
 use core::convert::TryFrom;
 use core::ops::{Add, Mul, Neg};
 use derive_more::{From, Into};
+use elliptic_curve::ops::MulByGenerator;
 use k256::elliptic_curve::group::prime::PrimeCurveAffine;
 use k256::elliptic_curve::sec1::ToEncodedPoint;
 use k256::{ProjectivePoint, PublicKey, Scalar};
 use sigma_ser::vlq_encode::{ReadSigmaVlqExt, WriteSigmaVlqExt};
 use sigma_ser::{ScorexParsingError, ScorexSerializable, ScorexSerializeResult};
 
 /// Elliptic curve point
-#[derive(PartialEq, Clone, Default, From, Into)]
+#[derive(PartialEq, Clone, Copy, Default, From, Into)]
 #[cfg_attr(
     feature = "json",
     derive(serde::Serialize, serde::Deserialize),
@@ -104,7 +105,7 @@ pub fn is_identity(ge: &EcPoint) -> bool {
 
 /// Calculates the inverse of the given group element
 pub fn inverse(ec: &EcPoint) -> EcPoint {
-    -ec.clone()
+    -*ec
 }
 
 /// Raises the base GroupElement to the exponent. The result is another GroupElement.
@@ -113,10 +114,15 @@ pub fn exponentiate(base: &EcPoint, exponent: &Scalar) -> EcPoint {
         // we treat EC as a multiplicative group, therefore, exponentiate point is multiply.
         EcPoint(base.0 * exponent)
     } else {
-        base.clone()
+        *base
     }
 }
 
+/// Raise the generator g to the exponent. This is faster than exponentiate(&generator(), exponent)
+pub fn exponentiate_gen(exponent: &Scalar) -> EcPoint {
+    ProjectivePoint::mul_by_generator(exponent).into()
+}
+
 impl ScorexSerializable for EcPoint {
     fn scorex_serialize<W: WriteSigmaVlqExt>(&self, w: &mut W) -> ScorexSerializeResult {
         let caff = self.0.to_affine();

ergo-lib/src/chain/transaction.rs

@@ -234,20 +234,14 @@ pub enum TransactionSignatureVerificationError {
 }
 
 /// Returns distinct token ids from all given ErgoBoxCandidate's
-pub fn distinct_token_ids<I>(output_candidates: I) -> IndexSet<TokenId>
+pub fn distinct_token_ids<'a, I>(output_candidates: I) -> IndexSet<TokenId>
 where
-    I: IntoIterator<Item = ErgoBoxCandidate>,
+    I: IntoIterator<Item = &'a ErgoBoxCandidate>,
 {
-    let token_ids: Vec<TokenId> = output_candidates
+    let token_ids = output_candidates
         .into_iter()
-        .flat_map(|b| {
-            b.tokens
-                .into_iter()
-                .flatten()
-                .map(|t| t.token_id)
-                .collect::<Vec<TokenId>>()
-        })
-        .collect();
+        .flat_map(|b| b.tokens.iter().flatten().map(|t| t.token_id));
+
     IndexSet::<_>::from_iter(token_ids)
 }
 
@@ -267,7 +261,7 @@ impl SigmaSerializable for Transaction {
             }
 
             // Serialize distinct ids of tokens in transaction outputs.
-            let distinct_token_ids = distinct_token_ids(self.output_candidates.clone());
+            let distinct_token_ids = distinct_token_ids(&self.output_candidates);
 
             // Note that `self.output_candidates` is of type `TxIoVec` which has a max length of
             // `u16::MAX`. Therefore the following unwrap is safe.

ergo-lib/src/chain/transaction/unsigned.rs

@@ -124,7 +124,7 @@ impl UnsignedTransaction {
 
     /// Returns distinct token ids from all output_candidates
     pub fn distinct_token_ids(&self) -> IndexSet<TokenId> {
-        distinct_token_ids(self.output_candidates.clone())
+        distinct_token_ids(&self.output_candidates)
     }
 }
 

ergo-lib/src/wallet/deterministic.rs

@@ -77,7 +77,7 @@ mod test {
     use crate::wallet::Wallet;
     fn gen_boxes() -> impl Strategy<Value = (SecretKey, Vec<ErgoBox>)> {
         any::<Wscalar>()
-            .prop_map(|s| SecretKey::DlogSecretKey(DlogProverInput { w: s }))
+            .prop_map(|s| SecretKey::DlogSecretKey(DlogProverInput::new(s)))
             .prop_flat_map(|sk: SecretKey| {
                 (
                     Just(sk.clone()),

ergo-lib/src/wallet/ext_pub_key.rs

@@ -28,7 +28,8 @@ type HmacSha512 = Hmac<Sha512>;
 pub struct ExtPubKey {
     /// Parsed public key (EcPoint)
     pub public_key: EcPoint,
-    chain_code: ChainCode,
+    /// Chain code bytes
+    pub chain_code: ChainCode,
     /// Derivation path for this extended public key
     pub derivation_path: DerivationPath,
 }