From 295c54ebb8e3e14ac08404a20d59fd101a535ae1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 16 Mar 2017 19:01:45 +0200 Subject: [PATCH 1/6] Test --- src/komodo_interest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_interest.h b/src/komodo_interest.h index 7779eba6e..c8111e99e 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -115,7 +115,7 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin numerator = (nValue * KOMODO_INTEREST); interest = (numerator / denominator) / COIN; } - //fprintf(stderr,"komodo_interest %lld %.8f nLockTime.%u tiptime.%u minutes.%d interest %lld %.8f (%llu / %llu)\n",(long long)nValue,(double)nValue/COIN,nLockTime,tiptime,minutes,(long long)interest,(double)interest/COIN,(long long)numerator,(long long)denominator); + fprintf(stderr,"komodo_interest %lld %.8f nLockTime.%u tiptime.%u minutes.%d interest %lld %.8f (%llu / %llu)\n",(long long)nValue,(double)nValue/COIN,nLockTime,tiptime,minutes,(long long)interest,(double)interest/COIN,(long long)numerator,(long long)denominator); } } return(interest); From d9fb6501c0fd95da2596b7610c1d6da18109346b Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 16 Mar 2017 19:01:55 +0200 Subject: [PATCH 2/6] Revert "Test" This reverts commit 295c54ebb8e3e14ac08404a20d59fd101a535ae1. --- src/komodo_interest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_interest.h b/src/komodo_interest.h index c8111e99e..7779eba6e 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -115,7 +115,7 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin numerator = (nValue * KOMODO_INTEREST); interest = (numerator / denominator) / COIN; } - fprintf(stderr,"komodo_interest %lld %.8f nLockTime.%u tiptime.%u minutes.%d interest %lld %.8f (%llu / %llu)\n",(long long)nValue,(double)nValue/COIN,nLockTime,tiptime,minutes,(long long)interest,(double)interest/COIN,(long long)numerator,(long long)denominator); + //fprintf(stderr,"komodo_interest %lld %.8f nLockTime.%u tiptime.%u minutes.%d interest %lld %.8f (%llu / %llu)\n",(long long)nValue,(double)nValue/COIN,nLockTime,tiptime,minutes,(long long)interest,(double)interest/COIN,(long long)numerator,(long long)denominator); } } return(interest); From ddbc321c54136a2e694674df2d2c3f0d09ed7e97 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 18:53:42 +0300 Subject: [PATCH 3/6] Test --- src/komodo_interest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_interest.h b/src/komodo_interest.h index e0c9a9a58..40e0ef2be 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -128,7 +128,7 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin numerator = (nValue * KOMODO_INTEREST); if ( txheight < 250000 && tiptime < activation ) { - if ( numerator * minutes < 365 * 24 * 60 ) + if ( txheight >= 250000 && numerator * minutes < 365 * 24 * 60 ) interest = (numerator / denominator) / COIN; else interest = ((numerator * minutes) / ((uint64_t)365 * 24 * 60)) / COIN; } From 8cfe68a169a4ddbdba010e2ff49c08c38cbdd678 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 18:55:25 +0300 Subject: [PATCH 4/6] Revert "Test" This reverts commit ddbc321c54136a2e694674df2d2c3f0d09ed7e97. --- src/komodo_interest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_interest.h b/src/komodo_interest.h index 40e0ef2be..e0c9a9a58 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -128,7 +128,7 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin numerator = (nValue * KOMODO_INTEREST); if ( txheight < 250000 && tiptime < activation ) { - if ( txheight >= 250000 && numerator * minutes < 365 * 24 * 60 ) + if ( numerator * minutes < 365 * 24 * 60 ) interest = (numerator / denominator) / COIN; else interest = ((numerator * minutes) / ((uint64_t)365 * 24 * 60)) / COIN; } From 82c67a009a920b75006ba5bf7f299935e03bcac5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 18:56:51 +0300 Subject: [PATCH 5/6] April 5th --- src/komodo_interest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_interest.h b/src/komodo_interest.h index e0c9a9a58..40e0ef2be 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -128,7 +128,7 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin numerator = (nValue * KOMODO_INTEREST); if ( txheight < 250000 && tiptime < activation ) { - if ( numerator * minutes < 365 * 24 * 60 ) + if ( txheight >= 250000 && numerator * minutes < 365 * 24 * 60 ) interest = (numerator / denominator) / COIN; else interest = ((numerator * minutes) / ((uint64_t)365 * 24 * 60)) / COIN; } From b206e182a74d946e8e7ea2e18c77af7dcead6ed7 Mon Sep 17 00:00:00 2001 From: ca333 Date: Mon, 18 Sep 2017 23:01:12 +0200 Subject: [PATCH 6/6] checksum fix --- depends/packages/libsnark.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/depends/packages/libsnark.mk b/depends/packages/libsnark.mk index d0d31097e..26d8f6677 100644 --- a/depends/packages/libsnark.mk +++ b/depends/packages/libsnark.mk @@ -1,10 +1,10 @@ package=libsnark $(package)_version=0.1 -$(package)_download_path=https://github.com/radix42/$(package)/archive/ +$(package)_download_path=https://supernetorg.bintray.com/misc/ $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz -$(package)_download_file=$($(package)_git_commit).tar.gz -$(package)_sha256_hash=9dbd5b44d3443e86463e934bfe1023cab4ca5948f8d74c23a67d9535c28d2584 -$(package)_git_commit=9be18569b8abcda1245c3912877075259599c0f1 +$(package)_download_file=$(package)-$($(package)_git_commit).tar.gz +$(package)_sha256_hash=47478adc2ae88c448dc736d59dfe007de6478e41e88d2d4d2ff4135a17ee6f90 +$(package)_git_commit=3854b20c25e8bc567aab2b558dec84d45f4a3e73 $(package)_dependencies=libgmp libsodium