Move constants into core package

Author: aumetra

.circleci/config.yml

@@ -63,6 +63,7 @@ workflows:
     # Keep those job names in sync with .mergify.yml
     jobs:
       - arm64
+      - package_core
       - package_crypto
       - package_check
       - package_schema
@@ -173,6 +174,10 @@ jobs:
           name: "contracts/staking: integration-test"
           working_directory: ~/project/contracts/staking
           command: cargo wasm --locked && cargo integration-test --locked
+      - run:
+          name: "packages/core: test"
+          working_directory: ~/project/packages/core
+          command: cargo test --all-features --locked
       - run:
           name: "packages/crypto: test"
           working_directory: ~/project/packages/crypto
@@ -233,6 +238,62 @@ jobs:
             - contracts/staking/target/wasm32-unknown-unknown/release/build
             - contracts/staking/target/wasm32-unknown-unknown/release/deps
 
+  package_core:
+    docker:
+      - image: rust:1.74
+    environment:
+      # Limit the number of parallel jobs to avoid OOM crashes during doc testing
+      RUST_TEST_THREADS: 8
+    steps:
+      - checkout
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version; rustup target list --installed
+      - restore_cache:
+          keys:
+            - cargocache-v2-package_core-rust:1.74-{{ checksum "Cargo.lock" }}
+      - run:
+          name: Add thumbv7em-none-eabi target
+          command: rustup target add thumbv7em-none-eabi && rustup target list --installed
+      - run:
+          name: Add wasm32 target
+          command: rustup target add wasm32-unknown-unknown && rustup target list --installed
+      - run:
+          name: Build library for native target (no features)
+          working_directory: ~/project/packages/core
+          command: cargo build --locked --no-default-features
+      - run:
+          name: Build library for wasm target (no features)
+          working_directory: ~/project/packages/core
+          command: cargo wasm --locked --no-default-features
+      - run:
+          name: Build library for no_std target (no features)
+          working_directory: ~/project/packages/core
+          command: cargo no-std --locked --no-default-features
+      - run:
+          name: Run unit tests (no features)
+          working_directory: ~/project/packages/core
+          command: cargo test --locked --no-default-features
+      - run:
+          name: Build library for native target (all features)
+          working_directory: ~/project/packages/core
+          command: cargo build --locked --features std
+      - run:
+          name: Build library for wasm target (all features)
+          working_directory: ~/project/packages/core
+          command: cargo wasm --locked --features std
+      - run:
+          name: Run unit tests (all features)
+          working_directory: ~/project/packages/core
+          command: cargo test --locked --features std
+      - save_cache:
+          paths:
+            - /usr/local/cargo/registry
+            - target/debug/.fingerprint
+            - target/debug/build
+            - target/debug/deps
+          key: cargocache-v2-package_core-rust:1.74-{{ checksum "Cargo.lock" }}
+
   package_crypto:
     docker:
       - image: rust:1.74
@@ -941,6 +1002,14 @@ jobs:
       #
       # Workspace packages
       #
+      - run:
+          name: Clippy linting on core (no feature flags)
+          working_directory: ~/project/packages/core
+          command: cargo clippy --all-targets -- -D warnings
+      - run:
+          name: Clippy linting on core (all feature flags)
+          working_directory: ~/project/packages/core
+          command: cargo clippy --all-features --all-targets -- -D warnings
       - run:
           name: Clippy linting on crypto
           working_directory: ~/project/packages/crypto
@@ -1039,6 +1108,7 @@ jobs:
             mkdir -p reports
             cargo test --all-features
 
+            grcov . -s packages/core --binary-path ./target/debug -t lcov -o ./reports/core.info
             grcov . -s packages/crypto --binary-path ./target/debug -t lcov -o ./reports/crypto.info
             grcov . -s packages/derive --binary-path ./target/debug -t lcov -o ./reports/derive.info
             grcov . -s packages/schema --binary-path ./target/debug -t lcov -o ./reports/schema.info
@@ -1050,6 +1120,9 @@ jobs:
       - run:
           name: Quick fix for GPG error in Codecov
           command: mkdir -p ~/.gnupg
+      - codecov/upload:
+          file: reports/core.info
+          flags: cosmwasm-core
       - codecov/upload:
           file: reports/crypto.info
           flags: cosmwasm-crypto

Cargo.lock

@@ -7,11 +7,4 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/core"
 license = "Apache-2.0"
 readme = "README.md"
 
-[package.metadata.release]
-release = false
-
 [dependencies]
-
-[features]
-
-[dev-dependencies]

packages/core/Cargo.toml

