From 1d9a1a53a1b916a2b1b5a7daaa05e808b919e1a7 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 13 Dec 2019 14:54:16 -0500 Subject: [PATCH] Delete more junk --- boost.mk.patch | 55 --------------------------------- darwin.host.mk.patch | 21 ------------- darwin.mk.patch | 40 ------------------------ libsnark.mk.patch | 52 ------------------------------- packages.mk.patch | 17 ---------- src/cc/hempcoin_notes.txt | 65 --------------------------------------- 6 files changed, 250 deletions(-) delete mode 100644 boost.mk.patch delete mode 100644 darwin.host.mk.patch delete mode 100644 darwin.mk.patch delete mode 100644 libsnark.mk.patch delete mode 100644 packages.mk.patch delete mode 100644 src/cc/hempcoin_notes.txt diff --git a/boost.mk.patch b/boost.mk.patch deleted file mode 100644 index ffb2e1983..000000000 --- a/boost.mk.patch +++ /dev/null @@ -1,55 +0,0 @@ -*** depends/packages/boost.mk 2017-01-03 10:53:52.440371182 +0000 ---- ../../komodo-jl777/depends/packages/boost.mk 2017-01-03 09:48:21.650035146 +0000 -*************** -*** 11,24 **** - $(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam - $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 - $(package)_config_opts_linux=threadapi=pthread runtime-link=shared -! $(package)_config_opts_darwin=--toolset=gcc threadapi=pthread runtime-link=shared - $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static - $(package)_config_opts_x86_64_mingw32=address-model=64 - $(package)_config_opts_i686_mingw32=address-model=32 - $(package)_config_opts_i686_linux=address-model=32 architecture=x86 - $(package)_toolset_$(host_os)=gcc - $(package)_archiver_$(host_os)=$($(package)_ar) -! $(package)_toolset_darwin=gcc - $(package)_config_libraries=chrono,filesystem,program_options,system,thread,test - $(package)_cxxflags=-fvisibility=hidden - $(package)_cxxflags_linux=-fPIC ---- 11,25 ---- - $(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam - $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 - $(package)_config_opts_linux=threadapi=pthread runtime-link=shared -! $(package)_config_opts_darwin=--toolset=darwin-4.2.1 runtime-link=shared - $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static - $(package)_config_opts_x86_64_mingw32=address-model=64 - $(package)_config_opts_i686_mingw32=address-model=32 - $(package)_config_opts_i686_linux=address-model=32 architecture=x86 - $(package)_toolset_$(host_os)=gcc - $(package)_archiver_$(host_os)=$($(package)_ar) -! $(package)_toolset_darwin=darwin -! $(package)_archiver_darwin=$($(package)_libtool) - $(package)_config_libraries=chrono,filesystem,program_options,system,thread,test - $(package)_cxxflags=-fvisibility=hidden - $(package)_cxxflags_linux=-fPIC -*************** -*** 35,43 **** - endef - - define $(package)_build_cmds -! ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 stage - endef - - define $(package)_stage_cmds -! ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 install - endef ---- 36,44 ---- - endef - - define $(package)_build_cmds -! ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage - endef - - define $(package)_stage_cmds -! ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install - endef diff --git a/darwin.host.mk.patch b/darwin.host.mk.patch deleted file mode 100644 index deeb7a810..000000000 --- a/darwin.host.mk.patch +++ /dev/null @@ -1,21 +0,0 @@ -*** depends/hosts/darwin.mk 2017-01-03 10:53:52.440371182 +0000 ---- ../../komodo-jl777/depends/hosts/darwin.mk 2017-01-03 09:48:21.650035146 +0000 -*************** -*** 2,9 **** - OSX_SDK_VERSION=10.9 - OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk - LD64_VERSION=241.9 -! darwin_CC=gcc-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -! darwin_CXX=g++-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) - - darwin_CFLAGS=-pipe - darwin_CXXFLAGS=$(darwin_CFLAGS) ---- 2,9 ---- - OSX_SDK_VERSION=10.9 - OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk - LD64_VERSION=241.9 -! darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -! darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) - - darwin_CFLAGS=-pipe - darwin_CXXFLAGS=$(darwin_CFLAGS) diff --git a/darwin.mk.patch b/darwin.mk.patch deleted file mode 100644 index fdfd7bc38..000000000 --- a/darwin.mk.patch +++ /dev/null @@ -1,40 +0,0 @@ -*** depends/builders/darwin.mk 2017-01-03 10:53:52.440371182 +0000 ---- ../../komodo-jl777/depends/builders/darwin.mk 2017-01-03 09:48:21.646034937 +0000 -*************** -*** 1,5 **** -! build_darwin_CC = gcc-6 -! build_darwin_CXX = g++-6 - build_darwin_AR: = $(shell xcrun -f ar) - build_darwin_RANLIB: = $(shell xcrun -f ranlib) - build_darwin_STRIP: = $(shell xcrun -f strip) ---- 1,5 ---- -! build_darwin_CC: = $(shell xcrun -f clang) -! build_darwin_CXX: = $(shell xcrun -f clang++) - build_darwin_AR: = $(shell xcrun -f ar) - build_darwin_RANLIB: = $(shell xcrun -f ranlib) - build_darwin_STRIP: = $(shell xcrun -f strip) -*************** -*** 7,17 **** - build_darwin_NM: = $(shell xcrun -f nm) - build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) - build_darwin_SHA256SUM = shasum -a 256 -! build_darwin_DOWNLOAD = wget --timeout=$(DOWNLOAD_CONNECT_TIMEOUT) --tries=$(DOWNLOAD_RETRIES) -nv -O - - #darwin host on darwin builder. overrides darwin host preferences. -! darwin_CC= gcc-6 -! darwin_CXX= g++-6 - darwin_AR:=$(shell xcrun -f ar) - darwin_RANLIB:=$(shell xcrun -f ranlib) - darwin_STRIP:=$(shell xcrun -f strip) ---- 7,17 ---- - build_darwin_NM: = $(shell xcrun -f nm) - build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) - build_darwin_SHA256SUM = shasum -a 256 -! build_darwin_DOWNLOAD = curl --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o - - #darwin host on darwin builder. overrides darwin host preferences. -! darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) -! darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) - darwin_AR:=$(shell xcrun -f ar) - darwin_RANLIB:=$(shell xcrun -f ranlib) - darwin_STRIP:=$(shell xcrun -f strip) diff --git a/libsnark.mk.patch b/libsnark.mk.patch deleted file mode 100644 index acb306b04..000000000 --- a/libsnark.mk.patch +++ /dev/null @@ -1,52 +0,0 @@ -*** depends/packages/libsnark.mk 2017-01-03 10:53:52.440371182 +0000 ---- ../../komodo-jl777/depends/packages/libsnark.mk 2017-01-03 09:48:21.650035146 +0000 -*************** -*** 1,30 **** - package=libsnark - $(package)_version=0.1 -! $(package)_download_path=https://github.com/radix42/$(package)/archive - $(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)_dependencies=libgmp libsodium - -- ifeq ($(build_os),darwin) -- define $(package)_build_cmds -- CC=gcc-6 CXX=g++-6 CXXFLAGS="-arch x86_64 -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=0 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT -- endef -- else - define $(package)_build_cmds - CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g " - endef - -- -- -- -- endif -- -- -- -- - define $(package)_stage_cmds - $(MAKE) install STATIC=1 DEPINST=$(host_prefix) PREFIX=$($(package)_staging_dir)$(host_prefix) CURVE=ALT_BN128 NO_SUPERCOP=1 - endef ---- 1,17 ---- - package=libsnark - $(package)_version=0.1 -! $(package)_download_path=https://github.com/zcash/$(package)/archive - $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz - $(package)_download_file=$($(package)_git_commit).tar.gz -! $(package)_sha256_hash=9422b1a2a94e6b8be61f07af7f146087c2a7d70b208d07ad076622225aa7f0e4 -! $(package)_git_commit=2e6314a9f7efcd9af1c77669d7d9a229df86a777 - - $(package)_dependencies=libgmp libsodium - - define $(package)_build_cmds - CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g " - endef - - define $(package)_stage_cmds - $(MAKE) install STATIC=1 DEPINST=$(host_prefix) PREFIX=$($(package)_staging_dir)$(host_prefix) CURVE=ALT_BN128 NO_SUPERCOP=1 - endef diff --git a/packages.mk.patch b/packages.mk.patch deleted file mode 100644 index 2759cd48c..000000000 --- a/packages.mk.patch +++ /dev/null @@ -1,17 +0,0 @@ -*** depends/packages/packages.mk 2017-01-03 10:53:52.440371182 +0000 ---- ../../komodo-jl777/depends/packages/packages.mk 2017-01-03 09:48:21.650035146 +0000 -*************** -*** 1,12 **** - zcash_packages := libsnark libgmp libsodium -- -- ifeq ($(build_os),darwin) -- packages := boost openssl $(zcash_packages) -- else - packages := boost openssl $(zcash_packages) googletest googlemock -- endif -- -- - native_packages := native_ccache - - wallet_packages=bdb ---- 1,5 ---- diff --git a/src/cc/hempcoin_notes.txt b/src/cc/hempcoin_notes.txt deleted file mode 100644 index 04bf0e9ac..000000000 --- a/src/cc/hempcoin_notes.txt +++ /dev/null @@ -1,65 +0,0 @@ -How this works: - - earlytxid must be a transaction included in the chain before block KOMODO_EARLYTXID_HEIGHT. The chain MUST not have any other of these type of tx before block KOMODO_EARLYTXID_HEIGHT, or someone may be able to change it and mess things up. - - When it gets to block KOMODO_EARLYTXID_HEIGHT, it takes the txid specified by the -earlytxid param (does not affect magic) - - Looks up the transaction searches for the opreturn, then permenantly appends it to the end of ac_script in RAM. - - After every daemon restart, the first time the daemon mines a block, or receives a block that pays ac_script it will look up the op_return and save it again. - - this enables it to always reach consensus but doesnt need to constantly keep looking up the tx in the chain. - - The trick is to use ac_founders=101 or higher so that nothing is ever paid to the unspendable CC address. Although it should still work without this it burns coins. - --ac_script can be any Global CC address you can spend to with an OP_RETURN. Here we use example of paymentsCC being used to fund a rewards plan, and a set of founders address's. - you can get the ac_script from another chain, but the op_return payload must generated on the chain itself. this command gives you the needed info to get the scripPubKey Hex: - ./komodo-cli -ac_name=TEST paymentsfund '["5d536f54332db09f2be04593c54f764cf569e225f4d8df5155658c679e663682",1000]' - append: b8, to the end of ac_script, this changes magic value for -earlytxid chains vs normal ac_script and allows bypass of ac_supply paid to the scritpt as it would be unspendable and you would be unable to create the needed plans with no coins. - -ac_script=2ea22c8020987fad30df055db6fd922c3a57e55d76601229ed3da3b31340112e773df3d0d28103120c008203000401ccb8 - --testnode=1 is not affecting magic and allows mining on a single node, we can use this to bootstrap the chain before syncing a second node to save time. - -start chain and make sure to do the following steps before block 100 (set generate false/true is a good idea between steps) - ./komodod -ac_name=TESTHC -ac_supply=1000000 -ac_reward=100000000000 -ac_cc=2 -ac_script=2ea22c8020987fad30df055db6fd922c3a57e55d76601229ed3da3b31340112e773df3d0d28103120c008203000401ccb8 -ac_founders=150 -ac_blocktime=20 -ac_nk=96,5 -testnode=1 - -create rewards plan and fund it with all or a % of the premine. Must be some amount. eg. - ./komodo-cli -ac_name=TESTHC rewardscreatefunding test 50000 25 0 2 500 - -do rewards add funding: - ./komodo-cli -ac_name=TESTHC rewardsaddfunding test 47a3150150bd196bd2086cae5e0c6b01a23785a04139fa660d169121a534b38e 1000 - -and get the script pubkey and op_return from this tx (no need to send it) -./komodo-cli -ac_name=TESTHC decoderawtransaction 010000000204ca4c7aaae62bb8fc9412ac010e047fa8d33c3f87d2adeb3e02170642ddfe370000000049483045022100d7b9a -4f28ca3a35f34dcdb6075e905cde1eaa962bd0619d0a8ed8e17e952bc99022077308e12325fc2a02c752ec3df9aeee1fc219ea54a4d3884834582b75c89815e01ffffffff08800132da3233d80c65e87b6db6a76dcf -188e4fdfa23198d69f647e67754cfb0000000049483045022100d6a8f7a1c4f6013f5897768ae0117fe61dfb72352d3e6652e64a6588db3ffcb102202aa1d041b24f9cbbf7028295b7c5e7f18b4f95ae39c13031dab -7f06634438e6801ffffffff0300e8764817000000302ea22c802065686d47a4049c2c845a71895a915eb84c04445896eec5dc0be40df0b31372da8103120c008203000401ccf0c0764817000000232103bbec93af84 -0933ae2d35fc56eff24f34dbe26871402552f84c44f690945ccd79ac00000000000000002c6a2ae54174657374000000008eb334a52191160d66fa3941a08537a2016b0c5eae6c08d26b19bd500115a34700000000 - -From the return of this you need the scriptpubkey hex of vout 0: - scriptPubKey: 2ea22c802065686d47a4049c2c845a71895a915eb84c04445896eec5dc0be40df0b31372da8103120c008203000401cc -and the scriptpubkey hex of the OP_RETURN in vout 2. - OP_RETURN: 6a2ae54174657374000000008eb334a52191160d66fa3941a08537a2016b0c5eae6c08d26b19bd500115a347 - -create txidopreturn for this payment: - ./komodo-cli -ac_name=TESTHC paymentstxidopret '[50,"2ea22c802065686d47a4049c2c845a71895a915eb84c04445896eec5dc0be40df0b31372da8103120c008203000401cc","6a2ae54174657374000000008eb334a52191160d66fa3941a08537a2016b0c5eae6c08d26b19bd500115a347"]' - -create the txidopret for the founders reward(s) pubkeys: should be able to be a few here, not sure of max number yet. These can pay anything that does not need an opreturn. allocation and scriptpubkey hex. - ./komodo-cli -ac_name=TESTHC paymentstxidopret '[50,"76a9146bf5dd9f679c87a3f83ea176f82148d26653c04388ac"]' - -create payments plan: - ./komodo-cli -ac_name=TESTHC paymentscreate '[0,0,"61f55f2f87dad3a37d42731a8cb73b3ebea1817abfa176218162c360a8bd7145","0550014823ffa0aa99d7dd7ca5292f4dd0a1b9156eddec03412c953f095181bc"]' -gives plan txid: ee7765be874fb084c00538b1b0488e8ecb857de253f09a9ba6ea8d3579b77d33 - -paymentsfund: - To do this you first need to change the type of tx generated by paymentsfund RPC. in payments.cpp go to line: 639 and comment it out, then uncomment the block of code under this. - change the line 646 to line 647 with comments, and line 650/651 aswell. This enables the RPC to generate the ccvout opreturn payload you need without sending the payment on the chain. Just decode the raw hex. - ./komodo-cli -ac_name=TESTHC paymentsfund '["ee7765be874fb084c00538b1b0488e8ecb857de253f09a9ba6ea8d3579b77d33",1000,1]' - -get the payment fund scriptpubkey hex from vout 0: (the split it at OP_CHECKCRYPTOCONDITION or 'cc' ) - 2ea22c8020987fad30df055db6fd922c3a57e55d76601229ed3da3b31340112e773df3d0d28103120c008203000401cc 2a0401f00101246a22f046337db779358deaa69b9af053e27d85cb8e8e48b0b13805c084b04f87be6577ee75 - - put the second half into an OP_RETURN: (the remaining part of the the above scriptpubkey) eg. - ./komodo-cli -ac_name=TESTHC opreturn_burn 1 2a0401f00101246a22f046337db779358deaa69b9af053e27d85cb8e8e48b0b13805c084b04f87be6577ee75 - opret_burn takes any burn amount and arbitrary hex string. (RPC works, but may have bugs, likely use this for LABS too with some fixes) - this gives a raw hex. Decode it and check the OP_RETURN is right before sending. - -earlytxid=810bd62fb8353fad20267ff2050684b8829affa3edf6b366633931530791dfce - restart the chain with earlytxid param before height 100 on all nodes (if not using -testnode=1) - ./komodod -ac_name=TESTHC -ac_supply=1000000 -ac_reward=100000000000 -ac_cc=2 -ac_script=2ea22c8020987fad30df055db6fd922c3a57e55d76601229ed3da3b31340112e773df3d0d28103120c008203000401ccb8 -ac_founders=150 -ac_blocktime=20 -ac_nk=96,5 -earlytxid=810bd62fb8353fad20267ff2050684b8829affa3edf6b366633931530791dfce - -once the payments plan has been funded with the mined coinbase you can issue payments release when conditions of the plan are met to fund founders reward/rewards plan. eg. - ./komodo-cli -ac_name=TESTHC paymentsrelease '["ee7765be874fb084c00538b1b0488e8ecb857de253f09a9ba6ea8d3579b77d33",500]'