Merge branch 'main' into docs-1

Author: minikin

.github/workflows/ci_tests.yml

@@ -224,6 +224,11 @@ jobs:
         cd src/chain-wallet-libs/bindings/wallet-js
         wasm-pack build --release --target=nodejs -d pkg
 
+    - name: Build JS package
+      run: |
+        cd src/chain-wallet-libs/bindings/wallet-js/js
+        npm install
+
     - name: Run JS tests
       run: |
         cd src/chain-wallet-libs/bindings/wallet-js/js-test

Cargo.lock

@@ -437,7 +437,7 @@ paths:
           description: Success
         "400":
           description: The input is malformed.
-      
+
 
   /api/v0/admin/fund:
     put:
@@ -642,6 +642,9 @@ components:
           description: URL to a web page with details on this proposal.
         proposal_files:
           type: string
+        proposal_extra_fields:
+          type: object
+          description: Map of proposal's extra fields.
         proposer:
           type: object
           properties:
@@ -1005,7 +1008,7 @@ components:
     SearchTable:
       type: string
       enum: [challenges, proposals]
-    
+
     SearchColumn:
       type: string
       enum: [title, type, desc, author, funds]
@@ -1182,17 +1185,17 @@ components:
         voting_groups:
           description: List of the assigned voting groups
           type: array
-          items: 
+          items:
             description: Voting group id (the same as voting token id)
             type: string
         last_updated:
           description: Date and time for the latest update to this snapshot information
           type: string
           format: date-time
-      example: 
+      example:
         {
           delegators: ["f5285eeead8b5885a1420800de14b0d1960db1a990a6c2f7b517125bedc000db", "7ef044ba437057d6d944ace679b7f811335639a689064cd969dffc8b55a7cc19"],
           voting_groups: ["group1", "group2"],
           last_updated: "2021-02-11T10:10:27+00:00"
         }
-          
+

book/src/core-vitss-doc/api/v0.yaml

@@ -226,22 +226,41 @@ impl<T: Clone, A: VerificationAlgorithm> Clone for Signed<T, A> {
     any(test, feature = "property-test-api"),
     derive(test_strategy::Arbitrary)
 )]
-pub struct Hash(crypto::Blake2b256);
+pub struct Hash {
+    hash: crypto::Blake2b256,
+}
+
 impl Hash {
+    pub fn new(hash: crypto::Blake2b256) -> Self {
+        Self { hash }
+    }
+
+    pub fn get_hash(&self) -> &crypto::Blake2b256 {
+        &self.hash
+    }
+
     /// All 0 hash used as a special hash
     pub fn zero_hash() -> Self {
-        Hash(crypto::Blake2b256::from([0; crypto::Blake2b256::HASH_SIZE]))
+        Hash {
+            hash: crypto::Blake2b256::from([0; crypto::Blake2b256::HASH_SIZE]),
+        }
     }
+
     pub fn hash_bytes(bytes: &[u8]) -> Self {
-        Hash(crypto::Blake2b256::new(bytes))
+        Hash {
+            hash: crypto::Blake2b256::new(bytes),
+        }
     }
+
     pub fn from_bytes(bytes: [u8; 32]) -> Self {
-        Hash(crypto::Blake2b256::from(bytes))
+        Hash {
+            hash: crypto::Blake2b256::from(bytes),
+        }
     }
 
     #[inline]
     pub fn as_bytes(&self) -> &[u8] {
-        self.0.as_ref()
+        self.hash.as_ref()
     }
 }
 