@@ -0,0 +1,24 @@
+pub const BLS12_381_G1_POINT_LEN: usize = 48;
+pub const BLS12_381_G2_POINT_LEN: usize = 96;
+
+/// A generator in G1 (in compressed serialization).
+///
+/// This can be used directly for signature verification
+/// (see e.g. https://twitter.com/simon_warta/status/1786342207106019765)
+pub const BLS12_381_G1_GENERATOR: [u8; BLS12_381_G1_POINT_LEN] = [
+    151, 241, 211, 167, 49, 151, 215, 148, 38, 149, 99, 140, 79, 169, 172, 15, 195, 104, 140, 79,
+    151, 116, 185, 5, 161, 78, 58, 63, 23, 27, 172, 88, 108, 85, 232, 63, 249, 122, 26, 239, 251,
+    58, 240, 10, 219, 34, 198, 187,
+];
+
+/// A generator in G2 (in compressed serialization).
+///
+/// This can be used directly for signature verification
+/// (see e.g. https://twitter.com/simon_warta/status/1786342207106019765)
+pub const BLS12_381_G2_GENERATOR: [u8; BLS12_381_G2_POINT_LEN] = [
+    147, 224, 43, 96, 82, 113, 159, 96, 125, 172, 211, 160, 136, 39, 79, 101, 89, 107, 208, 208,
+    153, 32, 182, 26, 181, 218, 97, 187, 220, 127, 80, 73, 51, 76, 241, 18, 19, 148, 93, 87, 229,
+    172, 125, 5, 93, 4, 43, 126, 2, 74, 162, 178, 240, 143, 10, 145, 38, 8, 5, 39, 45, 197, 16, 81,
+    198, 228, 122, 212, 250, 64, 59, 2, 180, 81, 11, 100, 122, 227, 209, 119, 11, 172, 3, 38, 168,
+    5, 187, 239, 212, 128, 86, 200, 193, 33, 189, 184,
+];

packages/core/src/crypto.rs

@@ -1 +1,8 @@
+#![no_std]
 
+mod crypto;
+
+#[doc(hidden)]
+pub use self::crypto::{
+    BLS12_381_G1_GENERATOR, BLS12_381_G1_POINT_LEN, BLS12_381_G2_GENERATOR, BLS12_381_G2_POINT_LEN,
+};

packages/core/src/lib.rs

@@ -12,23 +12,21 @@ license = "Apache-2.0"
 bench = false
 
 [dependencies]
-cfg-if = "1.0.0"
+ark-bls12-381 = "0.4.0"
+ark-ec = { version = "0.4.2", features = ["parallel"] }
+ark-ff = { version = "0.4.2", features = ["asm", "parallel"] }
+ark-serialize = "0.4.2"
+cosmwasm-core = { version = "2.0.1", path = "../core" }
 digest = "0.10"
 ecdsa = "0.16.2" # Not used directly, but needed to bump transitive dependency, see: https://github.com/CosmWasm/cosmwasm/pull/1899 for details.
 ed25519-zebra = { version = "4.0.3", default-features = false }
 k256 = { version = "0.13.3", default-features = false, features = ["ecdsa"] }
+num-traits = "0.2.18"
 p256 = { version = "0.13.2", default-features = false, features = ["ecdsa"] }
 rand_core = "0.6"
-thiserror = "1.0.26"
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-ark-bls12-381 = "0.4.0"
-ark-ec = { version = "0.4.2", features = ["parallel"] }
-ark-ff = { version = "0.4.2", features = ["asm", "parallel"] }
-ark-serialize = "0.4.2"
-num-traits = "0.2.18"
 rayon = "1.9.0"
 sha2 = "0.10"
+thiserror = "1.0.26"
 
 [dev-dependencies]
 base64 = "0.22.0"
@@ -44,6 +42,10 @@ hex-literal = "0.4.1"
 english-numbers = "0.3"
 glob = "0.3.1"
 
+[features]
+default = ["std"]
+std = []
+
 [[bench]]
 name = "main"
 harness = false

packages/crypto/Cargo.toml

@@ -15,11 +15,11 @@ use digest::Digest;
 use k256::ecdsa::SigningKey; // type alias
 use sha2::Sha256;
 
+use cosmwasm_core::{BLS12_381_G1_GENERATOR, BLS12_381_G1_POINT_LEN, BLS12_381_G2_POINT_LEN};
 use cosmwasm_crypto::{
     bls12_381_aggregate_g1, bls12_381_aggregate_g2, bls12_381_hash_to_g1, bls12_381_hash_to_g2,
     bls12_381_pairing_equality, ed25519_batch_verify, ed25519_verify, secp256k1_recover_pubkey,
     secp256k1_verify, secp256r1_recover_pubkey, secp256r1_verify, HashFunction,
-    BLS12_381_G1_GENERATOR, BLS12_381_G1_POINT_LEN, BLS12_381_G2_POINT_LEN,
 };
 use std::cmp::min;
 

