From 1da3ef72807435c077cce2853e5dba6efa881b17 Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Sun, 16 Dec 2018 22:55:20 +0800
Subject: [PATCH 1/2] fix spam of print when txs are being added out of order.

---
 src/main.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 182888a8b..b29b20ac9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1731,8 +1731,10 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
                         if (pfMissingInputs)
                             *pfMissingInputs = true;
                         //fprintf(stderr,"missing inputs\n");
-                        return state.DoS(0, error("AcceptToMemoryPool: tx inputs not found"),REJECT_INVALID, "bad-txns-inputs-missing");
-                        return(false);
+                        if (!fSkipExpiry)
+                            return state.DoS(0, error("AcceptToMemoryPool: tx inputs not found"),REJECT_INVALID, "bad-txns-inputs-missing");
+                        else
+                            return(false);
                     }
                 }
 
@@ -1740,7 +1742,10 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
                 if (!view.HaveInputs(tx))
                 {
                     //fprintf(stderr,"accept failure.1\n");
-                    return state.Invalid(error("AcceptToMemoryPool: inputs already spent"),REJECT_DUPLICATE, "bad-txns-inputs-spent");
+                    if (!fSkipExpiry)
+                        return state.Invalid(error("AcceptToMemoryPool: inputs already spent"),REJECT_DUPLICATE, "bad-txns-inputs-spent");
+                    else
+                        return(false);
                 }
             }
             // are the joinsplit's requirements met?

From 3d013276fb7927f07d395ae2f702b9d7919cc28c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 16 Dec 2018 05:52:01 -1100
Subject: [PATCH 2/2] COIN -> SATOSHIDEN

---
 src/cc/dapps/zmigrate.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c
index a857623a5..3f26c50a1 100644
--- a/src/cc/dapps/zmigrate.c
+++ b/src/cc/dapps/zmigrate.c
@@ -940,10 +940,10 @@ again:
                 if ( amount == lastamount3 && amount == lastamount4 )
                     stdamount /= 10;
             }
-            if ( stdamount < COIN )
+            if ( stdamount < SATOSHIDEN )
             {
-                stdamount = COIN;
-                refamount = COIN * 50;
+                stdamount = SATOSHIDEN;
+                refamount = SATOSHIDEN * 50;
             }
             if ( stdamount < refamount )
                 refamount = stdamount;