Merge branch 'dev' into jl777

2018-04-20 09:32:24 +03:00
parent 02290a3fd8 0a4ffaff30
commit 74d30ec279
11 changed files with 41 additions and 48 deletions
--- a/depends/packages/googletest.mk
+++ b/depends/packages/googletest.mk
@@ -14,7 +14,8 @@ endif
 ifeq ($(build_os),darwin)
 $(package)_install=ginstall
 define $(package)_build_cmds
-    $(MAKE) -C make gtest.a
+    $(MAKE) -C googlemock/make gmock.a && \
+    $(MAKE) -C googletest/make gtest.a
 endef
 else
 $(package)_install=install
--- a/depends/packages/libsodium.mk
+++ b/depends/packages/libsodium.mk
@@ -1,17 +1,20 @@
+ifeq ($(build_os),darwin)
+package=libsodium
+$(package)_version=1.0.11
+$(package)_download_path=https://supernetorg.bintray.com/misc
+$(package)_file_name=libsodium-1.0.11.tar.gz
+$(package)_sha256_hash=a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765
+$(package)_dependencies=
+$(package)_config_opts=
+else
 package=libsodium
-#<<<<<<< HEAD
-#$(package)_version=1.0.11
-#$(package)_download_path=https://supernetorg.bintray.com/misc
-#$(package)_file_name=libsodium-1.0.11.tar.gz
-#$(package)_sha256_hash=a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765
-#=======
 $(package)_version=1.0.15
 $(package)_download_path=https://download.libsodium.org/libsodium/releases/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
-#>>>>>>> zcash/master
 $(package)_dependencies=
 $(package)_config_opts=
+endif

 define $(package)_preprocess_cmds
  cd $($(package)_build_subdir); ./autogen.sh
--- a/depends/packages/proton.mk
+++ b/depends/packages/proton.mk
@@ -1,6 +1,6 @@
 package=proton
 $(package)_version=0.17.0
-$(package)_download_path=http://apache.cs.utah.edu/qpid/proton/$($(package)_version)
+$(package)_download_path=https://archive.apache.org/dist/qpid/proton/$($(package)_version)
 $(package)_file_name=qpid-proton-$($(package)_version).tar.gz
 $(package)_sha256_hash=6ffd26d3d0e495bfdb5d9fefc5349954e6105ea18cc4bb191161d27742c5a01a
 $(package)_patches=minimal-build.patch
@@ -21,4 +21,3 @@ endef
 define $(package)_stage_cmds
  cd build; $(MAKE) VERBOSE=1 DESTDIR=$($(package)_staging_prefix_dir) install
 endef
-
--- a/depends/packages/rust.mk
+++ b/depends/packages/rust.mk
@@ -1,23 +1,16 @@
 package=rust
 $(package)_version=1.16.0
 $(package)_download_path=https://static.rust-lang.org/dist
