Merge branch 'dev' of https://github.com/miketout/komodo into dev

src/rpc/misc.cpp

@@ -56,7 +56,7 @@ uint32_t komodo_segid32(char *coinaddr);
 int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height);
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
 #define KOMODO_VERSION "0.2.1"
-#define VERUS_VERSION "0.4.0"
+#define VERUS_VERSION "0.4.0b"
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
 extern uint32_t ASSETCHAINS_CC;
 extern uint32_t ASSETCHAINS_MAGIC;

src/snark/Makefile

@@ -16,7 +16,12 @@ endif
 # To override these, use "make OPTFLAGS=..." etc.
 CURVE = BN128
 OPTFLAGS = -O2 -march=x86-64 -g -mtune=x86-64
-FEATUREFLAGS = -DUSE_ASM -DMONTGOMERY_OUTPUT
+
+ifneq ($(PLATFORM),darwin)
+	FEATUREFLAGS = -DUSE_ASM -DMONTGOMERY_OUTPUT
+else
+	FEATUREFLAGS = -DUSE_ASM -DMONTGOMERY_OUTPUT -D__SIZE_TYPE__="unsigned long long"
+endif
 
 # Initialize this using "CXXFLAGS=... make". The makefile appends to that.
 CXXFLAGS += -std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-comment -Wfatal-errors $(OPTFLAGS) $(FEATUREFLAGS) -DCURVE_$(CURVE)

src/snark/libsnark/common/utils.hpp

@@ -25,7 +25,7 @@ size_t log2(size_t n);
 
 inline size_t exp2(size_t k) { return UINT64_C(1) << k; }
 
-size_t bitreverse(size_t n, const size_t l);
+uint64_t bitreverse(uint64_t n, const uint64_t l);
 bit_vector int_list_to_bits(const std::initializer_list<uint64_t> &l, const size_t wordsize);
 int64_t div_ceil(int64_t x, int64_t y);
 

src/verus

@@ -1,2 +1,5 @@
 #!/bin/bash
-komodo-cli -ac_name=VRSC "$@"
+#set working directory to the location of this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+./komodo-cli -ac_name=VRSC "$@"

src/verus.bat

@@ -0,0 +1,14 @@
+@call :GET_CURRENT_DIR
+@cd %THIS_DIR%
+komodo-cli.exe -ac_name=VRSC %1 %2 %3 %4 %5 %6 %7 %8 %9
+@goto :EOF
+
+:GET_CURRENT_DIR
+@pushd %~dp0
+@set THIS_DIR=%CD%
+@popd
+@goto :EOF
+
+
+
+

src/verusd.bat

@@ -0,0 +1,10 @@
+@call :GET_CURRENT_DIR
+@cd %THIS_DIR%
+komodod.exe -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 %1 %2 %3 %4 %5 %6 %7 %8 %9
+@goto :EOF
+
+:GET_CURRENT_DIR
+@pushd %~dp0
+@set THIS_DIR=%CD%
+@popd
+@goto :EOF