From 7be7a37baa2e845076469db51de03b98a07c1e66 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 15 Aug 2024 10:11:06 +0300 Subject: [PATCH 1/4] added quick build instructions on README files --- README.md | 86 +++++++++++++++++++++++++++++++++++++++++++++------ doc/README.md | 6 ++-- 2 files changed, 79 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 1b1a46b1a31..fc47a06196d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ [![gitstars](https://img.shields.io/github/stars/komodoplatform/komodo?style=social)](https://github.com/KomodoPlatform/komodo/stargazers) [![twitter](https://img.shields.io/twitter/follow/marmarachain?style=social)](https://twitter.com/marmarachain) [![discord](https://img.shields.io/discord/412898016371015680)](https://discord.gg/QZNMw73) -[![https://img.shields.io/badge/LANGUAGE-TR-blue](https://img.shields.io/badge/LANGUAGE-TR-blue)](https://github.com/marmarachain/marmara/blob/master/TR/Marmara_Kredi_D%C3%B6ng%C3%BCleri.md) ![MarmaraCreditLoops Logo](https://raw.githubusercontent.com/marmarachain/marmara/master/MCL-Logo.png "Marmara Credit Loops Logo") @@ -48,16 +47,83 @@ More details are available under http://marmara.io/ - To install/download Marmara Credit Loops, follow the [Marmara Credit Loops Instructions](https://github.com/marmarachain/marmara/wiki). - To get started with Marmara Credit Loops, follow the [Marmara Credit Loops Usage Guidelines](https://github.com/marmarachain/marmara/wiki/Getting-Started-with-Marmara) and to make Marmara Credit Loops, follow the [Making Marmara Credit Loops](https://github.com/marmarachain/marmara/wiki/How-to-make-Marmara-Credit-Loops?) guide. -## Marmara Evolvement -### Marmara v.1.0.1 Hardfork Change log +### Linux + +#### Requirements + + Linux (easiest with a Debian-based distribution, such as Ubuntu) + For Ubuntu, we recommend using the 18.04 or 20.02 releases + 64-bit Processor + Minimum 2 CPUs + Minimum 4GB of free RAM + +#### Build Marmara from Source + +Note: For Ubuntu 20.04, please change the python-zmq library to python3-zmq below. + +Install the dependency packages: +``` +sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget curl bsdmainutils automake cmake clang ntp ntpdate nano -y +``` +Build marmara from source: +``` +cd ~ +git clone https://github.com/marmarachain/marmara --branch master --single-branch +cd marmara +./zcutil/fetch-params.sh +./zcutil/build.sh -j$(expr $(nproc) - 1) +#This can take some time. +``` + +### OSX + +Ensure you have brew and Command Line Tools installed. + +``` +# Install brew +/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" +# Install Xcode, opens a pop-up window to install CLT without installing the entire Xcode package +xcode-select --install +# Update brew and install dependencies +brew update +brew upgrade +brew tap discoteq/discoteq; brew install flock +brew install autoconf autogen automake +brew update && brew install gcc@8 +brew install binutils +brew install protobuf +brew install coreutils +brew install wget +# Clone the Marmara repo +git clone https://github.com/marmarachain/marmara --branch master --single-branch +cd marmara +./zcutil/fetch-params.sh +./zcutil/build-mac.sh -j$(expr $(sysctl -n hw.ncpu) - 1) +# This can take some time. ``` -- fixed incorrect coin cache usage causing chain forks -- staking utxo processing performance improvements -- loop transaction validation fixes -- chain security fixes and improvements -- fixed settlement failure on the loop holder node -- fixed memory leaks -- fixed daemon crash if multiple setgenerate true 0 calls are done + +### Windows + +Use a debian cross-compilation setup with mingw for windows and run: + +Note: For Ubuntu 20.04, please change the python-zmq library to python3-zmq below. + +``` +sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl4-gnutls-dev bsdmainutils automake curl libsodium-dev cmake mingw-w64 + +# install rust +curl https://sh.rustup.rs -sSf | sh +source $HOME/.cargo/env +rustup target add x86_64-pc-windows-gnu +sudo update-alternatives --config x86_64-w64-mingw32-gcc +# (configure to use POSIX variant) +sudo update-alternatives --config x86_64-w64-mingw32-g++ +# (configure to use POSIX variant) + +git clone https://github.com/marmarachain/marmara --branch master --single-branch +cd marmara +./zcutil/fetch-params.sh +./zcutil/build-win.sh -j$(nproc) ``` ### Contact diff --git a/doc/README.md b/doc/README.md index a262a660818..bc39a4ce07f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -32,9 +32,9 @@ More details are available under http://marmara.io/ ## Getting Started -- To build Marmara from source, follow the [Marmara Credit Loops Build Instructions](/doc/marmara-build-from-source). -- To install Marmara from pre-compiled binaries, follow the [Marmara Credit Loops Install Instructions](/doc/marmara-install-from-precompiled-binaries.md). -- To get started with Marmara Credit Loops, follow the [Making Marmara Credit Loops](/doc/getting-started-with-marmara.md) guide. +- To build Marmara from source, follow the [Marmara Credit Loops Build Instructions](/marmara-build-from-source.md). +- To install Marmara from pre-compiled binaries, follow [Marmara Credit Loops Install Instructions](/marmara-install-from-precompiled-binaries.md). +- To get started with Marmara Credit Loops, follow [Making Marmara Credit Loops](/getting-started-with-marmara.md) guide. ## Contact From e333606335176ca75a5b3d3728fb7f81cfc3bc7d Mon Sep 17 00:00:00 2001 From: rumeysayilmaz Date: Wed, 18 Sep 2024 10:32:18 +0300 Subject: [PATCH 2/4] modified: configure.ac -> updated client version to 1.2.1 modified: src/clientversion.h -> updated version to 1.2.1 modified: src/komodo_defs.h -> dpow s8 nn pubkeys and season definiitons and variables added modified: src/komodo_globals.h -> s8 hf height added modified: src/version.h -> protocol version incremented --- configure.ac | 2 +- src/clientversion.h | 2 +- src/komodo_defs.h | 138 ++++++++++++++++++++++++++++++++++++++++++- src/komodo_globals.h | 5 ++ src/version.h | 6 +- 5 files changed, 145 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index c4464963686..224b0088194 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 2) -define(_CLIENT_VERSION_REVISION, 0) +define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_BUILD, 0) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) diff --git a/src/clientversion.h b/src/clientversion.h index 66bfbde05d4..fc111011713 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -32,7 +32,7 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 2 -#define CLIENT_VERSION_REVISION 0 +#define CLIENT_VERSION_REVISION 1 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build diff --git a/src/komodo_defs.h b/src/komodo_defs.h index 0ebf46be6c2..255617d763e 100644 --- a/src/komodo_defs.h +++ b/src/komodo_defs.h @@ -50,7 +50,7 @@ // 7113400 = 5x current KMD blockheight. // to add 4th season, change NUM_KMD_SEASONS to 4, and add timestamp and height of activation to these arrays. -#define NUM_KMD_SEASONS 8 +#define NUM_KMD_SEASONS 9 #define NUM_KMD_NOTARIES 64 extern const uint32_t nStakedDecemberHardforkTimestamp; //December 2019 hardfork @@ -68,8 +68,32 @@ extern const int32_t nS6HardforkHeight; // estimated June 24 2022 extern const uint32_t nS7Timestamp; // dPoW Season 7, Fri Jun 30 2023 13:37:33 GMT+0000 extern const int32_t nS7HardforkHeight; // dPoW Season 7, Fri Jun 30 2023 -static const uint32_t KMD_SEASON_TIMESTAMPS[NUM_KMD_SEASONS] = {1525132800, 1563148800, nStakedDecemberHardforkTimestamp, nS4Timestamp, nS5Timestamp, nS6Timestamp, nS7Timestamp, 1951328000}; -static const int32_t KMD_SEASON_HEIGHTS[NUM_KMD_SEASONS] = {814000, 1444000, nDecemberHardforkHeight, nS4HardforkHeight, nS5HardforkHeight, nS6HardforkHeight, nS7HardforkHeight, 8113400}; +extern const uint32_t nS8Timestamp; // dPoW Season 8, Fri Oct 4 2024 13:37:33 GMT+0000 +extern const int32_t nS8HardforkHeight; // dPoW Season 8, Fri Oct 4 2024 + +extern const int32_t nKIP0003Activation; // https://github.com/KomodoPlatform/kips/blob/main/kips/kip-0003.mediawiki + +static const uint32_t KMD_SEASON_TIMESTAMPS[NUM_KMD_SEASONS] = { + 1525132800, + 1563148800, + nStakedDecemberHardforkTimestamp, + nS4Timestamp, + nS5Timestamp, + nS6Timestamp, + nS7Timestamp, + nS8Timestamp, + 1951328000}; + +static const int32_t KMD_SEASON_HEIGHTS[NUM_KMD_SEASONS] = { + 814000, + 1444000, + nDecemberHardforkHeight, + nS4HardforkHeight, + nS5HardforkHeight, + nS6HardforkHeight, + nS7HardforkHeight, + nS8HardforkHeight, + 8113400}; // Era array of pubkeys. Add extra seasons to bottom as requried, after adding appropriate info above. static const char *notaries_elected[NUM_KMD_SEASONS][NUM_KMD_NOTARIES][2] = @@ -606,9 +630,117 @@ static const char *notaries_elected[NUM_KMD_SEASONS][NUM_KMD_NOTARIES][2] = {"dragonhound_EU", "0382d7e027bf5cda31264867f4e389a1a72f6671c7bd8818beb35b874d906e22d5"}, {"dragonhound_NA", "02b4bf90b57f7c8363043c7ea8b02c8c776301ef3c1abb2df1caa2e6947be1422b"}, {"dragonhound_DEV", "02a473e980bf0d198ece8ed11f1ecbe437edb688de6c83b82efa6f7de3a5d43c19"} + }, + { + // Season 8 + {"alright_DEV", "028548847b3bbccff37c9b47bc4154183304902773d514b792ec2adc91e600e3b9"}, // 0 + {"alien_AR", "03a40091ce1e7aa9863d9ad0c27f67b7d18bb47612438570ce344cd1782937c575"}, + {"alien_EU", "03bb749e337b9074465fa28e757b5aa92cb1f0fea1a39589bca91a602834d443cd"}, + {"alien_NA", "03bea1ac333b95c8669ec091907ea8713cae26f74b9e886e13593400e21c4d30a8"}, + {"alien_SH", "03911a60395801082194b6834244fa78a3c30ff3e888667498e157b4aa80b0a65f"}, + {"alienx_EU", "026afe5b112d1b39e0edafd5e051e261a676104460581f3673f26ceff7f1e6c56c"}, + {"alienx_NA", "02f0b3ef87629509441b1ae95f28108f258a81910e483b90e0496205e24e7069b8"}, + {"artist_SH", "023f9632eb3dc7fd1cfd700bb58de2da51bfa5898838586f49afdd145bddac16b6"}, + {"batman_EU", "0358441eca9d8d24cd756fb3308fd7c9d60fe2b5af702ce5c9c1429cbea7a4c284"}, + {"blackice_AR", "02bbc5518d27918d77c46b4e3ad0b9df936df520646527ab4c2f206544a2b03967"}, + {"blackice_EU", "02340bf4749a392865b0ddaf37e652195e740c7538aeac87f7a51b8bf2dcdc24ac"}, // 10 + {"blackice_NA", "035baa12331ad6c284d5f1b76527c1d6c5eb15a74b9ba369e5d46aefcc9c120938"}, + {"blackice_SH", "02c275d12560b2c8238b8a10a8fc8da891784eb7b2ff5d3310ebcb666e47579571"}, + {"blackice2_AR", "03d224790d17b881db560759cc9cc73fe5c865136a88af471ea156b7eb6d88ce32"}, + {"ca333_EU", "030a18ffa85e2928ed37b2e30dbeb9bfb30b21fb15c5c4bcbd61d26b945e398e2b"}, + {"chmex_AR", "036c856ea778ea105b93c0be187004d4e51161eda32888aa307b8f72d490884005"}, + {"chmex_EU", "025b7209ba37df8d9695a23ea706ea2594863ab09055ca6bf485855937f3321d1d"}, + {"chmex_NA", "030c2528c29d5328243c910277e3d74aa77c9b4e145308007d2b11550731591dbe"}, + {"chmex_SH", "02698305eb3c27a2c724efd2152f9250739355116f201656c34b83aac2d3aebd19"}, + {"chmexvet_SH", "02d27ed1cddfbaff9e47865e7df0165457e8f075f70bbea8c0498598ccf494555d"}, + {"cipi_AR", "033ae024cdb748e083406a2e20037017a1292079ad6a8161ae5b43f398724fea74"}, // 20 + {"cipi_EU", "03d6e1f3a693b5d69049791005d7cb64c259a1ad85833f5a9c545d4fee29905009"}, + {"cipi_NA", "036cc1d7476e4260601927be0fc8b748ae68d8fec8f5c498f71569a01bd92046c5"}, + {"cipi2_NA", "0306531923dbd4517d15e932668b64cbf95cc6c4293e46c8b5825c6543e0f06b15"}, + {"colmapol_EU", "020c63078b5f5d27183de6f2bbae9bfe3fc57e017faf89b7d566bb947a92a2e40d"}, + {"dimxy_AR", "02689d0b77b1e8e8c93a102d8b689fd08179164d70e2dd585543c3896a0916e6a1"}, + {"dragonhound_AR", "030a72f1a15f67624aea55743c5b777bdd55362596add77b544ee2e582bdebf0c7"}, + {"dragonhound_EU", "0286d7af8583e18127bd1f45730916b4f48ae3e0c90181b2745174b91b76c6e28b"}, + {"dragonhound_NA", "0306476ea5fb67aec667172a9bb30646dbff195b84c30ac958175af9b475987802"}, + {"dragonhound_SH", "02fe8e5a64979bc8e55b24e121182d2f1948e00a050c77407edbfc9cc8c012d679"}, + {"fediakash_AR", "027dfe5403f8870fb0e1b94a2b4204373b31ea73179ba500a88dd56d22855cd03b"}, // 30 + {"fediakash_NA", "024b31751c90dd9bd31e9a419be54d6f6cb7f4a85ea475359852ab645124010290"}, + {"francois_SH", "02fdbb8fdfa4b859e1a21c30824f8c04e15c8886b1e1cab5d9d0bd89c353eb9710"}, + {"gcharang_AR", "030de3d833ba049da08231ca6b622c77c7f96b26269963291d9604706bb94031a5"}, + {"gcharang_SH", "02cb445948bf0d89f8d61102e12a5ee6e98be61ac7c2cb9ba435219ea9db967117"}, + {"gcharang2_SH", "02567b688c180212df97b65273e70512f5f1f5edd20eb5fb85c7efa2a510e363d7"}, + {"kmdude_SH", "02116774b25226d0b99f70a24f55c5ce17a7af6d3522071369c233157ecb27b82a"}, + {"marmarachain_AR", "0335ab9e59d602df5580b964b6451d02cd9cc243ddf01b065db84375488df9f53c"}, + {"marmarachain_EU", "0234e40800500370d43979586ee2cec2e777a0368d10c682e78bca30fd1630c18d"}, + {"mcrypt_NA", "03ccaa74304165e0d66968c3f714942a130d67f02db1c2f910a75dfc15c0d3d58f"}, + {"naezith_EU", "038f61a0418deafdb9fa8809a5df0956943f423364022cab578c3fcb158f3dfc55"}, // 40 + {"naezith_NA", "033d9e2e3e51627b4cf9fec2ddbaadfd76a50965d423a2741e5b0db6ab13a057af"}, + {"onur-ozkan_EU", "03c159a0733fb3d15d0b6e7eb67568343c10891eb6f1e8ab0ae6fbe9e33af17bc0"}, + {"onur-ozkan_NA", "02be4ac61cf534b0fb98568ec539ee9e34c5104088f94f21cee2945d37d88373da"}, + {"pbca26_NA", "024034ed324e69316d6f6d554168b56828e40334f99d7adfe4ef9248c49d433e12"}, + {"ptyx_SH", "02ac5e2bc7bd5372395eab76c56951f699af617cd4e1fa2926eb7318e9caecd531"}, + {"shamardy_SH", "026d378de09ba51d8f56be52bc8d02f5e20bae843406e23686047b76c72412a7b3"}, + {"smdmitry_AR", "022a2a45979a6631a25e4c96469423de720a2f4c849548957c35a35c91041ee7ac"}, + {"smdmitry2_AR", "026e33b213be94fa7c05c781cb1d2fb381e4c4ef6aad40d6a67f0a8ad573d92efe"}, + {"smdmitry_EU", "02eb3aad81778f8d6f7e5295c44ca224e5c812f5e43fc1e9ce4ebafc23324183c9"}, + {"smdmitry_NA", "020580cbdfc051bdac9e5d05fe9a6b6a15885fbd3989c6662001f2399c6e0d7e4c"}, // 50 + {"smdmitry_SH", "02d01cd6b87cbf5a9795c06968f0d169168c1be0d82cfeb79958b11ae2c30316c1"}, + {"strob_SH", "025ceac4256cef83ca4b110f837a71d70a5a977ecfdf807335e00bc78b560d451a"}, + {"gcharang_DEV", "033b82b5791c65477dd11095cf33332013df6d2bcb7aa06a6dae5f7b22b6959b0b"}, + {"dimxy_DEV", "039a01cd626d5efbe7fd05a59d8e5fced53bacac589192278f9b00ad31654b6956"}, + {"ca333_DEV", "03cf925a2d7d697448c3ac6fff9aff349b80d773b4ce7de22c9ef7e2c8c002bec6"}, + {"qa_DEV", "036f42e1888378068c3a17a53665b0a9db21465571d63ca02eb8d5681afa709074"}, + {"core_DEV", "03955c7999538cee313bf196a7df59db208c651f6a5a1b0eed94732ba753b4f3f4"}, + {"security_DEV", "022450f4f32435372b43dc2b9d5b690114fbe5e5dcbe0c02ab8164698f1a9eda6e"}, + {"tonyl_AR", "0277bbdf6403d1ebaac5a715a9120118e74be0d3bed71a2c8cf5542fb6ca7d2dd7"}, + {"van_EU", "03af7f8c82f20671ca1978116353839d3e501523e379bfb52b1e05d7816bb5812f"}, // 60 + {"who-biz_AR", "03057d4c00c4e18f72faa4234aada9ad17ecd4bd9455c548edef16b94befa1a087"}, + {"who-biz_NA", "03170d900f6d6a13002255b708f7bd27e55b5c05d1ddbaf8c25a1fc287d9f804ed"}, + {"dragonhound_DEV", "02f9a7b49282885cd03969f1f5478287497bc8edfceee9eac676053c107c5fcdaf"} } }; +class NotaryChecker { +public: + NotaryChecker() { + checkSeasons(); + checkNotaries(); + } + +private: + void checkSeasons() const { + for (size_t i = 0; i < NUM_KMD_SEASONS; ++i) { + assert(KMD_SEASON_TIMESTAMPS[i] != 0 && "KMD_SEASON_TIMESTAMPS is invalid"); + assert(KMD_SEASON_HEIGHTS[i] != 0 && "KMD_SEASON_HEIGHTS is invalid"); + } + } + + void checkNotaries() const { + for (int season = 0; season < NUM_KMD_SEASONS; ++season) { + for (int notary = 0; notary < NUM_KMD_NOTARIES; ++notary) { + const char* name = notaries_elected[season][notary][0]; + const char* pubkey = notaries_elected[season][notary][1]; + assert(name != nullptr && "Notary name is null"); + assert(pubkey != nullptr && "Notary pubkey is null"); + assert(isValidPubkey(pubkey) && "Notary pubkey is invalid"); + } + } + } + + bool isValidPubkey(const char* str) const { + if (strlen(str) != 66) return false; + if (str[0] != '0' || (str[1] != '2' && str[1] != '3')) return false; + for (int i = 2; i < 66; ++i) { + if (!((str[i] >= '0' && str[i] <= '9') || (str[i] >= 'a' && str[i] <= 'f') || (str[i] >= 'A' && str[i] <= 'F'))) { + return false; + } + } + return true; + } +}; + +NotaryChecker notaryChecker; + #define SETBIT(bits,bitoffset) (((uint8_t *)bits)[(bitoffset) >> 3] |= (1 << ((bitoffset) & 7))) #define GETBIT(bits,bitoffset) (((uint8_t *)bits)[(bitoffset) >> 3] & (1 << ((bitoffset) & 7))) #define CLEARBIT(bits,bitoffset) (((uint8_t *)bits)[(bitoffset) >> 3] &= ~(1 << ((bitoffset) & 7))) diff --git a/src/komodo_globals.h b/src/komodo_globals.h index c0b75b42715..2e32635c330 100644 --- a/src/komodo_globals.h +++ b/src/komodo_globals.h @@ -56,6 +56,11 @@ const int32_t nS6HardforkHeight = 2963330; // estimated June 24 2022 const uint32_t nS7Timestamp = 1688132253; // dPoW Season 7, Fri Jun 30 2023 13:37:33 GMT+0000 const int32_t nS7HardforkHeight = 3484958; // dPoW Season 7, Fri Jun 30 2023 +const uint32_t nS8Timestamp = 1728049053; // dPoW Season 8, Fri Oct 4 2024 13:37:33 GMT+0000 +const int32_t nS8HardforkHeight = 4125988; // dPoW Season 8, Fri Oct 4 2024 (est. via https://github.com/KomodoPlatform/NotaryNodes/blob/master/utils/estimate_hf_block.py) + +const int32_t nKIP0003Activation = nS8HardforkHeight; + #define _COINBASE_MATURITY 100 int COINBASE_MATURITY = _COINBASE_MATURITY;//100; unsigned int WITNESS_CACHE_SIZE = _COINBASE_MATURITY+10; diff --git a/src/version.h b/src/version.h index d82c8b003d6..2f777536db5 100644 --- a/src/version.h +++ b/src/version.h @@ -24,7 +24,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 170010; +static const int PROTOCOL_VERSION = 170011; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -33,8 +33,8 @@ static const int INIT_PROTO_VERSION = 209; static const int GETHEADERS_VERSION = 31800; //! disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 170009; -static const int STAKEDMIN_PEER_PROTO_VERSION = 170009; +static const int MIN_PEER_PROTO_VERSION = 170010; +static const int STAKEDMIN_PEER_PROTO_VERSION = 170010; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this From 20a8fde359f27869ef3dfe247da67f315848d192 Mon Sep 17 00:00:00 2001 From: rumeysayilmaz Date: Thu, 19 Sep 2024 11:42:15 +0300 Subject: [PATCH 3/4] - corrected pubkeys for S8 NN nodes as per https://github.com/KomodoPlatform/dPoW/blob/5198f6d8edf65bf93ed46bfd69e37a00ee202885/iguana/3rd_party - removed NotaryChecker --- src/komodo_defs.h | 169 ++++++++++++++++++---------------------------- 1 file changed, 64 insertions(+), 105 deletions(-) diff --git a/src/komodo_defs.h b/src/komodo_defs.h index 255617d763e..8c3bf20aa4a 100644 --- a/src/komodo_defs.h +++ b/src/komodo_defs.h @@ -633,114 +633,73 @@ static const char *notaries_elected[NUM_KMD_SEASONS][NUM_KMD_NOTARIES][2] = }, { // Season 8 - {"alright_DEV", "028548847b3bbccff37c9b47bc4154183304902773d514b792ec2adc91e600e3b9"}, // 0 - {"alien_AR", "03a40091ce1e7aa9863d9ad0c27f67b7d18bb47612438570ce344cd1782937c575"}, - {"alien_EU", "03bb749e337b9074465fa28e757b5aa92cb1f0fea1a39589bca91a602834d443cd"}, - {"alien_NA", "03bea1ac333b95c8669ec091907ea8713cae26f74b9e886e13593400e21c4d30a8"}, - {"alien_SH", "03911a60395801082194b6834244fa78a3c30ff3e888667498e157b4aa80b0a65f"}, - {"alienx_EU", "026afe5b112d1b39e0edafd5e051e261a676104460581f3673f26ceff7f1e6c56c"}, - {"alienx_NA", "02f0b3ef87629509441b1ae95f28108f258a81910e483b90e0496205e24e7069b8"}, - {"artist_SH", "023f9632eb3dc7fd1cfd700bb58de2da51bfa5898838586f49afdd145bddac16b6"}, - {"batman_EU", "0358441eca9d8d24cd756fb3308fd7c9d60fe2b5af702ce5c9c1429cbea7a4c284"}, - {"blackice_AR", "02bbc5518d27918d77c46b4e3ad0b9df936df520646527ab4c2f206544a2b03967"}, - {"blackice_EU", "02340bf4749a392865b0ddaf37e652195e740c7538aeac87f7a51b8bf2dcdc24ac"}, // 10 - {"blackice_NA", "035baa12331ad6c284d5f1b76527c1d6c5eb15a74b9ba369e5d46aefcc9c120938"}, - {"blackice_SH", "02c275d12560b2c8238b8a10a8fc8da891784eb7b2ff5d3310ebcb666e47579571"}, - {"blackice2_AR", "03d224790d17b881db560759cc9cc73fe5c865136a88af471ea156b7eb6d88ce32"}, - {"ca333_EU", "030a18ffa85e2928ed37b2e30dbeb9bfb30b21fb15c5c4bcbd61d26b945e398e2b"}, - {"chmex_AR", "036c856ea778ea105b93c0be187004d4e51161eda32888aa307b8f72d490884005"}, - {"chmex_EU", "025b7209ba37df8d9695a23ea706ea2594863ab09055ca6bf485855937f3321d1d"}, - {"chmex_NA", "030c2528c29d5328243c910277e3d74aa77c9b4e145308007d2b11550731591dbe"}, - {"chmex_SH", "02698305eb3c27a2c724efd2152f9250739355116f201656c34b83aac2d3aebd19"}, - {"chmexvet_SH", "02d27ed1cddfbaff9e47865e7df0165457e8f075f70bbea8c0498598ccf494555d"}, - {"cipi_AR", "033ae024cdb748e083406a2e20037017a1292079ad6a8161ae5b43f398724fea74"}, // 20 - {"cipi_EU", "03d6e1f3a693b5d69049791005d7cb64c259a1ad85833f5a9c545d4fee29905009"}, - {"cipi_NA", "036cc1d7476e4260601927be0fc8b748ae68d8fec8f5c498f71569a01bd92046c5"}, - {"cipi2_NA", "0306531923dbd4517d15e932668b64cbf95cc6c4293e46c8b5825c6543e0f06b15"}, - {"colmapol_EU", "020c63078b5f5d27183de6f2bbae9bfe3fc57e017faf89b7d566bb947a92a2e40d"}, - {"dimxy_AR", "02689d0b77b1e8e8c93a102d8b689fd08179164d70e2dd585543c3896a0916e6a1"}, - {"dragonhound_AR", "030a72f1a15f67624aea55743c5b777bdd55362596add77b544ee2e582bdebf0c7"}, - {"dragonhound_EU", "0286d7af8583e18127bd1f45730916b4f48ae3e0c90181b2745174b91b76c6e28b"}, - {"dragonhound_NA", "0306476ea5fb67aec667172a9bb30646dbff195b84c30ac958175af9b475987802"}, - {"dragonhound_SH", "02fe8e5a64979bc8e55b24e121182d2f1948e00a050c77407edbfc9cc8c012d679"}, - {"fediakash_AR", "027dfe5403f8870fb0e1b94a2b4204373b31ea73179ba500a88dd56d22855cd03b"}, // 30 - {"fediakash_NA", "024b31751c90dd9bd31e9a419be54d6f6cb7f4a85ea475359852ab645124010290"}, - {"francois_SH", "02fdbb8fdfa4b859e1a21c30824f8c04e15c8886b1e1cab5d9d0bd89c353eb9710"}, - {"gcharang_AR", "030de3d833ba049da08231ca6b622c77c7f96b26269963291d9604706bb94031a5"}, - {"gcharang_SH", "02cb445948bf0d89f8d61102e12a5ee6e98be61ac7c2cb9ba435219ea9db967117"}, - {"gcharang2_SH", "02567b688c180212df97b65273e70512f5f1f5edd20eb5fb85c7efa2a510e363d7"}, - {"kmdude_SH", "02116774b25226d0b99f70a24f55c5ce17a7af6d3522071369c233157ecb27b82a"}, - {"marmarachain_AR", "0335ab9e59d602df5580b964b6451d02cd9cc243ddf01b065db84375488df9f53c"}, - {"marmarachain_EU", "0234e40800500370d43979586ee2cec2e777a0368d10c682e78bca30fd1630c18d"}, - {"mcrypt_NA", "03ccaa74304165e0d66968c3f714942a130d67f02db1c2f910a75dfc15c0d3d58f"}, - {"naezith_EU", "038f61a0418deafdb9fa8809a5df0956943f423364022cab578c3fcb158f3dfc55"}, // 40 - {"naezith_NA", "033d9e2e3e51627b4cf9fec2ddbaadfd76a50965d423a2741e5b0db6ab13a057af"}, - {"onur-ozkan_EU", "03c159a0733fb3d15d0b6e7eb67568343c10891eb6f1e8ab0ae6fbe9e33af17bc0"}, - {"onur-ozkan_NA", "02be4ac61cf534b0fb98568ec539ee9e34c5104088f94f21cee2945d37d88373da"}, - {"pbca26_NA", "024034ed324e69316d6f6d554168b56828e40334f99d7adfe4ef9248c49d433e12"}, - {"ptyx_SH", "02ac5e2bc7bd5372395eab76c56951f699af617cd4e1fa2926eb7318e9caecd531"}, - {"shamardy_SH", "026d378de09ba51d8f56be52bc8d02f5e20bae843406e23686047b76c72412a7b3"}, - {"smdmitry_AR", "022a2a45979a6631a25e4c96469423de720a2f4c849548957c35a35c91041ee7ac"}, - {"smdmitry2_AR", "026e33b213be94fa7c05c781cb1d2fb381e4c4ef6aad40d6a67f0a8ad573d92efe"}, - {"smdmitry_EU", "02eb3aad81778f8d6f7e5295c44ca224e5c812f5e43fc1e9ce4ebafc23324183c9"}, - {"smdmitry_NA", "020580cbdfc051bdac9e5d05fe9a6b6a15885fbd3989c6662001f2399c6e0d7e4c"}, // 50 - {"smdmitry_SH", "02d01cd6b87cbf5a9795c06968f0d169168c1be0d82cfeb79958b11ae2c30316c1"}, - {"strob_SH", "025ceac4256cef83ca4b110f837a71d70a5a977ecfdf807335e00bc78b560d451a"}, - {"gcharang_DEV", "033b82b5791c65477dd11095cf33332013df6d2bcb7aa06a6dae5f7b22b6959b0b"}, - {"dimxy_DEV", "039a01cd626d5efbe7fd05a59d8e5fced53bacac589192278f9b00ad31654b6956"}, - {"ca333_DEV", "03cf925a2d7d697448c3ac6fff9aff349b80d773b4ce7de22c9ef7e2c8c002bec6"}, - {"qa_DEV", "036f42e1888378068c3a17a53665b0a9db21465571d63ca02eb8d5681afa709074"}, - {"core_DEV", "03955c7999538cee313bf196a7df59db208c651f6a5a1b0eed94732ba753b4f3f4"}, - {"security_DEV", "022450f4f32435372b43dc2b9d5b690114fbe5e5dcbe0c02ab8164698f1a9eda6e"}, - {"tonyl_AR", "0277bbdf6403d1ebaac5a715a9120118e74be0d3bed71a2c8cf5542fb6ca7d2dd7"}, - {"van_EU", "03af7f8c82f20671ca1978116353839d3e501523e379bfb52b1e05d7816bb5812f"}, // 60 - {"who-biz_AR", "03057d4c00c4e18f72faa4234aada9ad17ecd4bd9455c548edef16b94befa1a087"}, - {"who-biz_NA", "03170d900f6d6a13002255b708f7bd27e55b5c05d1ddbaf8c25a1fc287d9f804ed"}, - {"dragonhound_DEV", "02f9a7b49282885cd03969f1f5478287497bc8edfceee9eac676053c107c5fcdaf"} + {"alright_DEV", "02b698fee0945be7c2a489fc2ef93f956e491d5352228e5b4612219bba36590716"}, + {"alien_AR", "03ae0b483a41bafd5ac9820ef15ffe60091f795726fd0994dea4043dfa9863fb46"}, + {"alien_EU", "022b85908191788f409506ebcf96a892f3274f352864c3ed566c5a16de63953236"}, + {"alien_NA", "022f62b56ddfd07c9860921c701285ac39bb3ac8f6f083d1b59c8f4943be3de162"}, + {"alien_SH", "024f20c096b085308e21893383f44b4faf1cdedea9ad53cc7d7e7fbfa0c30c1e71"}, + {"alienx_EU", "025de0911bab55616c307f02ea8a5915a2e0c8e479aa97968e7f00d1025cbe6c6d"}, + {"alienx_NA", "025d5e11725233ab161f4f63d697c5f9f0c6b9d3aa2b9c68299638f8cc63faa9c2"}, + {"artist_SH", "03f0a59c15984d7627a38a7ee75fb4f4c41c6c6db58ff245efb429a1e7820c51dc"}, + {"batman_EU", "0373c4bf6cadb907597ef11d37d040cdb5dc73486beb0b8902837448f4087e0b7a"}, + {"blackice_AR", "032674b15524dab1c7a5824aa9d3d38f231a8a04095e11920677ee99d8197d9c60"}, + {"blackice_EU", "0271663454ffe07b7a13f25c93482bb554bab646627ee78941f6e59473a423e9c5"}, + {"blackice_NA", "035e356c96d4bc8ddd11109f679b44034fdd22003b87a8deeaae6ba2bb938f7e05"}, + {"blackice_SH", "0320b53f460e2867aacc578432d7ad5deb8f6f0da8e9c5ae65711011d692838bd4"}, + {"blackice2_AR", "022b10b7ec56b5c9f12bc9db1055edb3c2c0e0530453b7cc05239e4a3c442e80c4"}, + {"ca333_EU", "02da199f5da76cee5f09b4065e12ed454876308195cf45103e55f9837b4a1422d5"}, + {"chmex_AR", "030cd487e10fbf142e0e8d582e702ecb775f378569c3cb5acd0ff97b6b12803588"}, + {"chmex_EU", "030bf7bd7ad0515c33b5d5d9a91e0729baf801b9002f80495ae535ea1cebb352cb"}, + {"chmex_NA", "024e88a36d729352a391e07d1821dbfda1fca6409320cf9c2869b6fb99f05fbddd"}, + {"chmex_SH", "03e09c8ee6ae20cde64857d116c4bb5d50db6de2887ac39ea3ccf6434b1abf8698"}, + {"chmexvet_SH", "02d59db293de6c7da6673beeb373ebce62fd6d3522f715ea1356b5a2624fbd11a2"}, + {"cipi_AR", "02336758998f474659020e6887ece61ac7b8567f9b2d38724ebf77ae800c1fb2b7"}, + {"cipi_EU", "033a812d6cccdc4208378728f3a0e15db5b12074def9ab686ddc3752715ff1a194"}, + {"cipi_NA", "0335352862da521bd90b99d394db1ee3ecde379db9cf7ba2f28b16fa76153e289f"}, + {"cipi2_NA", "03b267592b0cb91d115524e7412e9ea79b30fbc8e29b8dcbbf850110f2e1d8c1ab"}, + {"colmapol_EU", "02754ae5585df0eba995f8e0aa1768b1424eaa04a3f1269a4cf37a8d4446f48a6d"}, + {"dimxy_AR", "0337e443df52f278f313f90628aaaa7a8db777f17bc7ce519069eb72717c1c2755"}, + {"dragonhound_AR", "039bb16266b0216264e7d3ccae12633105e1c14bd5d0e144e8b9c2b6d298a6c545"}, + {"dragonhound_EU", "0382d7e027bf5cda31264867f4e389a1a72f6671c7bd8818beb35b874d906e22d5"}, + {"dragonhound_NA", "02b4bf90b57f7c8363043c7ea8b02c8c776301ef3c1abb2df1caa2e6947be1422b"}, + {"dragonhound_SH", "02125e737f34c426474c9d29ec280bf49dc5ac99bffb6296b71a5031f58485ec86"}, + {"fediakash_AR", "035be6a54242a53e3ca55bd63430ac9b960fbfaad336d8c1464b5802f03ab184be"}, + {"fediakash_NA", "032485e92b4f06613c43123a178de96386e130311030958a736805d7b278df2f11"}, + {"francois_SH", "0285e1699d28cc6d134e476d85ee37badabc795f136df39e414fe6ca2b204e3a2f"}, + {"gcharang_AR", "039e01651c0afa1fc80b620301ff1981dd1db0f6c6b637b8f2f0fd986e9f5ece59"}, + {"gcharang_SH", "0321868e0eb39271330fa2c3a9f4e542275d9719f8b87773c5432448ab10d6943d"}, + {"gcharang2_SH", "0261b0337647329677b9885b050069a4737f139266c55ec711148af757a0276bc5"}, + {"kmdude_SH", "0253649e80366bb3a84c447ae2632d0ab272640be61ceb34291068c58531dae528"}, + {"marmarachain_AR", "0359809ec0774cf6a2679257c4db240b9061b08f72d9888e3323326f7428ddf93a"}, + {"marmarachain_EU", "02ca3e0618bc7c75afa6359ae476ee639682adfaa6fc463bbe7016c4f00da23ccf"}, + {"mcrypt_NA", "038e6f54c15eda9844e956206138494312648da158280a837341894fc642d8066a"}, + {"naezith_EU", "0310f58935bc72ed76f90301f8bcd8caea576603275493b9c664aa9ed25aa492c6"}, + {"naezith_NA", "031e48218c2e7fea3c852a3674848786c05d06fd451da4e14a6193363cf89febce"}, + {"onur-ozkan_EU", "02387f4093ba78ea6aa9023bd2b3e1d57a4d9d5e745a9cc6cb1bca2565c22f8c89"}, + {"onur-ozkan_NA", "03259f6aa4d3c451a52b7327bff4af9f649be3477459997b52711b54f4c8fb6394"}, + {"pbca26_NA", "025349e2ef906bb8dff17275d5d1034edf261d7b3b0fef02643c4e7227e161cd54"}, + {"ptyx_SH", "02eeaea84667462ae3e0c9262037666af81200b7982682ea06b690b1ac32a48c83"}, + {"shamardy_SH", "03589e28ad013c6ed3df0ed9947ecc2b6873a211be8aa3a745d3fea459b12a6435"}, + {"smdmitry_AR", "0397b7584cb29717b721c0c587d4462477efc1f36a56921f133c9d17b0cd7f278a"}, + {"smdmitry2_AR", "03c1efa0a64392e68cf50a13e4611b272b914cfba1e07f49f94389db3bac4497de"}, + {"smdmitry_EU", "0338f30ca34d0aca0d79b69abde447036aaaa75f482b6c75801fd382e984337d01"}, + {"smdmitry_NA", "038429f7abe33af2d6841029710b835223a05830fc8eee29521ec051e2f2d2e517"}, + {"smdmitry_SH", "03f7d5ac650baaccedab959adf7c4f416584f4c05a37bf079f710227560c456978"}, + {"strob_SH", "0213751a1c59d3489ca85b3d62a3d606dcef7f0428aa021c1978ea16fb38a2fad6"}, + {"gcharang_DEV", "03a3878af1152f648e6084fd3fbe697a26b1c2e92d407dd96c375f45f7d3ca13bf"}, + {"dimxy_DEV", "03a7edd6d0ba188960e39eced4d6b4ca6946bd98323ab40cbc13d6e52696de7dc4"}, + {"ca333_DEV", "0387b2a4c99127e871efeed28b73d6cf8296bb4aa8630e2cfb16490fdc47e0a561"}, + {"qa_DEV", "02ba8283b22c6572d83fd852e04928621dd0e2dd53150b5636ba64404ea73423bb"}, + {"core_DEV", "035509136135ba8e3f5d4733f7a9c160c2e1fefd8dc4658c3d95a5407e8da14749"}, + {"security_DEV", "037f666a67135f748ca3ffec29394662c71e917709bf61fee15a363655a8dff57e"}, + {"tonyl_AR", "03643e81eb0ac245c2caefe013b4357979f69ea585d6803182b230790dbcfb9ecf"}, + {"van_EU", "0370305b9e91d46331da202ae733d6050d01038ef6eceb2036ada394a48fae84b9"}, + {"who-biz_AR", "03a185b059983a5479e3adba44eb5dde8d899468632ba30480301a9f1bbbcbc4a8"}, + {"who-biz_NA", "026d5cecdee3021a80416c3d8ac68e59fd3d77a954bbe88a8eee794ade6c58f411"}, + {"dragonhound_DEV", "02a473e980bf0d198ece8ed11f1ecbe437edb688de6c83b82efa6f7de3a5d43c19"} } }; -class NotaryChecker { -public: - NotaryChecker() { - checkSeasons(); - checkNotaries(); - } - -private: - void checkSeasons() const { - for (size_t i = 0; i < NUM_KMD_SEASONS; ++i) { - assert(KMD_SEASON_TIMESTAMPS[i] != 0 && "KMD_SEASON_TIMESTAMPS is invalid"); - assert(KMD_SEASON_HEIGHTS[i] != 0 && "KMD_SEASON_HEIGHTS is invalid"); - } - } - - void checkNotaries() const { - for (int season = 0; season < NUM_KMD_SEASONS; ++season) { - for (int notary = 0; notary < NUM_KMD_NOTARIES; ++notary) { - const char* name = notaries_elected[season][notary][0]; - const char* pubkey = notaries_elected[season][notary][1]; - assert(name != nullptr && "Notary name is null"); - assert(pubkey != nullptr && "Notary pubkey is null"); - assert(isValidPubkey(pubkey) && "Notary pubkey is invalid"); - } - } - } - - bool isValidPubkey(const char* str) const { - if (strlen(str) != 66) return false; - if (str[0] != '0' || (str[1] != '2' && str[1] != '3')) return false; - for (int i = 2; i < 66; ++i) { - if (!((str[i] >= '0' && str[i] <= '9') || (str[i] >= 'a' && str[i] <= 'f') || (str[i] >= 'A' && str[i] <= 'F'))) { - return false; - } - } - return true; - } -}; - -NotaryChecker notaryChecker; - #define SETBIT(bits,bitoffset) (((uint8_t *)bits)[(bitoffset) >> 3] |= (1 << ((bitoffset) & 7))) #define GETBIT(bits,bitoffset) (((uint8_t *)bits)[(bitoffset) >> 3] & (1 << ((bitoffset) & 7))) #define CLEARBIT(bits,bitoffset) (((uint8_t *)bits)[(bitoffset) >> 3] &= ~(1 << ((bitoffset) & 7))) From c6a08b7cccd3b7f89ae0302fb78120137eb2fb32 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:14:32 +0300 Subject: [PATCH 4/4] update deprecated workflow actions version --- .github/workflows/marmara_linux_ci.yml | 12 ++++++------ .github/workflows/marmara_mac_ci.yml | 12 ++++++------ .github/workflows/marmara_win_ci.yml | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/marmara_linux_ci.yml b/.github/workflows/marmara_linux_ci.yml index d9127cad7fa..5df0747894d 100644 --- a/.github/workflows/marmara_linux_ci.yml +++ b/.github/workflows/marmara_linux_ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install deps (Linux) @@ -40,7 +40,7 @@ jobs: CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build.sh -j$(nproc) tar -czvf marmara-linux.tar.gz src/marmarad src/marmara-cli - name: Upload marmara-linux.tar.gz as artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: marmara-linux path: ./marmara-linux.tar.gz @@ -88,7 +88,7 @@ jobs: needs: linux-build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install deps (OraclesCC) run: | @@ -104,7 +104,7 @@ jobs: python3 -m pip install setuptools wheel python3 -m pip install slick-bitcoinrpc pytest wget jsonschema - name: Download marmara-linux.tar.gz - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: marmara-linux @@ -124,7 +124,7 @@ jobs: needs: linux-build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install deps (BasicRPC) run: | @@ -140,7 +140,7 @@ jobs: python3 -m pip install setuptools wheel python3 -m pip install slick-bitcoinrpc pytest wget jsonschema - name: Download marmara-linux.tar.gz - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: marmara-linux diff --git a/.github/workflows/marmara_mac_ci.yml b/.github/workflows/marmara_mac_ci.yml index 17e3426f040..d32e13facaa 100644 --- a/.github/workflows/marmara_mac_ci.yml +++ b/.github/workflows/marmara_mac_ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Workaround for https://github.com/actions/setup-python/issues/577 - name: Clean up binaries and links (macOS) @@ -50,7 +50,7 @@ jobs: tar -czvf marmara-macos.tar.gz src/marmarad src/marmara-cli - name: Upload marmara-macos.tar.gz as artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: marmara-macos path: ./marmara-macos.tar.gz @@ -92,7 +92,7 @@ jobs: needs: macos-build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install deps (OraclesCC) run: | @@ -100,7 +100,7 @@ jobs: python3 -m pip install setuptools wheel python3 -m pip install slick-bitcoinrpc pytest wget jsonschema - name: Download marmara-macos.tar.gz - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: marmara-macos @@ -121,7 +121,7 @@ jobs: needs: macos-build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install deps (BasicRPC) run: | @@ -129,7 +129,7 @@ jobs: python3 -m pip install setuptools wheel python3 -m pip install slick-bitcoinrpc pytest wget jsonschema - name: Download marmara-macos.tar.gz - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: marmara-macos diff --git a/.github/workflows/marmara_win_ci.yml b/.github/workflows/marmara_win_ci.yml index 7594eea3983..7d657b8de8b 100644 --- a/.github/workflows/marmara_win_ci.yml +++ b/.github/workflows/marmara_win_ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install deps(mingw) env: DEBIAN_FRONTEND: noninteractive @@ -67,7 +67,7 @@ jobs: ./zcutil/build-win-dtest.sh -j$(nproc) zip --junk-paths marmarad_win src/marmarad.exe src/marmara-cli.exe - name: Upload marmarad_win as artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: marmarad_win path: ./marmarad_win.zip @@ -80,10 +80,10 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Download marmarad_win.zip - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: marmarad_win @@ -144,10 +144,10 @@ jobs: needs: windows-build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Download marmarad_win.zip - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: marmarad_win