update to v0.0.2 (#5)

* upgrade: update to cryptogarageinc/v0.0.2

# Conflicts:
#	src/ConfidentialTransaction.cs
#	test/CfdTestMain.cs

* upgrade: update reference version (cfd: v0.0.6)

Co-authored-by: k-matsuzawa <[email protected]>

Author: ko-matsu

.gitignore

@@ -191,3 +191,6 @@ external/*
 /go.sum
 /cover.html
 *.log
+
+/out/
+/.vs/

external/CMakeLists.txt

@@ -33,7 +33,7 @@ if(CFD_TARGET_VERSION)
 set(CFD_TARGET_TAG  ${CFD_TARGET_VERSION})
 message(STATUS "[external project local] cfd target=${CFD_TARGET_VERSION}")
 else()
-set(CFD_TARGET_TAG  v0.0.5)
+set(CFD_TARGET_TAG  v0.0.6)
 endif()
 if(CFD_TARGET_URL)
 set(CFD_TARGET_REP  ${CFD_TARGET_URL})

src/Address.cs

@@ -8,7 +8,7 @@ namespace Cfd
   /**
    * @brief network type
    */
-  public enum CfdNetworkType
+  public enum CfdNetworkType : int
   {
     Mainnet = 0,      //!< btc mainnet
     Testnet,          //!< btc testnet
@@ -21,7 +21,7 @@ public enum CfdNetworkType
   /**
    * @brief address type
    */
-  public enum CfdAddressType
+  public enum CfdAddressType : int
   {
     P2sh = 1,   //!< Legacy address (Script Hash)
     P2pkh,      //!< Legacy address (PublicKey Hash)
@@ -34,7 +34,7 @@ public enum CfdAddressType
   /**
    * @brief hash type
    */
-  public enum CfdHashType
+  public enum CfdHashType : int
   {
     P2sh = 1,   //!< Script Hash
     P2pkh,      //!< PublicKey Hash
@@ -47,7 +47,7 @@ public enum CfdHashType
   /**
    * @brief witness version
    */
-  public enum CfdWitnessVersion
+  public enum CfdWitnessVersion : int
   {
     VersionNone = -1,  //!< Missing WitnessVersion
     Version0 = 0,      //!< version 0

src/BlindFactor.cs

@@ -10,6 +10,7 @@ namespace Cfd
   /// </summary>
   public class BlindFactor
   {
+    public const uint Size = 32;
     private readonly string hexString;
 
     /// <summary>
@@ -26,9 +27,31 @@ public BlindFactor()
     /// <param name="blindFactorHex">blinder hex</param>
     public BlindFactor(string blindFactorHex)
     {
+      if (string.IsNullOrEmpty(blindFactorHex))
+      {
+        hexString = "0000000000000000000000000000000000000000000000000000000000000000";
+      }
+      else if ((blindFactorHex == null) || (blindFactorHex.Length != Size * 2))
+      {
+        CfdCommon.ThrowError(CfdErrorCode.IllegalArgumentError, "Failed to blindFactor size.");
+      }
       hexString = blindFactorHex;
     }
 
+    /// <summary>
+    /// Constructor. (valid blind factor)
+    /// </summary>
+    /// <param name="blindFactorHex">blinder</param>
+    public BlindFactor(byte[] bytes)
+    {
+      if ((bytes == null) || (bytes.Length != Size))
+      {
+        CfdCommon.ThrowError(CfdErrorCode.IllegalArgumentError, "Failed to blindFactor size.");
+      }
+      var blindFactorBytes = CfdCommon.ReverseBytes(bytes);
+      this.hexString = StringUtil.FromBytes(blindFactorBytes);
+    }
+
     /// <summary>
     /// blinder hex string.
     /// </summary>
@@ -37,5 +60,15 @@ public string ToHexString()
     {
       return hexString;
     }
+
+    /// <summary>
+    /// blinder byte array.
+    /// </summary>
+    /// <returns>blinder byte array</returns>
+    public byte[] GetBytes()
+    {
+      var blindFactorBytes = StringUtil.ToBytes(hexString);
+      return CfdCommon.ReverseBytes(blindFactorBytes);
+    }
   }
 }

src/ByteData.cs

@@ -0,0 +1,65 @@
+/// <summary>
+/// cfd library namespace.
+/// </summary>
+namespace Cfd
+{
+  /// <summary>
+  /// byte data class.
+  /// </summary>
+  public class ByteData
+  {
+    private string data;
+
+    /// <summary>
+    /// Constructor. (empty)
+    /// </summary>
+    public ByteData()
+    {
+      data = "";
+    }
+
+    /// <summary>
+    /// Constructor.
+    /// </summary>
+    /// <param name="bytes">byte array</param>
+    public ByteData(byte[] bytes)
+    {
+      if (bytes == null)
+      {
+        CfdCommon.ThrowError(CfdErrorCode.IllegalArgumentError, "Failed to bytes is null.");
+      }
+      data = StringUtil.FromBytes(bytes);
+    }
+
+    /// <summary>
+    /// Constructor.
+    /// </summary>
+    /// <param name="hex">hex string</param>
+    public ByteData(string hex)
+    {
+      if (hex == null)
+      {
+        CfdCommon.ThrowError(CfdErrorCode.IllegalArgumentError, "Failed to hex is null.");
+      }
+      data = hex;
+    }
+
+    /// <summary>
+    /// hex string.
+    /// </summary>
+    /// <returns>hex string</returns>
+    public string ToHexString()
+    {
+      return data;
+    }
+
+    /// <summary>
+    /// byte array.
+    /// </summary>
+    /// <returns>byte array</returns>
+    public byte[] ToBytes()
+    {
+      return StringUtil.ToBytes(data);
+    }
+  }
+}

src/CMakeLists.txt

@@ -140,6 +140,7 @@ target_sources(${PROJECT_NAME}
     Txid.cs
     Address.cs
     BlindFactor.cs
+    ByteData.cs
     CfdCommon.cs
     CMakeLists.txt
     CoinUtil.cs
@@ -153,9 +154,12 @@ target_sources(${PROJECT_NAME}
     Privkey.cs
     Pubkey.cs
     Script.cs
+    ScriptUtil.cs
     ScriptWitness.cs
+    SignParameter.cs
     StringUtil.cs
     Transaction.cs
+    UtxoData.cs
 )
 
 target_compile_options(${PROJECT_NAME}