packages/crypto/benches/main.rs

@@ -1,36 +1,11 @@
-pub const BLS12_381_G1_POINT_LEN: usize = 48;
-pub const BLS12_381_G2_POINT_LEN: usize = 96;
-
-/// A generator in G1 (in compressed serialization).
-///
-/// This can be used directly for signature verification
-/// (see e.g. https://twitter.com/simon_warta/status/1786342207106019765)
-pub const BLS12_381_G1_GENERATOR: [u8; BLS12_381_G1_POINT_LEN] = [
-    151, 241, 211, 167, 49, 151, 215, 148, 38, 149, 99, 140, 79, 169, 172, 15, 195, 104, 140, 79,
-    151, 116, 185, 5, 161, 78, 58, 63, 23, 27, 172, 88, 108, 85, 232, 63, 249, 122, 26, 239, 251,
-    58, 240, 10, 219, 34, 198, 187,
-];
-
-/// A generator in G2 (in compressed serialization).
-///
-/// This can be used directly for signature verification
-/// (see e.g. https://twitter.com/simon_warta/status/1786342207106019765)
-pub const BLS12_381_G2_GENERATOR: [u8; BLS12_381_G2_POINT_LEN] = [
-    147, 224, 43, 96, 82, 113, 159, 96, 125, 172, 211, 160, 136, 39, 79, 101, 89, 107, 208, 208,
-    153, 32, 182, 26, 181, 218, 97, 187, 220, 127, 80, 73, 51, 76, 241, 18, 19, 148, 93, 87, 229,
-    172, 125, 5, 93, 4, 43, 126, 2, 74, 162, 178, 240, 143, 10, 145, 38, 8, 5, 39, 45, 197, 16, 81,
-    198, 228, 122, 212, 250, 64, 59, 2, 180, 81, 11, 100, 122, 227, 209, 119, 11, 172, 3, 38, 168,
-    5, 187, 239, 212, 128, 86, 200, 193, 33, 189, 184,
-];
-
-#[cfg(all(test, feature = "std"))]
+#[cfg(test)]
 mod test {
     use ark_bls12_381::{G1Affine, G2Affine};
     use ark_ec::AffineRepr;
     use ark_serialize::CanonicalSerialize;
     use hex_literal::hex;
 
-    use super::{
+    use cosmwasm_core::{
         BLS12_381_G1_GENERATOR, BLS12_381_G1_POINT_LEN, BLS12_381_G2_GENERATOR,
         BLS12_381_G2_POINT_LEN,
     };

packages/crypto/src/bls12_318/constants.rs

@@ -27,9 +27,10 @@ use ark_ec::{
 };
 use ark_ff::field_hashers::DefaultFieldHasher;
 use ark_serialize::CanonicalSerialize;
+use cosmwasm_core::{BLS12_381_G1_POINT_LEN, BLS12_381_G2_POINT_LEN};
 use sha2::Sha256;
 
-use crate::{CryptoError, BLS12_381_G1_POINT_LEN, BLS12_381_G2_POINT_LEN};
+use crate::CryptoError;
 
 type HashToCurve<CurveConfig, Hash> =
     MapToCurveBasedHasher<Projective<CurveConfig>, DefaultFieldHasher<Hash>, WBMap<CurveConfig>>;

packages/crypto/src/bls12_318/hash.rs

@@ -1,19 +1,10 @@
+mod aggregate;
 mod constants;
+mod hash;
+mod pairing;
+mod points;
 
-pub use self::constants::{
-    BLS12_381_G1_GENERATOR, BLS12_381_G1_POINT_LEN, BLS12_381_G2_GENERATOR, BLS12_381_G2_POINT_LEN,
-};
-
-cfg_if::cfg_if! {
-    if #[cfg(not(target_arch = "wasm32"))] {
-        mod aggregate;
-        mod hash;
-        mod pairing;
-        mod points;
-
-        pub use self::aggregate::{bls12_381_aggregate_g1, bls12_381_aggregate_g2};
-        pub use self::hash::{bls12_381_hash_to_g1, bls12_381_hash_to_g2, HashFunction};
-        pub use self::pairing::bls12_381_pairing_equality;
-        pub use self::points::{bls12_381_g1_is_identity, bls12_381_g2_is_identity};
-    }
-}
+pub use self::aggregate::{bls12_381_aggregate_g1, bls12_381_aggregate_g2};
+pub use self::hash::{bls12_381_hash_to_g1, bls12_381_hash_to_g2, HashFunction};
+pub use self::pairing::bls12_381_pairing_equality;
+pub use self::points::{bls12_381_g1_is_identity, bls12_381_g2_is_identity};

packages/crypto/src/bls12_318/mod.rs

@@ -1,13 +1,14 @@
 use core::ops::Neg;
 
-use crate::{errors::PairingEquality, CryptoError, BLS12_381_G1_POINT_LEN, BLS12_381_G2_POINT_LEN};
-
 use super::points::{g1_from_variable, g2_from_variable};
+use crate::{errors::PairingEquality, CryptoError};
+
 use ark_bls12_381::Bls12_381;
 use ark_ec::{
     bls12::{G1Prepared, G2Prepared},
     pairing::Pairing,
 };
+use cosmwasm_core::{BLS12_381_G1_POINT_LEN, BLS12_381_G2_POINT_LEN};
 use num_traits::Zero;
 use rayon::{
     iter::{IndexedParallelIterator, ParallelIterator},

packages/crypto/src/bls12_318/pairing.rs

@@ -7,10 +7,10 @@ use core::{fmt, ops::Neg};
 
 use ark_bls12_381::{G1Affine, G1Projective, G2Affine, G2Projective};
 use ark_ec::AffineRepr;
+use cosmwasm_core::{BLS12_381_G1_POINT_LEN, BLS12_381_G2_POINT_LEN};
 use num_traits::Zero;
 
-use crate::errors::InvalidPoint;
-use crate::{CryptoError, BLS12_381_G1_POINT_LEN, BLS12_381_G2_POINT_LEN};
+use crate::{errors::InvalidPoint, CryptoError};
 
 /// Point on G1
 #[derive(Debug, PartialEq, Clone)]
@@ -195,9 +195,9 @@ pub fn bls12_381_g2_is_identity(g2: &[u8; BLS12_381_G2_POINT_LEN]) -> Result<boo
 
 #[cfg(test)]
 mod tests {
-    use crate::{BLS12_381_G1_GENERATOR, BLS12_381_G2_GENERATOR};
-
     use super::*;
+
+    use cosmwasm_core::{BLS12_381_G1_GENERATOR, BLS12_381_G2_GENERATOR};
     use hex_literal::hex;
 
     #[test]

packages/crypto/src/bls12_318/points.rs

@@ -48,17 +48,15 @@ pub fn ed25519_verify(message: &[u8], signature: &[u8], public_key: &[u8]) -> Cr
 /// Three Variants are suppported in the input for convenience:
 ///  - Equal number of messages, signatures, and public keys: Standard, generic functionality.
 ///  - One message, and an equal number of signatures and public keys: Multiple digital signature
-/// (multisig) verification of a single message.
+///    (multisig) verification of a single message.
 ///  - One public key, and an equal number of messages and signatures: Verification of multiple
-/// messages, all signed with the same private key.
+///    messages, all signed with the same private key.
 ///
 /// Any other variants of input vectors result in an error.
 ///
 /// Notes:
-///  - The "one-message, with zero signatures and zero public keys" case, is considered the empty
-/// case.
-///  - The "one-public key, with zero messages and zero signatures" case, is considered the empty
-/// case.
+///  - The "one-message, with zero signatures and zero public keys" case, is considered the empty case.
+///  - The "one-public key, with zero messages and zero signatures" case, is considered the empty case.
 ///  - The empty case (no messages, no signatures and no public keys) returns true.
 pub fn ed25519_batch_verify<R>(
     rng: &mut R,

packages/crypto/src/ed25519.rs

@@ -15,17 +15,11 @@ mod secp256k1;
 mod secp256r1;
 
 #[doc(hidden)]
-#[cfg(not(target_arch = "wasm32"))]
 pub use crate::bls12_318::{
     bls12_381_aggregate_g1, bls12_381_aggregate_g2, bls12_381_g1_is_identity,
     bls12_381_g2_is_identity, bls12_381_hash_to_g1, bls12_381_hash_to_g2,
     bls12_381_pairing_equality, HashFunction,
 };
-
-#[doc(hidden)]
-pub use crate::bls12_318::{
-    BLS12_381_G1_GENERATOR, BLS12_381_G1_POINT_LEN, BLS12_381_G2_GENERATOR, BLS12_381_G2_POINT_LEN,
-};
 #[doc(hidden)]
 pub use crate::ecdsa::{ECDSA_PUBKEY_MAX_LEN, ECDSA_SIGNATURE_LEN, MESSAGE_HASH_MAX_LEN};
 #[doc(hidden)]