Merge remote-tracking branch 'refs/remotes/upstream/develop' into refactor/disable-p2sh

# Conflicts:
#	src/utils/transaction_utils.rs

Author: DaMatrix

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "tw_chain"
-version = "1.1.1"
+version = "1.1.3"
 homepage = "https://aiblock.dev"
 description = "AIBlock Chain is a distributed blockchain store with a 2-way entry data structure."
 authors = ["Byron Houwens <[email protected]>", "Anton Troskie <[email protected]>"]

Cargo.toml

@@ -49,7 +49,7 @@ Blockchain can be added to your project as a dependency by adding the following
 
 ```toml
 [dependencies]
-tw_chain = "1.0.2"
+tw_chain = "1.1.2"
 ```
 
 Or alternatively, via command line:

README.md

@@ -42,7 +42,7 @@ cargo test
 
 ```toml
 [dependencies]
-tw_chain = "1.0.2"
+tw_chain = "1.1.2"
 ```
 
 أو بديلًا ، عبر سطر الأوامر:

readmes/README.ar.md

@@ -42,7 +42,7 @@ Blockchain kann als Abhängigkeit zu Ihrem Projekt hinzugefügt werden, indem Si
 
 ```toml
 [dependencies]
-tw_chain = "1.0.2"
+tw_chain = "1.1.2"
 ```
 
 Alternativ können Sie es auch über die Befehlszeile hinzufügen:

readmes/README.de.md

@@ -42,7 +42,7 @@ Blockchain puede ser añadido a tu proyecto como una dependencia añadiendo lo s
 
 ```toml
 [dependencies]
-tw_chain = "1.0.2"
+tw_chain = "1.1.2"
 ```
 
 O alternativamente, a través de la línea de comandos:

readmes/README.es.md

@@ -43,7 +43,7 @@ Blockchain peut être ajouté à votre projet en tant que dépendance en ajoutan
 
 ```toml
 [dependencies]
-tw_chain = "1.0.2"
+tw_chain = "1.1.2"
 ```
 
 Ou bien, via la ligne de commande :

readmes/README.fr.md

@@ -42,7 +42,7 @@ cargo test
 
 ```toml
 [dependencies]
-tw_chain = "1.0.2"
+tw_chain = "1.1.2"
 ```
 
 或者，通过命令行：

readmes/README.zhs.md

@@ -1,7 +1,8 @@
 use crate::primitives::transaction::OutPoint;
-use crate::utils::{add_btreemap, format_for_display};
+use crate::utils::{add_btreemap, format_for_display, is_valid_amount};
 use serde::{Deserialize, Serialize};
 use std::{collections::BTreeMap, fmt, iter, mem::size_of, ops};
+use tracing::debug;
 
 /// A structure representing the amount of tokens in an instance
 #[derive(Deserialize, Serialize, Default, Debug, Copy, Clone, Eq, PartialEq, PartialOrd, Ord)]
@@ -243,6 +244,7 @@ impl Asset {
     pub fn get_excess(&self, rhs: &Asset) -> Option<Asset> {
         match (&self, &rhs) {
             (Asset::Token(lhs_tokens), Asset::Token(rhs_tokens)) => {
+                debug!("LHS tokens: {:?}, RHS tokens: {:?}", lhs_tokens, rhs_tokens);
                 if lhs_tokens > rhs_tokens {
                     Some(Asset::Token(*lhs_tokens - *rhs_tokens))
                 } else {
@@ -370,7 +372,14 @@ impl AssetValues {
     /// Add the `rhs` parameter to `self`
     pub fn update_add(&mut self, rhs: &Asset) {
         match rhs {
-            Asset::Token(tokens) => self.tokens += *tokens,
+            Asset::Token(tokens) => {
+                let add = self.tokens + *tokens;
+
+                match is_valid_amount(&add) {
+                    true => self.tokens += *tokens,
+                    false => self.tokens += TokenAmount::default(),
+                }
+            },
             Asset::Item(items) => {
                 if let Some(genesis_hash) = &items.genesis_hash {
                     self.items

src/primitives/asset.rs

@@ -138,8 +138,13 @@ impl TxOut {
         amount: TokenAmount,
         locktime: Option<u64>,
     ) -> TxOut {
+        let value = match is_valid_amount(&amount) {
+            true => Asset::Token(amount),
+            false => Asset::Token(TokenAmount::default()),
+        };
+
         TxOut {
-            value: Asset::Token(amount),
+            value,
             locktime: locktime.unwrap_or(ZERO as u64),
             script_public_key: Some(to_address),
         }
@@ -227,3 +232,17 @@ impl Transaction {
             .unwrap_or_default()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::primitives::asset::{Asset, TokenAmount};
+    use crate::primitives::transaction::TxOut;
+
+    #[test]
+    fn test_overflow_tx_out() {
+        let amount = TokenAmount(u64::MAX);
+        let tx_out = TxOut::new_token_amount("test".to_string(), amount, None);
+
+        assert_eq!(tx_out.value, Asset::Token(TokenAmount::default()));
+    }
+}