diff --git a/LibskycoinNet/LibskycoinNet.csproj b/LibskycoinNet/LibskycoinNet.csproj
index a545e750..da73d2cb 100644
--- a/LibskycoinNet/LibskycoinNet.csproj
+++ b/LibskycoinNet/LibskycoinNet.csproj
@@ -67,17 +67,10 @@
-
-
-
-
-
-
-
@@ -96,11 +89,8 @@
-
-
-
@@ -139,20 +129,24 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/LibskycoinNet/skycoin/InputTestData.cs b/LibskycoinNet/skycoin/InputTestData.cs
deleted file mode 100644
index 378e402d..00000000
--- a/LibskycoinNet/skycoin/InputTestData.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class InputTestData : global::System.IDisposable {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- protected bool swigCMemOwn;
-
- internal InputTestData(global::System.IntPtr cPtr, bool cMemoryOwn) {
- swigCMemOwn = cMemoryOwn;
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(InputTestData obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-
- ~InputTestData() {
- Dispose();
- }
-
- public virtual void Dispose() {
- lock(this) {
- if (swigCPtr.Handle != global::System.IntPtr.Zero) {
- if (swigCMemOwn) {
- swigCMemOwn = false;
- skycoinPINVOKE.delete_InputTestData(swigCPtr);
- }
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
- global::System.GC.SuppressFinalize(this);
- }
- }
-
- public GoSlice Hashes {
- set {
- skycoinPINVOKE.set_InputTestData_Hashes(swigCPtr, GoSlice.getCPtr(value));
- }
- get {
- global::System.IntPtr cPtr = skycoinPINVOKE.get_InputTestData_Hashes(swigCPtr);
- GoSlice ret = (cPtr == global::System.IntPtr.Zero) ? null : new GoSlice(cPtr, false);
- return ret;
- }
- }
-
- public InputTestData() : this(skycoinPINVOKE.new_InputTestData(), true) {
- }
-
-}
-
-}
diff --git a/LibskycoinNet/skycoin/InputTestDataJSON.cs b/LibskycoinNet/skycoin/InputTestDataJSON.cs
deleted file mode 100644
index 2e47c12b..00000000
--- a/LibskycoinNet/skycoin/InputTestDataJSON.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class InputTestDataJSON : global::System.IDisposable {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- protected bool swigCMemOwn;
-
- internal InputTestDataJSON(global::System.IntPtr cPtr, bool cMemoryOwn) {
- swigCMemOwn = cMemoryOwn;
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(InputTestDataJSON obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-
- ~InputTestDataJSON() {
- Dispose();
- }
-
- public virtual void Dispose() {
- lock(this) {
- if (swigCPtr.Handle != global::System.IntPtr.Zero) {
- if (swigCMemOwn) {
- swigCMemOwn = false;
- skycoinPINVOKE.delete_InputTestDataJSON(swigCPtr);
- }
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
- global::System.GC.SuppressFinalize(this);
- }
- }
-
- public GoSlice Hashes {
- set {
- skycoinPINVOKE.set_InputTestDataJSON_Hashes(swigCPtr, GoSlice.getCPtr(value));
- }
- get {
- global::System.IntPtr cPtr = skycoinPINVOKE.get_InputTestDataJSON_Hashes(swigCPtr);
- GoSlice ret = (cPtr == global::System.IntPtr.Zero) ? null : new GoSlice(cPtr, false);
- return ret;
- }
- }
-
- public InputTestDataJSON() : this(skycoinPINVOKE.new_InputTestDataJSON(), true) {
- }
-
-}
-
-}
diff --git a/LibskycoinNet/skycoin/KeysTestData.cs b/LibskycoinNet/skycoin/KeysTestData.cs
deleted file mode 100644
index e792ea41..00000000
--- a/LibskycoinNet/skycoin/KeysTestData.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class KeysTestData : global::System.IDisposable {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- protected bool swigCMemOwn;
-
- internal KeysTestData(global::System.IntPtr cPtr, bool cMemoryOwn) {
- swigCMemOwn = cMemoryOwn;
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(KeysTestData obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-
- ~KeysTestData() {
- Dispose();
- }
-
- public virtual void Dispose() {
- lock(this) {
- if (swigCPtr.Handle != global::System.IntPtr.Zero) {
- if (swigCMemOwn) {
- swigCMemOwn = false;
- skycoinPINVOKE.delete_KeysTestData(swigCPtr);
- }
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
- global::System.GC.SuppressFinalize(this);
- }
- }
-
- public cipher__Address Address {
- set {
- skycoinPINVOKE.set_KeysTestData_Address(swigCPtr, cipher__Address.getCPtr(value));
- }
- get {
- global::System.IntPtr cPtr = skycoinPINVOKE.get_KeysTestData_Address(swigCPtr);
- cipher__Address ret = (cPtr == global::System.IntPtr.Zero) ? null : new cipher__Address(cPtr, false);
- return ret;
- }
- }
-
- public SWIGTYPE_p_GoUint8_ Secret {
- set {
- skycoinPINVOKE.set_KeysTestData_Secret(swigCPtr, SWIGTYPE_p_GoUint8_.getCPtr(value));
- }
- get {
- global::System.IntPtr cPtr = skycoinPINVOKE.get_KeysTestData_Secret(swigCPtr);
- SWIGTYPE_p_GoUint8_ ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_GoUint8_(cPtr, false);
- return ret;
- }
- }
-
- public SWIGTYPE_p_GoUint8_ Public {
- set {
- skycoinPINVOKE.set_KeysTestData_Public(swigCPtr, SWIGTYPE_p_GoUint8_.getCPtr(value));
- }
- get {
- global::System.IntPtr cPtr = skycoinPINVOKE.get_KeysTestData_Public(swigCPtr);
- SWIGTYPE_p_GoUint8_ ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_GoUint8_(cPtr, false);
- return ret;
- }
- }
-
- public GoSlice Signatures {
- set {
- skycoinPINVOKE.set_KeysTestData_Signatures(swigCPtr, GoSlice.getCPtr(value));
- }
- get {
- global::System.IntPtr cPtr = skycoinPINVOKE.get_KeysTestData_Signatures(swigCPtr);
- GoSlice ret = (cPtr == global::System.IntPtr.Zero) ? null : new GoSlice(cPtr, false);
- return ret;
- }
- }
-
- public KeysTestData() : this(skycoinPINVOKE.new_KeysTestData(), true) {
- }
-
-}
-
-}
diff --git a/LibskycoinNet/skycoin/KeysTestDataJSON.cs b/LibskycoinNet/skycoin/KeysTestDataJSON.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_FeeCalcFunc.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_FeeCalcFunc.cs
deleted file mode 100644
index a3c2f082..00000000
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_FeeCalcFunc.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class SWIGTYPE_p_FeeCalcFunc {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
- internal SWIGTYPE_p_FeeCalcFunc(global::System.IntPtr cPtr, bool futureUse) {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- protected SWIGTYPE_p_FeeCalcFunc() {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_FeeCalcFunc obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-}
-
-}
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_p_char.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_GoInt_.cs
similarity index 84%
rename from LibskycoinNet/skycoin/SWIGTYPE_p_p_char.cs
rename to LibskycoinNet/skycoin/SWIGTYPE_p_GoInt_.cs
index 95573c1f..31a900ee 100644
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_p_char.cs
+++ b/LibskycoinNet/skycoin/SWIGTYPE_p_GoInt_.cs
@@ -10,18 +10,18 @@
namespace skycoin {
-public class SWIGTYPE_p_p_char {
+public class SWIGTYPE_p_GoInt_ {
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- internal SWIGTYPE_p_p_char(global::System.IntPtr cPtr, bool futureUse) {
+ internal SWIGTYPE_p_GoInt_(global::System.IntPtr cPtr, bool futureUse) {
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
}
- protected SWIGTYPE_p_p_char() {
+ protected SWIGTYPE_p_GoInt_() {
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
}
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_p_char obj) {
+ internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_GoInt_ obj) {
return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
}
}
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_UnspentOutputsSummary_Handle.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_UnspentOutputsSummary_Handle.cs
deleted file mode 100644
index 68a3aeab..00000000
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_UnspentOutputsSummary_Handle.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class SWIGTYPE_p_UnspentOutputsSummary_Handle {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
- internal SWIGTYPE_p_UnspentOutputsSummary_Handle(global::System.IntPtr cPtr, bool futureUse) {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- protected SWIGTYPE_p_UnspentOutputsSummary_Handle() {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_UnspentOutputsSummary_Handle obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-}
-
-}
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_Hash_Handle.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_a_4__unsigned_char.cs
similarity index 79%
rename from LibskycoinNet/skycoin/SWIGTYPE_p_Hash_Handle.cs
rename to LibskycoinNet/skycoin/SWIGTYPE_p_a_4__unsigned_char.cs
index 0e5a2b34..0adc706b 100644
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_Hash_Handle.cs
+++ b/LibskycoinNet/skycoin/SWIGTYPE_p_a_4__unsigned_char.cs
@@ -10,18 +10,18 @@
namespace skycoin {
-public class SWIGTYPE_p_Hash_Handle {
+public class SWIGTYPE_p_a_4__unsigned_char {
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- internal SWIGTYPE_p_Hash_Handle(global::System.IntPtr cPtr, bool futureUse) {
+ internal SWIGTYPE_p_a_4__unsigned_char(global::System.IntPtr cPtr, bool futureUse) {
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
}
- protected SWIGTYPE_p_Hash_Handle() {
+ protected SWIGTYPE_p_a_4__unsigned_char() {
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
}
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_Hash_Handle obj) {
+ internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_a_4__unsigned_char obj) {
return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
}
}
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_f_Transaction__Handle_p_GoUint64__p_void__GoUint32_.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_f_Transaction__Handle_p_GoUint64__p_void__GoUint32_.cs
deleted file mode 100644
index da9e37d8..00000000
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_f_Transaction__Handle_p_GoUint64__p_void__GoUint32_.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class SWIGTYPE_p_f_Transaction__Handle_p_GoUint64__p_void__GoUint32_ {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
- internal SWIGTYPE_p_f_Transaction__Handle_p_GoUint64__p_void__GoUint32_(global::System.IntPtr cPtr, bool futureUse) {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- protected SWIGTYPE_p_f_Transaction__Handle_p_GoUint64__p_void__GoUint32_() {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_f_Transaction__Handle_p_GoUint64__p_void__GoUint32_ obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-}
-
-}
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_ReadableOutputSet_Handle.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int.cs
similarity index 68%
rename from LibskycoinNet/skycoin/SWIGTYPE_p_ReadableOutputSet_Handle.cs
rename to LibskycoinNet/skycoin/SWIGTYPE_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int.cs
index 7a5bfcd1..fb1d6523 100644
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_ReadableOutputSet_Handle.cs
+++ b/LibskycoinNet/skycoin/SWIGTYPE_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int.cs
@@ -10,18 +10,18 @@
namespace skycoin {
-public class SWIGTYPE_p_ReadableOutputSet_Handle {
+public class SWIGTYPE_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int {
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- internal SWIGTYPE_p_ReadableOutputSet_Handle(global::System.IntPtr cPtr, bool futureUse) {
+ internal SWIGTYPE_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int(global::System.IntPtr cPtr, bool futureUse) {
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
}
- protected SWIGTYPE_p_ReadableOutputSet_Handle() {
+ protected SWIGTYPE_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int() {
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
}
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_ReadableOutputSet_Handle obj) {
+ internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int obj) {
return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
}
}
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_AddressUxOuts__Handle.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int.cs
similarity index 68%
rename from LibskycoinNet/skycoin/SWIGTYPE_p_AddressUxOuts__Handle.cs
rename to LibskycoinNet/skycoin/SWIGTYPE_p_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int.cs
index bbee6cc3..364f8d4a 100644
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_AddressUxOuts__Handle.cs
+++ b/LibskycoinNet/skycoin/SWIGTYPE_p_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int.cs
@@ -10,18 +10,18 @@
namespace skycoin {
-public class SWIGTYPE_p_AddressUxOuts__Handle {
+public class SWIGTYPE_p_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int {
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- internal SWIGTYPE_p_AddressUxOuts__Handle(global::System.IntPtr cPtr, bool futureUse) {
+ internal SWIGTYPE_p_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int(global::System.IntPtr cPtr, bool futureUse) {
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
}
- protected SWIGTYPE_p_AddressUxOuts__Handle() {
+ protected SWIGTYPE_p_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int() {
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
}
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_AddressUxOuts__Handle obj) {
+ internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_p_f_Transaction__Handle_p_unsigned_long_long_p_void__unsigned_int obj) {
return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
}
}
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_ulong.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_ulong.cs
deleted file mode 100644
index 64bf6e24..00000000
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_ulong.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class SWIGTYPE_p_ulong {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
- internal SWIGTYPE_p_ulong(global::System.IntPtr cPtr, bool futureUse) {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- protected SWIGTYPE_p_ulong() {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_ulong obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-}
-
-}
diff --git a/LibskycoinNet/skycoin/SWIGTYPE_p_zeroFeeCalculator.cs b/LibskycoinNet/skycoin/SWIGTYPE_p_zeroFeeCalculator.cs
deleted file mode 100644
index ea56e204..00000000
--- a/LibskycoinNet/skycoin/SWIGTYPE_p_zeroFeeCalculator.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class SWIGTYPE_p_zeroFeeCalculator {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
- internal SWIGTYPE_p_zeroFeeCalculator(global::System.IntPtr cPtr, bool futureUse) {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- protected SWIGTYPE_p_zeroFeeCalculator() {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_zeroFeeCalculator obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-}
-
-}
diff --git a/LibskycoinNet/skycoin/cipher_SHA256.cs b/LibskycoinNet/skycoin/cipher_SHA256.cs
index cbdc3523..6e7de086 100644
--- a/LibskycoinNet/skycoin/cipher_SHA256.cs
+++ b/LibskycoinNet/skycoin/cipher_SHA256.cs
@@ -40,11 +40,6 @@ public virtual void Dispose() {
}
}
- public _GoString_ getStr() {
- _GoString_ ret = new _GoString_(skycoinPINVOKE.cipher_SHA256_getStr(swigCPtr), true);
- return ret;
- }
-
public int isEqual(cipher_SHA256 a) {
int ret = skycoinPINVOKE.cipher_SHA256_isEqual(swigCPtr, cipher_SHA256.getCPtr(a));
return ret;
@@ -58,6 +53,11 @@ public void assignTo(cipher_SHA256 data) {
skycoinPINVOKE.cipher_SHA256_assignTo(swigCPtr, cipher_SHA256.getCPtr(data));
}
+ public _GoString_ getStr() {
+ _GoString_ ret = new _GoString_(skycoinPINVOKE.cipher_SHA256_getStr(swigCPtr), true);
+ return ret;
+ }
+
public SWIGTYPE_p_unsigned_char data {
set {
skycoinPINVOKE.set_cipher_SHA256_data(swigCPtr, SWIGTYPE_p_unsigned_char.getCPtr(value));
diff --git a/LibskycoinNet/skycoin/cipher__Address.cs b/LibskycoinNet/skycoin/cipher__Address.cs
index c79b7339..28dacedd 100644
--- a/LibskycoinNet/skycoin/cipher__Address.cs
+++ b/LibskycoinNet/skycoin/cipher__Address.cs
@@ -40,6 +40,11 @@ public virtual void Dispose() {
}
}
+ public int isEqual(cipher__Address a) {
+ int ret = skycoinPINVOKE.cipher__Address_isEqual(swigCPtr, cipher__Address.getCPtr(a));
+ return ret;
+ }
+
public char getVersion() {
char ret = skycoinPINVOKE.cipher__Address_getVersion(swigCPtr);
return ret;
@@ -49,11 +54,6 @@ public void setVersion(char pValue) {
skycoinPINVOKE.cipher__Address_setVersion(swigCPtr, pValue);
}
- public int isEqual(cipher__Address a) {
- int ret = skycoinPINVOKE.cipher__Address_isEqual(swigCPtr, cipher__Address.getCPtr(a));
- return ret;
- }
-
public byte Version {
set {
skycoinPINVOKE.set_cipher__Address_Version(swigCPtr, value);
diff --git a/LibskycoinNet/skycoin/coin__Transaction.cs b/LibskycoinNet/skycoin/coin__Transaction.cs
index 45925995..3598e357 100644
--- a/LibskycoinNet/skycoin/coin__Transaction.cs
+++ b/LibskycoinNet/skycoin/coin__Transaction.cs
@@ -40,9 +40,8 @@ public virtual void Dispose() {
}
}
- public int setInnerHash(cipher_SHA256 h) {
- int ret = skycoinPINVOKE.coin__Transaction_setInnerHash(swigCPtr, cipher_SHA256.getCPtr(h));
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
+ public int isEqual(coin__Transaction t) {
+ int ret = skycoinPINVOKE.coin__Transaction_isEqual(swigCPtr, coin__Transaction.getCPtr(t));
return ret;
}
@@ -51,8 +50,9 @@ public cipher_SHA256 GetInnerHash() {
return ret;
}
- public int isEqual(coin__Transaction t) {
- int ret = skycoinPINVOKE.coin__Transaction_isEqual(swigCPtr, coin__Transaction.getCPtr(t));
+ public int setInnerHash(cipher_SHA256 h) {
+ int ret = skycoinPINVOKE.coin__Transaction_setInnerHash(swigCPtr, cipher_SHA256.getCPtr(h));
+ if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
diff --git a/LibskycoinNet/skycoin/encoder__StructField.cs b/LibskycoinNet/skycoin/encoder__StructField.cs
deleted file mode 100644
index ba01c69f..00000000
--- a/LibskycoinNet/skycoin/encoder__StructField.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//------------------------------------------------------------------------------
-//
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.12
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace skycoin {
-
-public class encoder__StructField : global::System.IDisposable {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- protected bool swigCMemOwn;
-
- internal encoder__StructField(global::System.IntPtr cPtr, bool cMemoryOwn) {
- swigCMemOwn = cMemoryOwn;
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(encoder__StructField obj) {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-
- ~encoder__StructField() {
- Dispose();
- }
-
- public virtual void Dispose() {
- lock(this) {
- if (swigCPtr.Handle != global::System.IntPtr.Zero) {
- if (swigCMemOwn) {
- swigCMemOwn = false;
- skycoinPINVOKE.delete_encoder__StructField(swigCPtr);
- }
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
- global::System.GC.SuppressFinalize(this);
- }
- }
-
- public SWIGTYPE_p_GoString_ Name {
- set {
- skycoinPINVOKE.set_encoder__StructField_Name(swigCPtr, SWIGTYPE_p_GoString_.getCPtr(value));
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
- }
- get {
- SWIGTYPE_p_GoString_ ret = new SWIGTYPE_p_GoString_(skycoinPINVOKE.get_encoder__StructField_Name(swigCPtr), true);
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
- }
-
- public uint Kind {
- set {
- skycoinPINVOKE.set_encoder__StructField_Kind(swigCPtr, value);
- }
- get {
- uint ret = skycoinPINVOKE.get_encoder__StructField_Kind(swigCPtr);
- return ret;
- }
- }
-
- public SWIGTYPE_p_GoString_ Type {
- set {
- skycoinPINVOKE.set_encoder__StructField_Type(swigCPtr, SWIGTYPE_p_GoString_.getCPtr(value));
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
- }
- get {
- SWIGTYPE_p_GoString_ ret = new SWIGTYPE_p_GoString_(skycoinPINVOKE.get_encoder__StructField_Type(swigCPtr), true);
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
- }
-
- public SWIGTYPE_p_GoString_ Tag {
- set {
- skycoinPINVOKE.set_encoder__StructField_Tag(swigCPtr, SWIGTYPE_p_GoString_.getCPtr(value));
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
- }
- get {
- SWIGTYPE_p_GoString_ ret = new SWIGTYPE_p_GoString_(skycoinPINVOKE.get_encoder__StructField_Tag(swigCPtr), true);
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
- }
-
- public encoder__StructField() : this(skycoinPINVOKE.new_encoder__StructField(), true) {
- }
-
-}
-
-}
diff --git a/LibskycoinNet/skycoin/skycoin.cs b/LibskycoinNet/skycoin/skycoin.cs
index c702172b..47c58c8b 100644
--- a/LibskycoinNet/skycoin/skycoin.cs
+++ b/LibskycoinNet/skycoin/skycoin.cs
@@ -11,6 +11,30 @@
namespace skycoin {
public class skycoin {
+ public static int equalSlices(GoSlice slice1, GoSlice slice2, int elem_size) {
+ int ret = skycoinPINVOKE.equalSlices(GoSlice.getCPtr(slice1), GoSlice.getCPtr(slice2), elem_size);
+ return ret;
+ }
+
+ public static int equalTransactions(coin__Transaction t1, coin__Transaction t2) {
+ int ret = skycoinPINVOKE.equalTransactions(coin__Transaction.getCPtr(t1), coin__Transaction.getCPtr(t2));
+ return ret;
+ }
+
+ public static int equalTransactionsArrays(SWIGTYPE_p_GoSlice_ pTxs1, SWIGTYPE_p_GoSlice_ pTxs2) {
+ int ret = skycoinPINVOKE.equalTransactionsArrays(SWIGTYPE_p_GoSlice_.getCPtr(pTxs1), SWIGTYPE_p_GoSlice_.getCPtr(pTxs2));
+ return ret;
+ }
+
+ public static int equalBlockHeaders(coin__BlockHeader bh1, coin__BlockHeader bh2) {
+ int ret = skycoinPINVOKE.equalBlockHeaders(coin__BlockHeader.getCPtr(bh1), coin__BlockHeader.getCPtr(bh2));
+ return ret;
+ }
+
+ public static void destroy_cipher_SecKeys(cipher_SecKeys p) {
+ skycoinPINVOKE.destroy_cipher_SecKeys(cipher_SecKeys.getCPtr(p));
+ }
+
public static GoSlice new_GoSlicep() {
global::System.IntPtr cPtr = skycoinPINVOKE.new_GoSlicep();
GoSlice ret = (cPtr == global::System.IntPtr.Zero) ? null : new GoSlice(cPtr, false);
@@ -44,10 +68,9 @@ public static SWIGTYPE_p_GoUint8_ new_GoUint8Ptr() {
return ret;
}
- public static SWIGTYPE_p_GoUint8_ copy_GoUint8Ptr(SWIGTYPE_p_GoUint8_ value) {
- global::System.IntPtr cPtr = skycoinPINVOKE.copy_GoUint8Ptr(SWIGTYPE_p_GoUint8_.getCPtr(value));
+ public static SWIGTYPE_p_GoUint8_ copy_GoUint8Ptr(byte value) {
+ global::System.IntPtr cPtr = skycoinPINVOKE.copy_GoUint8Ptr(value);
SWIGTYPE_p_GoUint8_ ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_GoUint8_(cPtr, false);
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@ -55,13 +78,12 @@ public static void delete_GoUint8Ptr(SWIGTYPE_p_GoUint8_ obj) {
skycoinPINVOKE.delete_GoUint8Ptr(SWIGTYPE_p_GoUint8_.getCPtr(obj));
}
- public static void GoUint8Ptr_assign(SWIGTYPE_p_GoUint8_ obj, SWIGTYPE_p_GoUint8_ value) {
- skycoinPINVOKE.GoUint8Ptr_assign(SWIGTYPE_p_GoUint8_.getCPtr(obj), SWIGTYPE_p_GoUint8_.getCPtr(value));
- if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
+ public static void GoUint8Ptr_assign(SWIGTYPE_p_GoUint8_ obj, byte value) {
+ skycoinPINVOKE.GoUint8Ptr_assign(SWIGTYPE_p_GoUint8_.getCPtr(obj), value);
}
- public static SWIGTYPE_p_GoUint8_ GoUint8Ptr_value(SWIGTYPE_p_GoUint8_ obj) {
- SWIGTYPE_p_GoUint8_ ret = new SWIGTYPE_p_GoUint8_(skycoinPINVOKE.GoUint8Ptr_value(SWIGTYPE_p_GoUint8_.getCPtr(obj)), true);
+ public static byte GoUint8Ptr_value(SWIGTYPE_p_GoUint8_ obj) {
+ byte ret = skycoinPINVOKE.GoUint8Ptr_value(SWIGTYPE_p_GoUint8_.getCPtr(obj));
return ret;
}
@@ -1176,30 +1198,6 @@ public static uint SKY_coin_Block_HashBody(SWIGTYPE_p_Block__Handle p0, cipher_S
return ret;
}
- public static int equalSlices(GoSlice slice1, GoSlice slice2, int elem_size) {
- int ret = skycoinPINVOKE.equalSlices(GoSlice.getCPtr(slice1), GoSlice.getCPtr(slice2), elem_size);
- return ret;
- }
-
- public static int equalTransactions(coin__Transaction t1, coin__Transaction t2) {
- int ret = skycoinPINVOKE.equalTransactions(coin__Transaction.getCPtr(t1), coin__Transaction.getCPtr(t2));
- return ret;
- }
-
- public static int equalTransactionsArrays(GoSlice pTxs1, GoSlice pTxs2) {
- int ret = skycoinPINVOKE.equalTransactionsArrays(GoSlice.getCPtr (pTxs1), GoSlice.getCPtr (pTxs2));
- return ret;
- }
-
- public static int equalBlockHeaders(coin__BlockHeader bh1, coin__BlockHeader bh2) {
- int ret = skycoinPINVOKE.equalBlockHeaders(coin__BlockHeader.getCPtr(bh1), coin__BlockHeader.getCPtr(bh2));
- return ret;
- }
-
- public static void destroy_cipher_SecKeys(cipher_SecKeys p) {
- skycoinPINVOKE.destroy_cipher_SecKeys(cipher_SecKeys.getCPtr(p));
- }
-
public static uint SKY_coin_NewBlock(SWIGTYPE_p_Block__Handle p0, ulong p1, cipher_SecKey p2, SWIGTYPE_p_Transactions__Handle p3, SWIGTYPE_p_FeeCalculator p4, SWIGTYPE_p_Block__Handle p5) {
var tmpp2 = cipher_SecKey.getCPtr (p2);
{
@@ -3749,8 +3747,8 @@ public static uint SKY_coin_Create_Transactions(SWIGTYPE_p_Transactions__Handle
return ret;
}
- public static uint SKY_coin_GetTransactionsObject(SWIGTYPE_p_Transactions__Handle p0, GoSlice p1) {
- uint ret = skycoinPINVOKE.SKY_coin_GetTransactionsObject(SWIGTYPE_p_Transactions__Handle.getCPtr(p0), GoSlice.getCPtr (p1));
+ public static uint SKY_coin_GetTransactionsObject(SWIGTYPE_p_Transactions__Handle p0, SWIGTYPE_p_p_GoSlice_ p1) {
+ uint ret = skycoinPINVOKE.SKY_coin_GetTransactionsObject(SWIGTYPE_p_Transactions__Handle.getCPtr(p0), SWIGTYPE_p_p_GoSlice_.getCPtr(p1));
if (skycoinPINVOKE.SWIGPendingException.Pending) throw skycoinPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
diff --git a/LibskycoinNet/skycoin/skycoinPINVOKE.cs b/LibskycoinNet/skycoin/skycoinPINVOKE.cs
index 6445636b..c6f2d059 100644
--- a/LibskycoinNet/skycoin/skycoinPINVOKE.cs
+++ b/LibskycoinNet/skycoin/skycoinPINVOKE.cs
@@ -188,6 +188,21 @@ static skycoinPINVOKE() {
}
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_equalSlices")]
+ public static extern int equalSlices(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, int jarg3);
+
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_equalTransactions")]
+ public static extern int equalTransactions(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_equalTransactionsArrays")]
+ public static extern int equalTransactionsArrays(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_equalBlockHeaders")]
+ public static extern int equalBlockHeaders(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_destroy_cipher_SecKeys")]
+ public static extern void destroy_cipher_SecKeys(global::System.Runtime.InteropServices.HandleRef jarg1);
+
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_new_GoSlicep")]
public static extern global::System.IntPtr new_GoSlicep();
@@ -207,16 +222,16 @@ static skycoinPINVOKE() {
public static extern global::System.IntPtr new_GoUint8Ptr();
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_copy_GoUint8Ptr")]
- public static extern global::System.IntPtr copy_GoUint8Ptr(global::System.Runtime.InteropServices.HandleRef jarg1);
+ public static extern global::System.IntPtr copy_GoUint8Ptr(byte jarg1);
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_delete_GoUint8Ptr")]
public static extern void delete_GoUint8Ptr(global::System.Runtime.InteropServices.HandleRef jarg1);
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_GoUint8Ptr_assign")]
- public static extern void GoUint8Ptr_assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+ public static extern void GoUint8Ptr_assign(global::System.Runtime.InteropServices.HandleRef jarg1, byte jarg2);
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_GoUint8Ptr_value")]
- public static extern global::System.IntPtr GoUint8Ptr_value(global::System.Runtime.InteropServices.HandleRef jarg1);
+ public static extern byte GoUint8Ptr_value(global::System.Runtime.InteropServices.HandleRef jarg1);
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_new_GoStringp")]
public static extern global::System.IntPtr new_GoStringp();
@@ -854,21 +869,6 @@ static skycoinPINVOKE() {
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_SKY_coin_Block_HashBody__SWIG_0")]
public static extern uint SKY_coin_Block_HashBody__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_equalSlices")]
- public static extern int equalSlices(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, int jarg3);
-
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_equalTransactions")]
- public static extern int equalTransactions(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_equalTransactionsArrays")]
- public static extern int equalTransactionsArrays(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_equalBlockHeaders")]
- public static extern int equalBlockHeaders(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_destroy_cipher_SecKeys")]
- public static extern void destroy_cipher_SecKeys(global::System.Runtime.InteropServices.HandleRef jarg1);
-
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher_PubKey_isEqual")]
public static extern int cipher_PubKey_isEqual(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
@@ -959,9 +959,6 @@ static skycoinPINVOKE() {
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_delete_cipher_Sig")]
public static extern void delete_cipher_Sig(global::System.Runtime.InteropServices.HandleRef jarg1);
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher_SHA256_getStr")]
- public static extern global::System.IntPtr cipher_SHA256_getStr(global::System.Runtime.InteropServices.HandleRef jarg1);
-
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher_SHA256_isEqual")]
public static extern int cipher_SHA256_isEqual(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
@@ -971,6 +968,9 @@ static skycoinPINVOKE() {
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher_SHA256_assignTo")]
public static extern void cipher_SHA256_assignTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher_SHA256_getStr")]
+ public static extern global::System.IntPtr cipher_SHA256_getStr(global::System.Runtime.InteropServices.HandleRef jarg1);
+
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_set_cipher_SHA256_data")]
public static extern void set_cipher_SHA256_data(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
@@ -2420,15 +2420,15 @@ static skycoinPINVOKE() {
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_delete_api__NetworkConnectionsFilter")]
public static extern void delete_api__NetworkConnectionsFilter(global::System.Runtime.InteropServices.HandleRef jarg1);
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher__Address_isEqual")]
+ public static extern int cipher__Address_isEqual(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher__Address_getVersion")]
public static extern char cipher__Address_getVersion(global::System.Runtime.InteropServices.HandleRef jarg1);
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher__Address_setVersion")]
public static extern void cipher__Address_setVersion(global::System.Runtime.InteropServices.HandleRef jarg1, char jarg2);
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_cipher__Address_isEqual")]
- public static extern int cipher__Address_isEqual(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_set_cipher__Address_Version")]
public static extern void set_cipher__Address_Version(global::System.Runtime.InteropServices.HandleRef jarg1, byte jarg2);
@@ -2582,14 +2582,14 @@ static skycoinPINVOKE() {
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_delete_cli__SendAmount")]
public static extern void delete_cli__SendAmount(global::System.Runtime.InteropServices.HandleRef jarg1);
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_coin__Transaction_setInnerHash")]
- public static extern int coin__Transaction_setInnerHash(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_coin__Transaction_isEqual")]
+ public static extern int coin__Transaction_isEqual(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_coin__Transaction_GetInnerHash")]
public static extern global::System.IntPtr coin__Transaction_GetInnerHash(global::System.Runtime.InteropServices.HandleRef jarg1);
- [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_coin__Transaction_isEqual")]
- public static extern int coin__Transaction_isEqual(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+ [global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_coin__Transaction_setInnerHash")]
+ public static extern int coin__Transaction_setInnerHash(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
[global::System.Runtime.InteropServices.DllImport("skycoin", EntryPoint="CSharp_skycoin_set_coin__Transaction_Length")]
public static extern void set_coin__Transaction_Length(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
diff --git a/LibskycoinNet/skycoin/skycoinnet_wrap.c b/LibskycoinNet/skycoin/skycoinnet_wrap.c
index 103d308e..a45c66a4 100644
--- a/LibskycoinNet/skycoin/skycoinnet_wrap.c
+++ b/LibskycoinNet/skycoin/skycoinnet_wrap.c
@@ -281,6 +281,62 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_skycoin(SWIG_CSharpString
#include "skyerrors.h"
+ int equalSlices(GoSlice* slice1, GoSlice* slice2, int elem_size){
+ if(slice1->len != slice2->len)
+ return 0;
+ return memcmp(slice1->data, slice2->data, slice1->len * elem_size) == 0;
+ }
+ int equalTransactions(coin__Transaction* t1, coin__Transaction* t2){
+ if( t1->Length != t2->Length || t1->Type != t2->Type ){
+ return 0;
+ }
+ if( memcmp(&t1->InnerHash, &t2->InnerHash, sizeof(cipher__SHA256)) != 0 )
+ return 0;
+ if(!equalSlices((GoSlice*)&t1->Sigs, (GoSlice*)&t2->Sigs, sizeof(cipher__Sig)))
+ return 0;
+ if(!equalSlices((GoSlice*)&t1->In, (GoSlice*)&t2->In, sizeof(cipher__SHA256)))
+ return 0;
+ if(!equalSlices((GoSlice*)&t1->Out, (GoSlice*)&t2->Out, sizeof(coin__TransactionOutput)))
+ return 0;
+ return 1;
+ }
+ int equalTransactionsArrays(coin__Transactions* pTxs1, coin__Transactions* pTxs2){
+ if( pTxs1->len != pTxs2->len )
+ return 0;
+ coin__Transaction* pTx1 = pTxs1->data;
+ coin__Transaction* pTx2 = pTxs2->data;
+ int i;
+ for(i = 0; i < pTxs1->len; i++){
+ if(!equalTransactions(pTx1, pTx2))
+ return 0;
+ pTx1++;
+ pTx2++;
+ }
+ return 1;
+ }
+ int equalBlockHeaders(coin__BlockHeader* bh1, coin__BlockHeader* bh2){
+ if( bh1->Version != bh2->Version || bh1->Time != bh2->Time ||
+ bh1->BkSeq != bh2->BkSeq || bh1->Fee != bh2->Fee)
+ return 0;
+ if( memcmp( &bh1->PrevHash, bh2->PrevHash, sizeof(bh2->PrevHash) ) != 0 )
+ return 0;
+ if( memcmp( &bh1->BodyHash, bh2->PrevHash, sizeof(bh2->BodyHash) ) != 0 )
+ return 0;
+ if( memcmp( &bh1->UxHash, bh2->PrevHash, sizeof(bh2->UxHash) ) != 0 )
+ return 0;
+ return 1;
+ }
+
+
+ void destroy_cipher_SecKeys(cipher_SecKeys* p){
+ if( p != NULL ){
+ if( p->data != NULL ){
+ free( p->data );
+ }
+ }
+ }
+
+
static GoSlice *new_GoSlicep() {
return (GoSlice *) calloc(1,sizeof(GoSlice));
}
@@ -1915,62 +1971,6 @@ GoUint32_ _WrapperFeeCalculator(Transaction__Handle handle, GoUint64_* pFee, voi
return 0;
}
-
- int equalSlices(GoSlice* slice1, GoSlice* slice2, int elem_size){
- if(slice1->len != slice2->len)
- return 0;
- return memcmp(slice1->data, slice2->data, slice1->len * elem_size) == 0;
- }
- int equalTransactions(coin__Transaction* t1, coin__Transaction* t2){
- if( t1->Length != t2->Length || t1->Type != t2->Type ){
- return 0;
- }
- if( memcmp(&t1->InnerHash, &t2->InnerHash, sizeof(cipher__SHA256)) != 0 )
- return 0;
- if(!equalSlices((GoSlice*)&t1->Sigs, (GoSlice*)&t2->Sigs, sizeof(cipher__Sig)))
- return 0;
- if(!equalSlices((GoSlice*)&t1->In, (GoSlice*)&t2->In, sizeof(cipher__SHA256)))
- return 0;
- if(!equalSlices((GoSlice*)&t1->Out, (GoSlice*)&t2->Out, sizeof(coin__TransactionOutput)))
- return 0;
- return 1;
- }
- int equalTransactionsArrays(coin__Transactions* pTxs1, coin__Transactions* pTxs2){
- if( pTxs1->len != pTxs2->len )
- return 0;
- coin__Transaction* pTx1 = pTxs1->data;
- coin__Transaction* pTx2 = pTxs2->data;
- int i;
- for(i = 0; i < pTxs1->len; i++){
- if(!equalTransactions(pTx1, pTx2))
- return 0;
- pTx1++;
- pTx2++;
- }
- return 1;
- }
- int equalBlockHeaders(coin__BlockHeader* bh1, coin__BlockHeader* bh2){
- if( bh1->Version != bh2->Version || bh1->Time != bh2->Time ||
- bh1->BkSeq != bh2->BkSeq || bh1->Fee != bh2->Fee)
- return 0;
- if( memcmp( &bh1->PrevHash, bh2->PrevHash, sizeof(bh2->PrevHash) ) != 0 )
- return 0;
- if( memcmp( &bh1->BodyHash, bh2->PrevHash, sizeof(bh2->BodyHash) ) != 0 )
- return 0;
- if( memcmp( &bh1->UxHash, bh2->PrevHash, sizeof(bh2->UxHash) ) != 0 )
- return 0;
- return 1;
- }
-
-
- void destroy_cipher_SecKeys(cipher_SecKeys* p){
- if( p != NULL ){
- if( p->data != NULL ){
- free( p->data );
- }
- }
- }
-
SWIGINTERN int cipher_PubKey_isEqual(cipher_PubKey *self,cipher_PubKey *a){
return memcmp(self->data, a->data, sizeof(a->data)) == 0;
}
@@ -2014,12 +2014,6 @@ SWIGINTERN void cipher_Sig_assignFrom(cipher_Sig *self,void *data){
SWIGINTERN void cipher_Sig_assignTo(cipher_Sig *self,void *data){
memcpy(data, &self->data, sizeof(self->data));
}
-SWIGINTERN _GoString_ cipher_SHA256_getStr(cipher_SHA256 *self){
- _GoString_ str;
- str.p = (const char*)self->data;
- str.n = strlen(str.p);
- return str;
- }
SWIGINTERN int cipher_SHA256_isEqual(cipher_SHA256 *self,cipher_SHA256 *a){
return memcmp(self->data, a->data, sizeof(a->data)) == 0;
}
@@ -2029,6 +2023,12 @@ SWIGINTERN void cipher_SHA256_assignFrom(cipher_SHA256 *self,cipher_SHA256 *data
SWIGINTERN void cipher_SHA256_assignTo(cipher_SHA256 *self,cipher_SHA256 *data){
memcpy(data->data, &self->data, sizeof(self->data));
}
+SWIGINTERN _GoString_ cipher_SHA256_getStr(cipher_SHA256 *self){
+ _GoString_ str;
+ str.p = (const char*)self->data;
+ str.n = strlen(str.p);
+ return str;
+ }
SWIGINTERN int cipher_Checksum_isEqual(cipher_Checksum *self,cipher_Checksum *a){
return memcmp(self->data, a->data, sizeof(a->data)) == 0;
}
@@ -2214,38 +2214,37 @@ SWIGINTERN int GoSlice_getAtString(GoSlice *self,int index,_GoString_ *outs){
}
return 1;
}
-SWIGINTERN char cipher__Address_getVersion(cipher__Address *self){
- return self->Version;
- }
-SWIGINTERN void cipher__Address_setVersion(cipher__Address *self,char pValue){
- self->Version = pValue;
- }
SWIGINTERN int cipher__Address_isEqual(cipher__Address *self,cipher__Address *a){
if( self->Version == a->Version ){
return memcmp(self->Key, a->Key, sizeof(a->Key)) == 0;
}
return 0;
}
+SWIGINTERN char cipher__Address_getVersion(cipher__Address *self){
+ return self->Version;
+ }
+SWIGINTERN void cipher__Address_setVersion(cipher__Address *self,char pValue){
+ self->Version = pValue;
+ }
SWIGINTERN int cipher__BitcoinAddress_isEqual(cipher__BitcoinAddress *self,cipher__BitcoinAddress *a){
if( self->Version == a->Version ){
return memcmp(self->Key, a->Key, sizeof(a->Key)) == 0;
}
return 0;
}
+SWIGINTERN int coin__Transaction_isEqual(coin__Transaction *self,coin__Transaction *t){
+ return equalTransactions(self, t);
+ }
+SWIGINTERN cipher_SHA256 coin__Transaction_GetInnerHash(coin__Transaction *self){
+ cipher_SHA256 h;
+ cipher_SHA256_assignFrom(&h,self->InnerHash);
+ return h;
+ }
SWIGINTERN int coin__Transaction_setInnerHash(coin__Transaction *self,cipher_SHA256 h){
memset(self->InnerHash, 0, sizeof(cipher__SHA256));
cipher_SHA256_assignFrom(self->InnerHash,&h);
return 0;
}
-SWIGINTERN cipher_SHA256 coin__Transaction_GetInnerHash(coin__Transaction *self){
- cipher_SHA256 h;
-memset(&h, 0, sizeof(cipher__SHA256));
- cipher_SHA256_assignFrom(&h,&self->InnerHash);
- return h;
- }
-SWIGINTERN int coin__Transaction_isEqual(coin__Transaction *self,coin__Transaction *t){
- return equalTransactions(self, t);
- }
SWIGINTERN int coin__TransactionOutput_isEqual(coin__TransactionOutput *self,coin__TransactionOutput *t){
if( self->Coins != t->Coins ||
self->Hours != t->Hours ){
@@ -2274,6 +2273,72 @@ SWIGINTERN int coin__UxOut_isEqual(coin__UxOut *self,coin__UxOut *u){
extern "C" {
#endif
+SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_equalSlices(void * jarg1, void * jarg2, int jarg3) {
+ int jresult ;
+ GoSlice *arg1 = (GoSlice *) 0 ;
+ GoSlice *arg2 = (GoSlice *) 0 ;
+ int arg3 ;
+ int result;
+
+ arg1 = (GoSlice *)jarg1;
+ arg2 = (GoSlice *)jarg2;
+ arg3 = (int)jarg3;
+ result = (int)equalSlices(arg1,arg2,arg3);
+ jresult = result;
+ return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_equalTransactions(void * jarg1, void * jarg2) {
+ int jresult ;
+ coin__Transaction *arg1 = (coin__Transaction *) 0 ;
+ coin__Transaction *arg2 = (coin__Transaction *) 0 ;
+ int result;
+
+ arg1 = (coin__Transaction *)jarg1;
+ arg2 = (coin__Transaction *)jarg2;
+ result = (int)equalTransactions(arg1,arg2);
+ jresult = result;
+ return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_equalTransactionsArrays(void * jarg1, void * jarg2) {
+ int jresult ;
+ coin__Transactions *arg1 = (coin__Transactions *) 0 ;
+ coin__Transactions *arg2 = (coin__Transactions *) 0 ;
+ int result;
+
+ arg1 = (coin__Transactions *)jarg1;
+ arg2 = (coin__Transactions *)jarg2;
+ result = (int)equalTransactionsArrays(arg1,arg2);
+ jresult = result;
+ return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_equalBlockHeaders(void * jarg1, void * jarg2) {
+ int jresult ;
+ coin__BlockHeader *arg1 = (coin__BlockHeader *) 0 ;
+ coin__BlockHeader *arg2 = (coin__BlockHeader *) 0 ;
+ int result;
+
+ arg1 = (coin__BlockHeader *)jarg1;
+ arg2 = (coin__BlockHeader *)jarg2;
+ result = (int)equalBlockHeaders(arg1,arg2);
+ jresult = result;
+ return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_destroy_cipher_SecKeys(void * jarg1) {
+ cipher_SecKeys *arg1 = (cipher_SecKeys *) 0 ;
+
+ arg1 = (cipher_SecKeys *)jarg1;
+ destroy_cipher_SecKeys(arg1);
+}
+
+
SWIGEXPORT void * SWIGSTDCALL CSharp_skycoin_new_GoSlicep() {
void * jresult ;
GoSlice *result = 0 ;
@@ -2352,18 +2417,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_skycoin_new_GoUint8Ptr() {
}
-SWIGEXPORT void * SWIGSTDCALL CSharp_skycoin_copy_GoUint8Ptr(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_skycoin_copy_GoUint8Ptr(unsigned char jarg1) {
void * jresult ;
GoUint8_ arg1 ;
- GoUint8_ *argp1 ;
GoUint8_ *result = 0 ;
- argp1 = (GoUint8_ *)jarg1;
- if (!argp1) {
- SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null GoUint8_", 0);
- return 0;
- }
- arg1 = *argp1;
+ arg1 = (GoUint8_)jarg1;
result = (GoUint8_ *)copy_GoUint8Ptr(arg1);
jresult = (void *)result;
return jresult;
@@ -2378,34 +2437,24 @@ SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_delete_GoUint8Ptr(void * jarg1) {
}
-SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_GoUint8Ptr_assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_GoUint8Ptr_assign(void * jarg1, unsigned char jarg2) {
GoUint8_ *arg1 = (GoUint8_ *) 0 ;
GoUint8_ arg2 ;
- GoUint8_ *argp2 ;
arg1 = (GoUint8_ *)jarg1;
- argp2 = (GoUint8_ *)jarg2;
- if (!argp2) {
- SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null GoUint8_", 0);
- return ;
- }
- arg2 = *argp2;
+ arg2 = (GoUint8_)jarg2;
GoUint8Ptr_assign(arg1,arg2);
}
-SWIGEXPORT void * SWIGSTDCALL CSharp_skycoin_GoUint8Ptr_value(void * jarg1) {
- void * jresult ;
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_skycoin_GoUint8Ptr_value(void * jarg1) {
+ unsigned char jresult ;
GoUint8_ *arg1 = (GoUint8_ *) 0 ;
GoUint8_ result;
arg1 = (GoUint8_ *)jarg1;
result = GoUint8Ptr_value(arg1);
- {
- GoUint8_ * resultptr = (GoUint8_ *) malloc(sizeof(GoUint8_));
- memmove(resultptr, &result, sizeof(GoUint8_));
- jresult = resultptr;
- }
+ jresult = result;
return jresult;
}
@@ -5362,72 +5411,6 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_skycoin_SKY_coin_Block_HashBody__SWIG
}
-SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_equalSlices(void * jarg1, void * jarg2, int jarg3) {
- int jresult ;
- GoSlice *arg1 = (GoSlice *) 0 ;
- GoSlice *arg2 = (GoSlice *) 0 ;
- int arg3 ;
- int result;
-
- arg1 = (GoSlice *)jarg1;
- arg2 = (GoSlice *)jarg2;
- arg3 = (int)jarg3;
- result = (int)equalSlices(arg1,arg2,arg3);
- jresult = result;
- return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_equalTransactions(void * jarg1, void * jarg2) {
- int jresult ;
- coin__Transaction *arg1 = (coin__Transaction *) 0 ;
- coin__Transaction *arg2 = (coin__Transaction *) 0 ;
- int result;
-
- arg1 = (coin__Transaction *)jarg1;
- arg2 = (coin__Transaction *)jarg2;
- result = (int)equalTransactions(arg1,arg2);
- jresult = result;
- return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_equalTransactionsArrays(GoSlice_ * jarg1, GoSlice_ * jarg2) {
- int jresult ;
- coin__Transactions *arg1 = (coin__Transactions *) 0 ;
- coin__Transactions *arg2 = (coin__Transactions *) 0 ;
- int result;
-
- arg1 = (coin__Transactions *)jarg1;
- arg2 = (coin__Transactions *)jarg2;
- result = (int)equalTransactionsArrays(arg1,arg2);
- jresult = result;
- return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_equalBlockHeaders(void * jarg1, void * jarg2) {
- int jresult ;
- coin__BlockHeader *arg1 = (coin__BlockHeader *) 0 ;
- coin__BlockHeader *arg2 = (coin__BlockHeader *) 0 ;
- int result;
-
- arg1 = (coin__BlockHeader *)jarg1;
- arg2 = (coin__BlockHeader *)jarg2;
- result = (int)equalBlockHeaders(arg1,arg2);
- jresult = result;
- return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_destroy_cipher_SecKeys(void * jarg1) {
- cipher_SecKeys *arg1 = (cipher_SecKeys *) 0 ;
-
- arg1 = (cipher_SecKeys *)jarg1;
- destroy_cipher_SecKeys(arg1);
-}
-
-
SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_cipher_PubKey_isEqual(void * jarg1, void * jarg2) {
int jresult ;
cipher_PubKey *arg1 = (cipher_PubKey *) 0 ;
@@ -5772,22 +5755,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_delete_cipher_Sig(void * jarg1) {
}
-SWIGEXPORT void * SWIGSTDCALL CSharp_skycoin_cipher_SHA256_getStr(void * jarg1) {
- void * jresult ;
- cipher_SHA256 *arg1 = (cipher_SHA256 *) 0 ;
- _GoString_ result;
-
- arg1 = (cipher_SHA256 *)jarg1;
- result = cipher_SHA256_getStr(arg1);
- {
- _GoString_ * resultptr = (_GoString_ *) malloc(sizeof(_GoString_));
- memmove(resultptr, &result, sizeof(_GoString_));
- jresult = resultptr;
- }
- return jresult;
-}
-
-
SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_cipher_SHA256_isEqual(void * jarg1, void * jarg2) {
int jresult ;
cipher_SHA256 *arg1 = (cipher_SHA256 *) 0 ;
@@ -5822,6 +5789,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_cipher_SHA256_assignTo(void * jarg1,
}
+SWIGEXPORT void * SWIGSTDCALL CSharp_skycoin_cipher_SHA256_getStr(void * jarg1) {
+ void * jresult ;
+ cipher_SHA256 *arg1 = (cipher_SHA256 *) 0 ;
+ _GoString_ result;
+
+ arg1 = (cipher_SHA256 *)jarg1;
+ result = cipher_SHA256_getStr(arg1);
+ {
+ _GoString_ * resultptr = (_GoString_ *) malloc(sizeof(_GoString_));
+ memmove(resultptr, &result, sizeof(_GoString_));
+ jresult = resultptr;
+ }
+ return jresult;
+}
+
+
SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_set_cipher_SHA256_data(void * jarg1, void * jarg2) {
cipher_SHA256 *arg1 = (cipher_SHA256 *) 0 ;
GoUint8 *arg2 ;
@@ -13681,7 +13664,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_skycoin_SKY_coin_Create_Transactions(
}
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_skycoin_SKY_coin_GetTransactionsObject(void * jarg1, GoSlice_ * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_skycoin_SKY_coin_GetTransactionsObject(void * jarg1, void * jarg2) {
unsigned int jresult ;
Transactions__Handle arg1 ;
coin__UxArray **arg2 = (coin__UxArray **) 0 ;
@@ -14165,6 +14148,20 @@ SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_delete_api__NetworkConnectionsFilter(
}
+SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_cipher__Address_isEqual(void * jarg1, void * jarg2) {
+ int jresult ;
+ cipher__Address *arg1 = (cipher__Address *) 0 ;
+ cipher__Address *arg2 = (cipher__Address *) 0 ;
+ int result;
+
+ arg1 = (cipher__Address *)jarg1;
+ arg2 = (cipher__Address *)jarg2;
+ result = (int)cipher__Address_isEqual(arg1,arg2);
+ jresult = result;
+ return jresult;
+}
+
+
SWIGEXPORT char SWIGSTDCALL CSharp_skycoin_cipher__Address_getVersion(void * jarg1) {
char jresult ;
cipher__Address *arg1 = (cipher__Address *) 0 ;
@@ -14187,20 +14184,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_cipher__Address_setVersion(void * jar
}
-SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_cipher__Address_isEqual(void * jarg1, void * jarg2) {
- int jresult ;
- cipher__Address *arg1 = (cipher__Address *) 0 ;
- cipher__Address *arg2 = (cipher__Address *) 0 ;
- int result;
-
- arg1 = (cipher__Address *)jarg1;
- arg2 = (cipher__Address *)jarg2;
- result = (int)cipher__Address_isEqual(arg1,arg2);
- jresult = result;
- return jresult;
-}
-
-
SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_set_cipher__Address_Version(void * jarg1, unsigned char jarg2) {
cipher__Address *arg1 = (cipher__Address *) 0 ;
GoUint8_ arg2 ;
@@ -14779,21 +14762,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_skycoin_delete_cli__SendAmount(void * jarg1)
}
-SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_coin__Transaction_setInnerHash(void * jarg1, void * jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_coin__Transaction_isEqual(void * jarg1, void * jarg2) {
int jresult ;
coin__Transaction *arg1 = (coin__Transaction *) 0 ;
- cipher_SHA256 arg2 ;
- cipher_SHA256 *argp2 ;
+ coin__Transaction *arg2 = (coin__Transaction *) 0 ;
int result;
arg1 = (coin__Transaction *)jarg1;
- argp2 = (cipher_SHA256 *)jarg2;
- if (!argp2) {
- SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null cipher_SHA256", 0);
- return 0;
- }
- arg2 = *argp2;
- result = (int)coin__Transaction_setInnerHash(arg1,arg2);
+ arg2 = (coin__Transaction *)jarg2;
+ result = (int)coin__Transaction_isEqual(arg1,arg2);
jresult = result;
return jresult;
}
@@ -14815,15 +14792,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_skycoin_coin__Transaction_GetInnerHash(void
}
-SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_coin__Transaction_isEqual(void * jarg1, void * jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_skycoin_coin__Transaction_setInnerHash(void * jarg1, void * jarg2) {
int jresult ;
coin__Transaction *arg1 = (coin__Transaction *) 0 ;
- coin__Transaction *arg2 = (coin__Transaction *) 0 ;
+ cipher_SHA256 arg2 ;
+ cipher_SHA256 *argp2 ;
int result;
arg1 = (coin__Transaction *)jarg1;
- arg2 = (coin__Transaction *)jarg2;
- result = (int)coin__Transaction_isEqual(arg1,arg2);
+ argp2 = (cipher_SHA256 *)jarg2;
+ if (!argp2) {
+ SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null cipher_SHA256", 0);
+ return 0;
+ }
+ arg2 = *argp2;
+ result = (int)coin__Transaction_setInnerHash(arg1,arg2);
jresult = result;
return jresult;
}
diff --git a/LibskycoinNet/skycoin/skycoinnet_wrap.h b/LibskycoinNet/skycoin/skycoinnet_wrap.h
deleted file mode 100644
index ca9c7383..00000000
--- a/LibskycoinNet/skycoin/skycoinnet_wrap.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG
- * interface file instead.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_skycoin_WRAP_H_
-#define SWIG_skycoin_WRAP_H_
-
-
-#endif
diff --git a/gopath/src/github.com/skycoin/skycoin b/gopath/src/github.com/skycoin/skycoin
index 8d49f360..8000506e 160000
--- a/gopath/src/github.com/skycoin/skycoin
+++ b/gopath/src/github.com/skycoin/skycoin
@@ -1 +1 @@
-Subproject commit 8d49f36088303e08f822ac8969acefbc009431a6
+Subproject commit 8000506eeeb2cc0415ce10f80628de5eab162eaf
diff --git a/swig/csharp_java_typemap.i b/swig/csharp_java_typemap.i
index eb9d964f..5d67cf24 100644
--- a/swig/csharp_java_typemap.i
+++ b/swig/csharp_java_typemap.i
@@ -85,19 +85,7 @@ CSHARP_ARRAYS_FIXED(int, int)
%typemap(cstype,pre=" var tmp$csinput = GoSlice.getCPtr ($csinput);") GoSlice_* "GoSlice"
%typemap(csin) GoSlice_* "GoSlice.getCPtr ($csinput)"
-%apply unsigned short {GoUint16, GoUint16_};
-%apply unsigned long {GoUintptr, __SIZE_TYPE__};
-%apply short {GoInt16, GoInt16_};
-%apply unsigned char {GoUint8_, GoUint8};
-%apply unsigned int {GoUint32_, GoUint32};
-%apply signed char {GoInt8_, GoInt8};
-%apply unsigned long long {GoUint64, GoUint64_,GoUint,GoUint_};
-%apply long long {GoInt64, GoInt64_,GoInt_, GoInt };
-%apply GoSlice_* {coin__UxArray*,GoSlice_**};
-%apply int {GoInt32,GoInt32_,ptrdiff_t};
-%apply int* {GoInt32*,GoInt32_*,ptrdiff_t*};
-%apply float {GoFloat32};
-%apply double {GoFloat64};
+
%typemap(freearg) (cipher_PubKeys* __in_pubKeys) {
diff --git a/swig/libdotnet.i b/swig/libdotnet.i
index 733edcf8..499e7d5d 100644
--- a/swig/libdotnet.i
+++ b/swig/libdotnet.i
@@ -1,5 +1,6 @@
%module skycoin
%include "typemaps.i"
+%include "cstring.i"
%{
#define SWIG_FILE_WITH_INIT
@@ -7,14 +8,14 @@
#include "swig.h"
#include "skyerrors.h"
%}
-
+%include "/gopath/src/github.com/skycoin/skycoin/lib/swig/common/common.i"
+%include "/gopath/src/github.com/skycoin/skycoin/lib/swig//static/static.i"
%include "csharp_java_typemap.i"
%include "csharp_structs_typemaps.i"
%include "csharp_java_basic.i"
%include "csharp_skycoin.mem.i"
%include "csharp_java_callback.i"
-%include "/gopath/src/github.com/skycoin/skycoin/lib/swig/includes.i"
%include "swig.h"
/* Find the modified copy of libskycoin */
%include "libskycoin.h"