Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-14 20:42:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/bitsquare/bitsquare

Browse source
This commit is contained in:
Manfred Karrer 2014-07-31 18:54:01 +02:00
commit 79a52a6e38
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -37,9 +37,9 @@ mvn clean install -DskipTests
### Transactions of a test trade on main net: ### Transactions of a test trade on main net:
Offerer registration tx: https://blockchain.info/de/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76 * [Offerer registration tx](https://blockchain.info/de/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76)
Taker registration tx: https://blockchain.info/tx/8352ab9fe78593f48ef70d414d494ebd614d99fab147d0342910525e9284ba8f * [Taker registration tx](https://blockchain.info/tx/8352ab9fe78593f48ef70d414d494ebd614d99fab147d0342910525e9284ba8f)
Create offer fee tx: https://blockchain.info/tx/24f4d229edace44d9123628363a16cd7041f5d34ba6bef812807b9be03a64692 * [Create offer fee tx](https://blockchain.info/tx/24f4d229edace44d9123628363a16cd7041f5d34ba6bef812807b9be03a64692)
Take offer fee tx: https://blockchain.info/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76 * [Take offer fee tx](https://blockchain.info/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76)
Deposit tx: https://blockchain.info/de/tx/98c6ae55963022871216a6a124c1e1ed7f6308560e76b72617b6b54cf50ef412 * [Deposit tx](https://blockchain.info/de/tx/98c6ae55963022871216a6a124c1e1ed7f6308560e76b72617b6b54cf50ef412)
Payout tx: https://blockchain.info/tx/498e2c299ca991b27f61b63fb6ee457819ee9e33ee5a1d250fde47eb15199adc * [Payout tx](https://blockchain.info/tx/498e2c299ca991b27f61b63fb6ee457819ee9e33ee5a1d250fde47eb15199adc)

7
pom.xml
View file

@ -109,6 +109,13 @@
<configuration> <configuration>
<mainClass>io.bitsquare.BitSquare</mainClass> <mainClass>io.bitsquare.BitSquare</mainClass>
</configuration> </configuration>
<dependencies>
<dependency>
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor</artifactId>
<version>2.1.0</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>

5
src/main/java/io/bitsquare/util/Utilities.java
View file

@ -3,7 +3,6 @@ package io.bitsquare.util;
import com.google.gson.FieldNamingPolicy; import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.sun.xml.internal.messaging.saaj.util.ByteInputStream;
import java.awt.Desktop; import java.awt.Desktop;
import java.io.*; import java.io.*;
import java.net.URI; import java.net.URI;
@ -35,8 +34,8 @@ public class Utilities
Object result = null; Object result = null;
try try
{ {
ByteInputStream byteInputStream = new ByteInputStream(); ByteArrayInputStream byteInputStream =
byteInputStream.setBuf(com.google.bitcoin.core.Utils.parseAsHexOrBase58(serializedHexString)); new ByteArrayInputStream(com.google.bitcoin.core.Utils.parseAsHexOrBase58(serializedHexString));
try (ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream)) try (ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream))
{ {