-#<<<<<<< HEAD
-#ifeq ($(build_os),darwin)
-#$(package)_file_name=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-#$(package)_sha256_hash=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
-#else ifeq ($(host_os),mingw32)
-#$(package)_file_name=rust-$($(package)_version)-i686-unknown-linux-gnu.tar.gz
-#$(package)_sha256_hash=b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5
-#else
-#$(package)_file_name=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-#$(package)_sha256_hash=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
-#endif
-#=======
-$(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_linux=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
-$(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash_darwin=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
-#>>>>>>> zcash/master
+ifeq ($(build_os),darwin)
+$(package)_file_name=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
+$(package)_sha256_hash=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
+else ifeq ($(host_os),mingw32)
+$(package)_file_name=rust-$($(package)_version)-i686-unknown-linux-gnu.tar.gz
+$(package)_sha256_hash=b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5
+else
+$(package)_file_name=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
+$(package)_sha256_hash=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
+endif

 define $(package)_stage_cmds
  ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig
--- a/src/komodo.h
+++ b/src/komodo.h
@@ -121,7 +121,7 @@ int32_t komodo_parsestatefile(struct komodo_state *sp,FILE *fp,char *symbol,char
                MoMdepth = 0;
            }
            //if ( matched != 0 ) global independent states -> inside *sp
-            komodo_eventadd_notarized(sp,symbol,ht,dest,notarized_hash,notarized_desttxid,notarized_height,MoM,MoMdepth);
+            komodo_eventadd_notarized(sp,symbol,ht,dest,notarized_hash,notarized_desttxid,notarized_height);//,MoM,MoMdepth);
        }
        else if ( func == 'U' ) // deprecated
        {
@@ -266,7 +266,7 @@ int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long
                memset(&MoM,0,sizeof(MoM));
                MoMdepth = 0;
            }
-            komodo_eventadd_notarized(sp,symbol,ht,dest,notarized_hash,notarized_desttxid,notarized_height,MoM,MoMdepth);
+            komodo_eventadd_notarized(sp,symbol,ht,dest,notarized_hash,notarized_desttxid,notarized_height);//,MoM,MoMdepth);
        }
        else if ( func == 'U' ) // deprecated
        {
@@ -482,9 +482,10 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar
            //printf("ht.%d func N ht.%d errs.%d\n",height,NOTARIZED_HEIGHT,errs);
            if ( sp != 0 )
            {
-                if ( sp->MoMdepth > 0 && sp->MoM != zero )
-                    fputc('M',fp);
-                else fputc('N',fp);
+                //if ( sp->MoMdepth > 0 && sp->MoM != zero )
+                //    fputc('M',fp);
+                //else
+                fputc('N',fp);
                if ( fwrite(&height,1,sizeof(height),fp) != sizeof(height) )
                    errs++;
                if ( fwrite(&sp->NOTARIZED_HEIGHT,1,sizeof(sp->NOTARIZED_HEIGHT),fp) != sizeof(sp->NOTARIZED_HEIGHT) )
@@ -493,14 +494,14 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar
                    errs++;
                if ( fwrite(&sp->NOTARIZED_DESTTXID,1,sizeof(sp->NOTARIZED_DESTTXID),fp) != sizeof(sp->NOTARIZED_DESTTXID) )
                    errs++;
-                if ( sp->MoMdepth > 0 && sp->MoM != zero )
+                /*if ( sp->MoMdepth > 0 && sp->MoM != zero )
                {
                    if ( fwrite(&sp->MoM,1,sizeof(sp->MoM),fp) != sizeof(sp->MoM) )
                        errs++;
                    if ( fwrite(&sp->MoMdepth,1,sizeof(sp->MoMdepth),fp) != sizeof(sp->MoMdepth) )
                        errs++;
-                }
-                komodo_eventadd_notarized(sp,symbol,height,dest,sp->NOTARIZED_HASH,sp->NOTARIZED_DESTTXID,sp->NOTARIZED_HEIGHT,sp->MoM,sp->MoMdepth);
+                }*/
+                komodo_eventadd_notarized(sp,symbol,height,dest,sp->NOTARIZED_HASH,sp->NOTARIZED_DESTTXID,sp->NOTARIZED_HEIGHT);//,sp->MoM,sp->MoMdepth);
            }
        }
        fflush(fp);
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -887,8 +887,6 @@ int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],uint32_t bloc
            }
            if ( blocktime != 0 && blocktimes[1] != 0 && blocktime < blocktimes[1]+57 )
            {
-                //if ( height > 790000 )
-                //    fprintf(stderr,"lag.%d ht.%d n.%d blocktimes[%u vs %u %u]\n",blocktime-blocktimes[1],height,notaryid,blocktime,blocktimes[0],blocktimes[1]);
                if ( height > 807000 )
                    return(-2);
            }
--- a/src/komodo_events.h
+++ b/src/komodo_events.h
@@ -37,7 +37,7 @@ struct komodo_event *komodo_eventadd(struct komodo_state *sp,int32_t height,char
    return(ep);
 }

