Merge remote-tracking branch 'jl777/master'

.gitignore

@@ -1,14 +1,18 @@
 
 *.o
 
-agents/iguana
 
-agents/libcrypto777.a
+
+
 
 agents/iguana.exe
 
 iguana/pnacl/Release/iguana_unstripped.pexe
 
+iguana/pnacl/Release/iguana.pexe
+
+agents/libcrypto777.a
+
 iguana/pnacl/Release/iguana_unstripped.bc
 
 *.deps
@@ -18,3 +22,9 @@ iguana/pnacl/Release/iguana_unstripped.bc---linked.pre_opt.pexe
 *.stamp
 
 *.d
+
+iguana/tests/.priv2wif.swp
+
+agents/libiguana.a
+
+iguana/iguana_rpc.o-2ed461a0

Makefile

@@ -0,0 +1,21 @@
+
+
+win32: win32_crypto win32_iguana
+
+win64: win64_crypto win64_iguana
+
+#build for win32 environment
+win32_crypto:
+	cd crypto777; make -f make_win32; cd ..
+
+win32_iguana:
+	cd iguana; make -f make_win32; cd ..
+
+#build for win64 environment
+win64_crypto:
+	cd crypto777; make -f make_win64; cd ..
+
+win64_iguana:
+	cd iguana; make -f make_win64; cd ..
+
+

README.md

@@ -1,10 +1,8 @@
 #SuperNET Client "iguana"
 
-[![Join the chat at https://gitter.im/jl777/SuperNET](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jl777/SuperNET?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 > #TL;DR#
 > 
-> ```sudo apt-get update; sudo apt-get install libcurl4-gnutls-dev libssl-dev; git clone https://github.com/jl777/SuperNET; cd SuperNET; ./m_onetime m_unix; ./m_unix; agents/iguana```
+> ```sudo apt-get update; sudo apt-get git install build-essential; git clone https://github.com/jl777/SuperNET; cd SuperNET; ./m_onetime m_unix;```
 > 
 > The above one line gets SuperNET installed, built and launched for unix. 
 > 
@@ -12,6 +10,8 @@
 > *Continue below at "Running".*
 
 **iguana is easy to build. Start by cloning (or downloading) this repository.**
+*** all external dependencies have been removed, except for -lpthread and -lm
+
 
 #DEPENDENCIES#
 ##for native (unix, osx)##
@@ -108,3 +108,35 @@ iguana can be invoked with a command line argument. if it is a name of a file, i
 "exchanges" -> { "name":"<name of exchange>", ... }
     "apikey", "apisecret", "userid", "tradepassword" these are as expected
     "pollgap" -> gap between each access to exchange for getting prices
+    
+on OSX mksquashfs is not native, you will need to install fuse: https://osxfuse.github.io/ and a squashfs for mac: https://github.com/vasi/squashfuse
+
+    **********
+    user feedback:
+    A Note on Installation from pebwindkraft at bitco.in
+=======================
+Though I had xcode installed, aclocal didn’t work. I installed homebrew, and then:
+# brew install autoconf
+# brew install automake
+# brew install gmp
+
+2.) libsecp256
+it complained, that libsecp256 was not there in includes, so I linked it.
+Loretta:/Users/volker/SuperNET/includes # ln -s ../osx/libsecp256k1 .
+
+3.) I had to change ulimit
+During the syncing, I have many, many messages like this:
+>>
+>> cant create.(tmp/BTC/252000/.tmpmarker) errno.24 Too many open files
+>> cant create.(tmp/BTC/18000/.tmpmarker) errno.24 Too many open files
+>>
+Loretta:/Users/volker/SuperNET # ulimit -n 2048
+
+
+##### tests
+in the SuperNET/iguana/tests directory, there is a jsoncmp.c file, which can be built into the jsoncmp executable via ./make_jsoncmp
+once jsoncmp is built, then ./test shows how to use it
+./jsoncmp <filename> {\"fields\":[{\"fieldA\":\"requiredvalueA\"},{\"fieldB\":\"requiredvalueB\"},...]}
+
+the idea is to issue a curl command into a /tmp/file and then use jsoncmp to verify the exact value of one or more fields. it will print to stdout JSON with "error" or "result" and to stderr if there is an error
+

SuperNET/hostnet777.c

@@ -146,7 +146,7 @@ extern int32_t Debuglevel;
 #include "../includes/curve25519.h"
 
 
-static bits256 zeropoint;
+static const bits256 zeropoint;
 
 int64_t hostnet777_convmT(struct hostnet777_mtime *mT,int64_t othermillitime)
 {

SuperNET/main.c

@@ -216,7 +216,7 @@ bits256 SuperNET_OPRETURN(struct supernet_info *myinfo,char *symbol,double fee,u
 
 bits256 SuperNET_agentannounce(struct supernet_info *myinfo,struct supernet_agent *agent,cJSON *network)
 {
-    static bits256 zero;
+    static const bits256 zero;
     uint8_t buf[80 + sizeof(struct iguana_msghdr)],*data;
     bits256 pubkey,sig; int32_t i,len=0; uint8_t netmagic[4]; char *sigstr,*announce,*pubkeystr;
     memset(buf,0,sizeof(buf));

SuperNET/teleport777.c

@@ -96,7 +96,7 @@ uint64_t parse_unspent_json(struct telepod *pod,struct coin777 *coin,cJSON *json
     copy_cJSON(&tmp,cJSON_GetObjectItem(json,"txid")), safecopy(pod->txid,tmp.buf,sizeof(pod->txid));
     copy_cJSON(&tmp,cJSON_GetObjectItem(json,"address")), safecopy(pod->podaddr,tmp.buf,sizeof(pod->podaddr));;
     copy_cJSON(&tmp,cJSON_GetObjectItem(json,"scriptPubKey")), safecopy(pod->script,tmp.buf,sizeof(pod->script));;
-    amount = (uint64_t)(SATOSHIDEN * get_API_float(cJSON_GetObjectItem(json,"amount")));
+    amount = (uint64_t)(SATOSHIDEN * jdouble(json,"amount"));
     pod->vout = juint(json,"vout");
     pod->numconfirms = juint(json,"confirmations");
     if ( pod->txid[0] != 0 && pod->podaddr[0] != 0 && pod->script[0] != 0 && amount != 0 && pod->vout >= 0 )