test

Author: jl777

.gitignore

@@ -113,3 +113,5 @@ libjl777/SuperNET.dSYM/Contents/Resources/DWARF/SuperNET
 libjl777/picocoin/
 
 libjl777/websocketd/
+
+libjl777/plugins/agents/pangea

libjl777/Makefile

@@ -79,6 +79,8 @@ _echodemo := rm agents/echodemo; gcc -o agents/echodemo -O2 $(PINCLUDES) agents/
 
 _shuffle := rm agents/shuffle; gcc -o agents/shuffle -O2 $(PINCLUDES) agents/shuffle777.c $(PLIBS)
 
+_pangea := rm agents/pangea; gcc -o agents/pangea -O2 $(PINCLUDES) games/pangea777.c $(PLIBS)
+
 #_rps := rm agents/rps; gcc -o agents/rps -O2 $(PINCLUDES) common/rps777.c $(PLIBS)
 
 _api := rm cgi/*; gcc -o cgi/api -O2 $(PINCLUDES) agents/api_main.c ccgi/ccgi.c coins/bitcoind_RPC.c  $(PLIBS); ln cgi/api cgi/nxt; ln cgi/api cgi/nxts; ln cgi/api cgi/port; ln cgi/api cgi/stringified; ln cgi/api cgi/ports; ln cgi/api cgi/InstantDEX; ln cgi/api cgi/init;  ln cgi/api cgi/public
@@ -99,12 +101,16 @@ agents: plugins/agents/echodemo plugins/cgi/api plugins/agents/nxt plugins/agent
 	cd plugins; \
     $(_echodemo); \
     #$(_shuffle); \
+    $(_pangea); \
     $(_api); \
     cd ..
 
 rps: plugins/agents/rps; \
  	cd plugins; $(_rps); cd ..
 
+pangea: doesntexist; \
+ 	cd plugins; $(_pangea); cd ..
+
 echodemo: doesntexist; \
  	cd plugins; $(_echodemo); cd ..
 

libjl777/plugins/InstantDEX/InstantDEX_main.c

@@ -445,7 +445,9 @@ char *InstantDEX(char *jsonstr,char *remoteaddr,int32_t localaccess)
         // test: asset/asset, asset/external, external/external, autofill and automatch
         // peggy integration
         if ( bidask_parse(localaccess,&exchangestr,&name,&base,&rel,&gui,&iQ,json) < 0 && strcmp(exchangestr.buf,"jumblr") == 0 )
-            return(clonestr("{\"error\":\"invalid parameters\"}"));
+        {
+            //return(clonestr("{\"error\":\"invalid parameters\"}"));
+        }
         if ( iQ.s.offerNXT == 0 )
             iQ.s.offerNXT = SUPERNET.my64bits;
         //printf("isask.%d base.(%s) rel.(%s)\n",iQ.s.isask,base.buf,rel.buf);

libjl777/plugins/includes/portable777.h

@@ -80,10 +80,16 @@ struct pingpong_queue
 #define BTCDADDRSIZE 36
 union _bits128 { uint8_t bytes[16]; uint16_t ushorts[8]; uint32_t uints[4]; uint64_t ulongs[2]; uint64_t txid; };
 typedef union _bits128 bits128;
+#ifndef bits256
 union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };
 typedef union _bits256 bits256;
+#endif
+
+#ifndef bits320
 union _bits320 { uint8_t bytes[40]; uint16_t ushorts[20]; uint32_t uints[10]; uint64_t ulongs[5]; uint64_t txid; };
 typedef union _bits320 bits320;
+#endif
+
 union _bits384 { bits256 sig; uint8_t bytes[48]; uint16_t ushorts[24]; uint32_t uints[12]; uint64_t ulongs[6]; uint64_t txid; };
 typedef union _bits384 bits384;
 

libjl777/plugins/utils/curve25519.h

@@ -17,6 +17,15 @@
 #ifndef dcnet_curve25519_h
 #define dcnet_curve25519_h
 
+#ifndef bits320
+union _bits320 { uint8_t bytes[40]; uint16_t ushorts[20]; uint32_t uints[10]; uint64_t ulongs[5]; uint64_t txid; };
+typedef union _bits320 bits320;
+#endif
+
+#ifndef bits256
+union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };
+typedef union _bits256 bits256;
+#endif
 
 // special gcc mode for 128-bit integers. It's implemented on 64-bit platforms only as far as I know.
 typedef unsigned uint128_t __attribute__((mode(TI)));
@@ -282,6 +291,22 @@ static inline bits320 force_inline crecip(const bits320 z)
     /* 2^255 - 21 */ return(fmul(t0, a));
 }
 
+static bits256 curve25519(bits256 mysecret,bits256 basepoint)
+{
+    bits320 bp,x,z;
+    bp = fexpand(basepoint);
+    cmult(&x,&z,mysecret,bp);
+    return(fcontract(fmul(x,crecip(z))));
+}
+
+static bits256 rand256(int32_t privkeyflag)
+{
+    bits256 randval;
+    randombytes(randval.bytes,sizeof(randval));
+    if ( privkeyflag != 0 )
+        randval.bytes[0] &= 0xf8, randval.bytes[31] &= 0x7f, randval.bytes[31] |= 0x40;
+    return(randval);
+}
 // following is ported from libtom
 struct sha256_vstate { uint64_t length; uint32_t state[8],curlen; uint8_t buf[64]; };