-void komodo_eventadd_notarized(struct komodo_state *sp,char *symbol,int32_t height,char *dest,uint256 notarized_hash,uint256 notarized_desttxid,int32_t notarizedheight,uint256 MoM,int32_t MoMdepth)
+void komodo_eventadd_notarized(struct komodo_state *sp,char *symbol,int32_t height,char *dest,uint256 notarized_hash,uint256 notarized_desttxid,int32_t notarizedheight)//,uint256 MoM,int32_t MoMdepth)
 {
    struct komodo_event_notarized N;
    if ( NOTARY_PUBKEY33[0] != 0 && komodo_verifynotarization(symbol,dest,height,notarizedheight,notarized_hash,notarized_desttxid) != 0 )
@@ -53,12 +53,12 @@ void komodo_eventadd_notarized(struct komodo_state *sp,char *symbol,int32_t heig
        N.blockhash = notarized_hash;
        N.desttxid = notarized_desttxid;
        N.notarizedheight = notarizedheight;
-        N.MoM = MoM;
-        N.MoMdepth = MoMdepth;
+        //N.MoM = MoM;
+        //N.MoMdepth = MoMdepth;
        strncpy(N.dest,dest,sizeof(N.dest)-1);
        komodo_eventadd(sp,height,symbol,KOMODO_EVENT_NOTARIZED,(uint8_t *)&N,sizeof(N));
        if ( sp != 0 )
-            komodo_notarized_update(sp,height,notarizedheight,notarized_hash,notarized_desttxid,MoM,MoMdepth);
+            komodo_notarized_update(sp,height,notarizedheight,notarized_hash,notarized_desttxid);//,MoM,MoMdepth);
    }
 }

--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -23,7 +23,6 @@ int32_t komodo_MoMdata(int32_t *notarized_htp,uint256 *MoMp,uint256 *kmdtxidp,in
 int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *notarized_desttxidp);
 char *komodo_issuemethod(char *userpass,char *method,char *params,uint16_t port);
 void komodo_init(int32_t height);
-void komodo_assetchain_pubkeys(char *jsonstr);
 int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,uint32_t timestamp);
 int32_t komodo_isrealtime(int32_t *kmdheightp);
 uint64_t komodo_paxtotal();
--- a/src/komodo_notary.h
+++ b/src/komodo_notary.h
@@ -13,6 +13,7 @@
 *                                                                            *
 ******************************************************************************/

+
 #include "komodo_defs.h"

 #include "komodo_cJSON.h"
@@ -436,7 +437,6 @@ int32_t komodo_MoMdata(int32_t *notarized_htp,uint256 *MoMp,uint256 *kmdtxidp,in
    return(0);
 }

-
 int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *notarized_desttxidp)
 {
    struct notarized_checkpoint *np = 0; int32_t i=0,flag = 0; char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
@@ -493,7 +493,7 @@ int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *n
    return(0);
 }

-void komodo_notarized_update(struct komodo_state *sp,int32_t nHeight,int32_t notarized_height,uint256 notarized_hash,uint256 notarized_desttxid,uint256 MoM,int32_t MoMdepth)
+void komodo_notarized_update(struct komodo_state *sp,int32_t nHeight,int32_t notarized_height,uint256 notarized_hash,uint256 notarized_desttxid)//,uint256 MoM,int32_t MoMdepth)
 {
    struct notarized_checkpoint *np;
    if ( notarized_height >= nHeight )
@@ -511,8 +511,8 @@ void komodo_notarized_update(struct komodo_state *sp,int32_t nHeight,int32_t not
    sp->NOTARIZED_HEIGHT = np->notarized_height = notarized_height;
    sp->NOTARIZED_HASH = np->notarized_hash = notarized_hash;
    sp->NOTARIZED_DESTTXID = np->notarized_desttxid = notarized_desttxid;
-    sp->MoM = np->MoM = MoM;
-    sp->MoMdepth = np->MoMdepth = MoMdepth;
+    //sp->MoM = np->MoM = MoM;
+    //sp->MoMdepth = np->MoMdepth = MoMdepth;
    portable_mutex_unlock(&komodo_mutex);
 }

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4244,7 +4244,6 @@ void FindFilesToPrune(std::set<int>& setFilesToPrune)
    if (chainActive.Tip()->nHeight <= Params().PruneAfterHeight()) {
        return;
    }
-    
    unsigned int nLastBlockWeCanPrune = chainActive.Tip()->nHeight - MIN_BLOCKS_TO_KEEP;
    uint64_t nCurrentUsage = CalculateCurrentUsage();
    // We don't check to prune until after we've allocated new space for files
--- a/src/rpcclient.cpp
+++ b/src/rpcclient.cpp
@@ -135,7 +135,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
    { "paxpending", 0 },
    { "notaries", 2 },
    { "height_MoM", 1 },
-    //{ "MoMoMdata", 3 },
+    { "MoMoMdata", 3 },
    { "allMoMs", 2 },
    { "txMoMproof", 1 },
    { "minerids", 1 },