@@ -253,63 +272,69 @@ impl From<[u8; 32]> for Hash {
 
 impl From<Hash> for [u8; 32] {
     fn from(h: Hash) -> Self {
-        h.0.into()
+        h.hash.into()
     }
 }
 
 impl<'a> From<&'a Hash> for &'a [u8; 32] {
     fn from(h: &'a Hash) -> Self {
-        (&h.0).into()
+        (&h.hash).into()
     }
 }
 
 impl Serialize for Hash {
     fn serialized_size(&self) -> usize {
-        self.0.as_hash_bytes().serialized_size()
+        self.hash.as_hash_bytes().serialized_size()
     }
 
     fn serialize<W: std::io::Write>(&self, codec: &mut Codec<W>) -> Result<(), WriteError> {
-        codec.put_bytes(self.0.as_hash_bytes())
+        codec.put_bytes(self.hash.as_hash_bytes())
     }
 }
 
 impl Deserialize for Hash {
     fn deserialize<R: std::io::Read>(codec: &mut Codec<R>) -> Result<Self, ReadError> {
         let bytes = <[u8; crypto::Blake2b256::HASH_SIZE]>::deserialize(codec)?;
-        Ok(Hash(crypto::Blake2b256::from(bytes)))
+        Ok(Hash {
+            hash: crypto::Blake2b256::from(bytes),
+        })
     }
 }
 
 impl BlockId for Hash {
     fn zero() -> Hash {
-        Hash(crypto::Blake2b256::from([0; crypto::Blake2b256::HASH_SIZE]))
+        Hash {
+            hash: crypto::Blake2b256::from([0; crypto::Blake2b256::HASH_SIZE]),
+        }
     }
 }
 
 impl FragmentId for Hash {}
 
 impl AsRef<[u8]> for Hash {
     fn as_ref(&self) -> &[u8] {
-        self.0.as_ref()
+        self.hash.as_ref()
     }
 }
 
 impl From<crypto::Blake2b256> for Hash {
     fn from(hash: crypto::Blake2b256) -> Self {
-        Hash(hash)
+        Hash { hash }
     }
 }
 
 impl std::fmt::Display for Hash {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, "{}", self.0)
+        write!(f, "{}", self.hash)
     }
 }
 
 impl FromStr for Hash {
     type Err = crypto::hash::Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(Hash(crypto::Blake2b256::from_str(s)?))
+        Ok(Hash {
+            hash: crypto::Blake2b256::from_str(s)?,
+        })
     }
 }
 
@@ -408,7 +433,9 @@ mod tests {
 
     impl Arbitrary for Hash {
         fn arbitrary<G: Gen>(g: &mut G) -> Self {
-            Hash(Arbitrary::arbitrary(g))
+            Hash {
+                hash: Arbitrary::arbitrary(g),
+            }
         }
     }
     impl Arbitrary for EitherEd25519SecretKey {

src/chain-libs/chain-impl-mockchain/src/key.rs

@@ -85,6 +85,16 @@ impl TimeEra {
         }
     }
 
+    /// retrieve the epoch start during a given Era
+    pub fn epoch_start(&self) -> Epoch {
+        self.epoch_start
+    }
+
+    /// retrieve the slot start of an epoch during a given Era
+    pub fn slot_start(&self) -> Slot {
+        self.slot_start
+    }
+
     /// retrieve the number of slots in an epoch during a given Era
     pub fn slots_per_epoch(&self) -> u32 {
         self.slots_per_epoch

src/chain-libs/chain-time/src/era.rs

@@ -13,7 +13,7 @@ use std::time::{Duration, SystemTime};
     any(test, feature = "property-test-api"),
     derive(test_strategy::Arbitrary)
 )]
-pub struct Slot(pub(crate) u64);
+pub struct Slot(pub u64);
 
 impl From<u64> for Slot {
     fn from(slot_number: u64) -> Slot {

src/chain-libs/chain-time/src/timeframe.rs

@@ -32,15 +32,14 @@ impl Wallet {
         self.account.account_id()
     }
 
-    /// Retrieve a wallet from a list of free keys used as utxo's
+    /// Retrieve a wallet from a key used as utxo's
     ///
     /// You can also use this function to recover a wallet even after you have
     /// transferred all the funds to the new format
     ///
     /// Parameters
     ///
     /// * `account_key`: the private key used for voting
-    /// * `keys`: unused
     ///
     /// # Errors
     ///

src/chain-wallet-libs/bindings/wallet-core/src/wallet.rs

@@ -30,6 +30,7 @@ wallet-core = {path = "../wallet-core"}
 wasm-bindgen = "0.2"
 js-sys = "0.3.40"
 bech32 = "0.7.2"
+serde_json = "1.0"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires

src/chain-wallet-libs/bindings/wallet-js/Cargo.toml

@@ -13,6 +13,6 @@
   ],
   "devDependencies": {
     "mocha": "^10.1.0",
-    "wallet-js": "file:../pkg"
+    "wallet-js": "file:../js"
   }
 }