Fix sell cancel bug

mastercoin-MSC · Mar 15, 2014 · 5b2b2c8 · 5b2b2c8
1 parent be383cd
commit 5b2b2c8
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 5 deletions.
diff --git a/bin/MasterchestWalletAlpha_Bin.zip b/bin/MasterchestWalletAlpha_Bin.zip
diff --git a/source/bin/Release/Masterchest_Wallet.application b/source/bin/Release/Masterchest_Wallet.application
@@ -15,7 +15,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5hEvrPzQOEVLyAZxjQeutZ9EOII=</dsig:DigestValue>
+        <dsig:DigestValue>1iKO9Fy2Bao9xAGDSB2PvMBFcDI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/source/bin/Release/Masterchest_Wallet.exe b/source/bin/Release/Masterchest_Wallet.exe
diff --git a/source/bin/Release/Masterchest_Wallet.exe.manifest b/source/bin/Release/Masterchest_Wallet.exe.manifest
@@ -73,7 +73,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>1rPXQ7W0C8R34HBahOYJ6UfcgqU=</dsig:DigestValue>
+        <dsig:DigestValue>M/+SVZnEgQH2nEAl1a+BnH0c5Pk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/source/bin/Release/Masterchest_Wallet.pdb b/source/bin/Release/Masterchest_Wallet.pdb
diff --git a/source/obj/x86/Release/Masterchest_Wallet.application b/source/obj/x86/Release/Masterchest_Wallet.application
@@ -15,7 +15,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5hEvrPzQOEVLyAZxjQeutZ9EOII=</dsig:DigestValue>
+        <dsig:DigestValue>1iKO9Fy2Bao9xAGDSB2PvMBFcDI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/source/obj/x86/Release/Masterchest_Wallet.exe b/source/obj/x86/Release/Masterchest_Wallet.exe
diff --git a/source/obj/x86/Release/Masterchest_Wallet.exe.manifest b/source/obj/x86/Release/Masterchest_Wallet.exe.manifest
@@ -73,7 +73,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>1rPXQ7W0C8R34HBahOYJ6UfcgqU=</dsig:DigestValue>
+        <dsig:DigestValue>M/+SVZnEgQH2nEAl1a+BnH0c5Pk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/source/obj/x86/Release/Masterchest_Wallet.pdb b/source/obj/x86/Release/Masterchest_Wallet.pdb
diff --git a/source/sellcancelfrm.vb b/source/sellcancelfrm.vb
@@ -38,6 +38,13 @@ Public Class sellcancelfrm
     Private Sub bsell_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles bsell.Click
         If Len(lselladdress.Text) > 26 And Len(lselladdress.Text) < 35 Then 'sanity check
             Try
+                Dim tmpcur
+                If dexcur = "MSC" Then
+                    tmpcur = 1
+                End If
+                If dexcur = "TMSC" Then
+                    tmpcur = 2
+                End If
                 sentfrm.lsent.Text = "transaction failed"
                 bsell.Enabled = False
                 'get wallet passphrase
@@ -48,7 +55,7 @@ Public Class sellcancelfrm
                 If validater.result.isvalid = True Then 'address is valid
                     txsummary = "Address is valid."
                     'push out to masterchest lib to encode the tx
-                    Dim rawtx As String = mlib.encodeselltx(bitcoin_con, lselladdress.Text, 2, 1, 1, 1, 1, 3)
+                    Dim rawtx As String = mlib.encodeselltx(bitcoin_con, lselladdress.Text, tmpcur, 1, 1, 1, 1, 3)
                     'is rawtx empty
                     If rawtx = "" Then
                         txsummary = txsummary & vbCrLf & "Raw transaction is empty - stopping."