X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2Fuint160.cs;h=e12f10b29330f75126f32c138ebd653ee5d0860c;hb=198c3037b62f2c6007dee4c0a8b0fa41e9225c24;hp=eccfe956f19d30a19a70a1c8070b428afdde8689;hpb=14dcc623463c612772aa4a5dc20497d8661e3d0b;p=NovacoinLibrary.git

diff --git a/Novacoin/uint160.cs b/Novacoin/uint160.cs
index eccfe95..e12f10b 100644
--- a/Novacoin/uint160.cs
+++ b/Novacoin/uint160.cs
@@ -213,7 +213,7 @@ namespace Novacoin
             return result;
         }
 
-        public static uint160 operator *(uint160 a, uint multiplier)
+        public static uint160 operator *(uint160 a, ulong multiplier)
         {
             var result = new uint160();
 
@@ -222,7 +222,7 @@ namespace Novacoin
 
             do
             {
-                c += a.pn[i] * (ulong)multiplier;
+                c += a.pn[i] * multiplier;
                 result.pn[i] = (uint)c;
                 c >>= 32;
             } while (++i < result.nWidth);
@@ -230,6 +230,66 @@ namespace Novacoin
             return result;
         }
 
+        public static uint160 operator *(uint160 a, uint160 b)
+        {
+            if (!a || !b)
+            {
+                // Multiplication by zero results with zero.
+                return 0;
+            }
+            else if (b.bits <= 32)
+            {
+                if (b.pn[0] == 1)
+                {
+                    // If right is 1 then return left operand value
+                    return a;
+                }
+
+                return a * b.pn[0];
+            }
+            else if (a.bits <= 32)
+            {
+                if (a.pn[0] == 1)
+                {
+                    // If left is 1 then return right operand value
+                    return b;
+                }
+
+                return a * b.pn[0];
+            }
+
+            int m = a.bits / 32 + (a.bits % 32 != 0 ? 1 : 0);
+            int n = b.bits / 32 + (b.bits % 32 != 0 ? 1 : 0);
+
+            uint160 result = new uint160();
+
+            uint[] left = a.pn.Take(m).ToArray();
+            uint[] right = b.pn.Take(n).ToArray();
+
+            for (int i = 0; i < m; ++i)
+            {
+                uint ai = left[i];
+                int k = i;
+
+                ulong temp = 0;
+                for (int j = 0; j < n; ++j)
+                {
+                    temp = temp + ((ulong)ai) * right[j] + result.pn[k];
+                    result.pn[k++] = (uint)temp;
+                    temp >>= 32;
+                }
+
+                while (temp != 0)
+                {
+                    temp += result.pn[k];
+                    result.pn[k++] = (uint)temp;
+                    temp >>= 32;
+                }
+            }
+
+            return result;
+        }
+
         public static uint operator %(uint160 a, uint divisor)
         {
             ulong r = 0;