From bdd0d5e5fdad696de610f5125abc28e5106e4c41 Mon Sep 17 00:00:00 2001 From: Aklix <52243954+Aklix@users.noreply.github.com> Date: Sat, 17 Jun 2023 23:36:13 +0300 Subject: [PATCH 01/23] Update komodo_mac_ci.yml --- .github/workflows/komodo_mac_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/komodo_mac_ci.yml b/.github/workflows/komodo_mac_ci.yml index 93c182514ea..c29e2268cc0 100644 --- a/.github/workflows/komodo_mac_ci.yml +++ b/.github/workflows/komodo_mac_ci.yml @@ -18,7 +18,7 @@ jobs: - name: Install deps (macOS) run: | brew update - brew upgrade + brew upgrade || true brew tap discoteq/discoteq; brew install flock brew install autoconf autogen automake brew install gcc@8 From e15b6344c90d57336e818715da7c5b53c6095b14 Mon Sep 17 00:00:00 2001 From: rumeysayilmaz Date: Fri, 8 Sep 2023 16:52:21 +0300 Subject: [PATCH 02/23] changing to marmarad and marmara-cli --- Makefile.am | 4 ++-- configure.ac | 8 +++---- src/Makefile.am | 44 +++++++++++++++++++------------------- src/Makefile.ktest.include | 4 ++-- src/bitcoin-cli.cpp | 10 ++++----- src/chainparams.cpp | 4 ++-- src/chainparamsseeds.h | 12 +++++------ src/init.cpp | 4 ++-- src/komodo_utils.h | 13 ++++++----- src/main.cpp | 8 +++---- src/main.h | 4 ++-- src/net.cpp | 8 +++---- 12 files changed, 61 insertions(+), 62 deletions(-) diff --git a/Makefile.am b/Makefile.am index 51d0430aca4..01ec9f29339 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,8 +13,8 @@ pkgconfig_DATA = libzcashconsensus.pc endif -BITCOIND_BIN=$(top_builddir)/src/komodod$(EXEEXT) -BITCOIN_CLI_BIN=$(top_builddir)/src/komodo-cli$(EXEEXT) +BITCOIND_BIN=$(top_builddir)/src/marmarad$(EXEEXT) +BITCOIN_CLI_BIN=$(top_builddir)/src/marmara-cli$(EXEEXT) #WALLET_UTILITY_BIN=$(top_builddir)/src/wallet-utility$(EXEEXT) BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) diff --git a/configure.ac b/configure.ac index 00b73afe75a..8cf14b8c11c 100644 --- a/configure.ac +++ b/configure.ac @@ -14,8 +14,8 @@ AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -BITCOIN_DAEMON_NAME=komodod -BITCOIN_CLI_NAME=komodo-cli +BITCOIN_DAEMON_NAME=marmarad +BITCOIN_CLI_NAME=marmara-cli BITCOIN_TX_NAME=komodo-tx dnl Unless the user specified ARFLAGS, force it to be cr @@ -236,7 +236,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS" AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build komodo-cli komodo-tx wallet-utility (default=yes)])], + [build marmara-cli komodo-tx wallet-utility (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -814,7 +814,7 @@ AC_MSG_CHECKING([whether to build bitcoind]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (komodo-cli komodo-tx wallet-utility)]) +AC_MSG_CHECKING([whether to build utils (marmara-cli komodo-tx wallet-utility)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) diff --git a/src/Makefile.am b/src/Makefile.am index 7c60ebae737..cdb88f73f27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -120,11 +120,11 @@ noinst_PROGRAMS = TESTS = #if BUILD_BITCOIND - bin_PROGRAMS += komodod + bin_PROGRAMS += marmarad #endif if BUILD_BITCOIN_UTILS - bin_PROGRAMS += komodo-cli komodo-tx + bin_PROGRAMS += marmara-cli komodo-tx endif if ENABLE_WALLET bin_PROGRAMS += wallet-utility @@ -553,16 +553,16 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # bitcoind binary # -komodod_SOURCES = bitcoind.cpp -komodod_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -komodod_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -komodod_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +marmarad_SOURCES = bitcoind.cpp +marmarad_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +marmarad_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +marmarad_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -komodod_SOURCES += bitcoind-res.rc +marmarad_SOURCES += bitcoind-res.rc endif -komodod_LDADD = \ +marmarad_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBUNIVALUE) \ @@ -580,10 +580,10 @@ komodod_LDADD = \ $(LIBCRYPTOCONDITIONS) if ENABLE_WALLET -komodod_LDADD += $(LIBBITCOIN_WALLET) +marmarad_LDADD += $(LIBBITCOIN_WALLET) endif -komodod_LDADD += \ +marmarad_LDADD += \ $(BOOST_LIBS) \ $(BDB_LIBS) \ $(SSL_LIBS) \ @@ -598,31 +598,31 @@ komodod_LDADD += \ $(LIBZCASH_LIBS) if TARGET_DARWIN -komodod_LDADD += libcc.dylib $(LIBSECP256K1) +marmarad_LDADD += libcc.dylib $(LIBSECP256K1) endif if TARGET_WINDOWS -komodod_LDADD += libcc.dll $(LIBSECP256K1) +marmarad_LDADD += libcc.dll $(LIBSECP256K1) endif if TARGET_LINUX -komodod_LDADD += libcc.so $(LIBSECP256K1) +marmarad_LDADD += libcc.so $(LIBSECP256K1) endif if ENABLE_PROTON -komodod_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS) +marmarad_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS) endif # [+] Decker: use static linking for libstdc++.6.dylib, libgomp.1.dylib, libgcc_s.1.dylib if TARGET_DARWIN -komodod_LDFLAGS += -static-libgcc +marmarad_LDFLAGS += -static-libgcc endif # bitcoin-cli binary # -komodo_cli_SOURCES = bitcoin-cli.cpp -komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) -komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +marmara_cli_SOURCES = bitcoin-cli.cpp +marmara_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) +marmara_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +marmara_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_DARWIN -komodo_cli_LDFLAGS += -static-libgcc +marmara_cli_LDFLAGS += -static-libgcc endif # wallet-utility binary # @@ -634,10 +634,10 @@ wallet_utility_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) endif if TARGET_WINDOWS -komodo_cli_SOURCES += bitcoin-cli-res.rc +marmara_cli_SOURCES += bitcoin-cli-res.rc endif -komodo_cli_LDADD = \ +marmara_cli_LDADD = \ $(LIBBITCOIN_CLI) \ $(LIBUNIVALUE) \ $(LIBBITCOIN_UTIL) \ diff --git a/src/Makefile.ktest.include b/src/Makefile.ktest.include index 640c154e471..b0d4849cc02 100644 --- a/src/Makefile.ktest.include +++ b/src/Makefile.ktest.include @@ -12,8 +12,8 @@ komodo_test_SOURCES = \ test-komodo/test_eval_notarisation.cpp \ test-komodo/test_parse_notarisation.cpp -komodo_test_CPPFLAGS = $(komodod_CPPFLAGS) +komodo_test_CPPFLAGS = $(marmarad_CPPFLAGS) -komodo_test_LDADD = -lgtest $(komodod_LDADD) +komodo_test_LDADD = -lgtest $(marmarad_LDADD) komodo_test_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 0e0d6052d19..638d44b72d2 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -96,17 +96,17 @@ static int AppInitRPC(int argc, char* argv[]) // ParseParameters(argc, argv); std:string name; - name = GetArg("-ac_name",""); + name = GetArg("-ac_name","MCL"); if ( !name.empty() ) strncpy(ASSETCHAINS_SYMBOL,name.c_str(),sizeof(ASSETCHAINS_SYMBOL)-1); if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Komodo RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); + std::string strUsage = _("Marmara RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (!mapArgs.count("-version")) { strUsage += "\n" + _("Usage:") + "\n" + - " komodo-cli [options] [params] " + _("Send command to Komodo") + "\n" + - " komodo-cli [options] help " + _("List commands") + "\n" + - " komodo-cli [options] help " + _("Get help for a command") + "\n"; + " marmara-cli [options] [params] " + _("Send command to Marmara") + "\n" + + " marmara-cli [options] help " + _("List commands") + "\n" + + " marmara-cli [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessageCli(); } else { diff --git a/src/chainparams.cpp b/src/chainparams.cpp index ed29f8469b0..82458a8465d 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -182,8 +182,8 @@ class CMainParams : public CChainParams { assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b")); vFixedSeeds.clear(); vSeeds.clear(); - vSeeds.push_back(CDNSSeedData("komodoseeds.com", "kmd.komodoseeds.com")); // Static contolled seeds list (Kolo) - vSeeds.push_back(CDNSSeedData("komodoseeds.com", "dynamic.komodoseeds.com")); // Active seeds crawler (Kolo) + // vSeeds.push_back(CDNSSeedData("komodoseeds.com", "kmd.komodoseeds.com")); // Static contolled seeds list (Kolo) + // vSeeds.push_back(CDNSSeedData("komodoseeds.com", "dynamic.komodoseeds.com")); // Active seeds crawler (Kolo) // TODO: we need more seed crawlers from other community members base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,60); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,85); diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index e3dac3ca641..a3e9a35e42a 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -23,12 +23,12 @@ * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly. */ static SeedSpec6 pnSeed6_main[] = { - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0xec}, 27485}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0xec}, 27487}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x40,0x69,0x6f}, 27485}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x40,0x69,0x6f}, 27487}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0x48}, 27485}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0x48}, 27487} + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0x95,0xf2}, 33824} + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xA1,0x61,0x92,0x96}, 33824}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xCA,0x9E,0x91}, 33824}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xCA,0x9E,0x92}, 33824}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xCA,0x9E,0x93}, 33824}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x13,0x1A,0xD4}, 33824} }; static SeedSpec6 pnSeed6_test[] = { diff --git a/src/init.cpp b/src/init.cpp index 2a6c4d5c17f..64886be3fc8 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1651,7 +1651,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) { bool checkval,fAddressIndex,fSpentIndex; pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex, dbCompression, dbMaxOpenFiles); - fAddressIndex = GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX); + fAddressIndex = 1; //GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX); pblocktree->ReadFlag("addressindex", checkval); if ( checkval != fAddressIndex && fAddressIndex != 0 ) { @@ -1659,7 +1659,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) fprintf(stderr,"set addressindex, will reindex. could take a while.\n"); fReindex = true; } - fSpentIndex = GetBoolArg("-spentindex", DEFAULT_SPENTINDEX); + fSpentIndex = 1; //GetBoolArg("-spentindex", DEFAULT_SPENTINDEX); pblocktree->ReadFlag("spentindex", checkval); if ( checkval != fSpentIndex && fSpentIndex != 0 ) { diff --git a/src/komodo_utils.h b/src/komodo_utils.h index e0be6f58817..7f4794e186f 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1752,7 +1752,7 @@ void komodo_args(char *argv0) fprintf(stderr, "Cannot be STAKED and KMD notary at the same time!\n"); StartShutdown(); } - name = GetArg("-ac_name",""); + name = GetArg("-ac_name","MCL"); if ( argv0 != 0 ) { len = (int32_t)strlen(argv0); @@ -1773,7 +1773,7 @@ void komodo_args(char *argv0) KOMODO_STOPAT = GetArg("-stopat",0); MAX_REORG_LENGTH = GetArg("-maxreorg",MAX_REORG_LENGTH); WITNESS_CACHE_SIZE = MAX_REORG_LENGTH+10; - ASSETCHAINS_CC = GetArg("-ac_cc",0); + ASSETCHAINS_CC = 2; //GetArg("-ac_cc",0); KOMODO_CCACTIVATE = GetArg("-ac_ccactivate",0); ASSETCHAINS_BLOCKTIME = GetArg("-ac_blocktime",60); ASSETCHAINS_PUBLIC = GetArg("-ac_public",0); @@ -1863,7 +1863,7 @@ void komodo_args(char *argv0) } Split(GetArg("-ac_end",""), sizeof(ASSETCHAINS_ENDSUBSIDY)/sizeof(*ASSETCHAINS_ENDSUBSIDY), ASSETCHAINS_ENDSUBSIDY, 0); - Split(GetArg("-ac_reward",""), sizeof(ASSETCHAINS_REWARD)/sizeof(*ASSETCHAINS_REWARD), ASSETCHAINS_REWARD, 0); + Split(GetArg("-ac_reward","3000000000"), sizeof(ASSETCHAINS_REWARD)/sizeof(*ASSETCHAINS_REWARD), ASSETCHAINS_REWARD, 0); Split(GetArg("-ac_halving",""), sizeof(ASSETCHAINS_HALVING)/sizeof(*ASSETCHAINS_HALVING), ASSETCHAINS_HALVING, 0); Split(GetArg("-ac_decay",""), sizeof(ASSETCHAINS_DECAY)/sizeof(*ASSETCHAINS_DECAY), ASSETCHAINS_DECAY, 0); Split(GetArg("-ac_notarypay",""), sizeof(ASSETCHAINS_NOTARY_PAY)/sizeof(*ASSETCHAINS_NOTARY_PAY), ASSETCHAINS_NOTARY_PAY, 0); @@ -1886,7 +1886,7 @@ void komodo_args(char *argv0) ASSETCHAINS_TXPOW = GetArg("-ac_txpow",0) & 3; ASSETCHAINS_FOUNDERS = GetArg("-ac_founders",0);// & 1; ASSETCHAINS_FOUNDERS_REWARD = GetArg("-ac_founders_reward",0); - ASSETCHAINS_SUPPLY = GetArg("-ac_supply",10); + ASSETCHAINS_SUPPLY = GetArg("-ac_supply",2000000); if ( ASSETCHAINS_SUPPLY > (uint64_t)90*1000*1000000 ) { fprintf(stderr,"-ac_supply must be less than 90 billion\n"); @@ -1900,7 +1900,7 @@ void komodo_args(char *argv0) ASSETCHAINS_SCRIPTPUB = GetArg("-ac_script",""); ASSETCHAINS_BEAMPORT = GetArg("-ac_beam",0); ASSETCHAINS_CODAPORT = GetArg("-ac_coda",0); - ASSETCHAINS_MARMARA = GetArg("-ac_marmara",0); + ASSETCHAINS_MARMARA = true; //GetArg("-ac_marmara",0); ASSETCHAINS_CBOPRET = GetArg("-ac_cbopret",0); ASSETCHAINS_CBMATURITY = GetArg("-ac_cbmaturity",0); ASSETCHAINS_ADAPTIVEPOW = GetArg("-ac_adaptivepow",0); @@ -2072,8 +2072,7 @@ void komodo_args(char *argv0) } - if ( (ASSETCHAINS_STAKED= GetArg("-ac_staked",0)) > 100 ) - ASSETCHAINS_STAKED = 100; + ASSETCHAINS_STAKED = 75; // for now, we only support 50% PoS due to other parts of the algorithm needing adjustment for // other values diff --git a/src/main.cpp b/src/main.cpp index d205d417a65..056e63daf4c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -100,9 +100,9 @@ bool fExperimentalMode = true; bool fImporting = false; bool fReindex = false; bool fTxIndex = false; -bool fAddressIndex = false; +bool fAddressIndex = true; bool fTimestampIndex = false; -bool fSpentIndex = false; +bool fSpentIndex = true; bool fHavePruned = false; bool fPruneMode = false; bool fIsBareMultisigStd = true; @@ -6736,14 +6736,14 @@ bool InitBlockIndex() { fTxIndex = GetBoolArg("-txindex", true); pblocktree->WriteFlag("txindex", fTxIndex); // Use the provided setting for -addressindex in the new database - fAddressIndex = GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX); + fAddressIndex = 1; //GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX); pblocktree->WriteFlag("addressindex", fAddressIndex); // Use the provided setting for -timestampindex in the new database fTimestampIndex = GetBoolArg("-timestampindex", DEFAULT_TIMESTAMPINDEX); pblocktree->WriteFlag("timestampindex", fTimestampIndex); - fSpentIndex = GetBoolArg("-spentindex", DEFAULT_SPENTINDEX); + fSpentIndex = 1; //GetBoolArg("-spentindex", DEFAULT_SPENTINDEX); pblocktree->WriteFlag("spentindex", fSpentIndex); fprintf(stderr,"fAddressIndex.%d/%d fSpentIndex.%d/%d\n",fAddressIndex,DEFAULT_ADDRESSINDEX,fSpentIndex,DEFAULT_SPENTINDEX); LogPrintf("Initializing databases...\n"); diff --git a/src/main.h b/src/main.h index c1b477154cd..5ae948c33b2 100644 --- a/src/main.h +++ b/src/main.h @@ -123,8 +123,8 @@ static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60; //static const bool DEFAULT_ADDRESSINDEX = false; //static const bool DEFAULT_SPENTINDEX = false; -#define DEFAULT_ADDRESSINDEX (GetArg("-ac_cc",0) != 0 || GetArg("-ac_ccactivate",0) != 0) -#define DEFAULT_SPENTINDEX (GetArg("-ac_cc",0) != 0 || GetArg("-ac_ccactivate",0) != 0) +#define DEFAULT_ADDRESSINDEX true //(GetArg("-ac_cc",0) != 0 || GetArg("-ac_ccactivate",0) != 0) +#define DEFAULT_SPENTINDEX true //(GetArg("-ac_cc",0) != 0 || GetArg("-ac_ccactivate",0) != 0) static const bool DEFAULT_TIMESTAMPINDEX = false; static const unsigned int DEFAULT_DB_MAX_OPEN_FILES = 1000; static const bool DEFAULT_DB_COMPRESSION = true; diff --git a/src/net.cpp b/src/net.cpp index 1ac3e5a22d6..3407c0108d3 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1396,11 +1396,11 @@ void ThreadOpenConnections() static bool done = false; if (!done) { // skip DNS seeds for staked chains. - if ( is_STAKED(ASSETCHAINS_SYMBOL) == 0 && KOMODO_DEX_P2P == 0 ) { + //if ( is_STAKED(ASSETCHAINS_SYMBOL) == 0 && KOMODO_DEX_P2P == 0 ) { //LogPrintf("Adding fixed seed nodes as DNS doesn't seem to be available.\n"); - LogPrintf("Adding fixed seed nodes.\n"); - addrman.Add(convertSeed6(Params().FixedSeeds()), CNetAddr("127.0.0.1")); - } + LogPrintf("Adding fixed seed nodes.\n"); + addrman.Add(convertSeed6(Params().FixedSeeds()), CNetAddr("127.0.0.1")); + //} done = true; } } From f23d27b80c49cecda940f676bef8036755983140 Mon Sep 17 00:00:00 2001 From: rumeysayilmaz Date: Fri, 15 Sep 2023 18:09:30 +0300 Subject: [PATCH 03/23] added missing comma --- src/chainparamsseeds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index a3e9a35e42a..9a7adb054c5 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -23,7 +23,7 @@ * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly. */ static SeedSpec6 pnSeed6_main[] = { - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0x95,0xf2}, 33824} + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0x95,0xf2}, 33824}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xA1,0x61,0x92,0x96}, 33824}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xCA,0x9E,0x91}, 33824}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xCA,0x9E,0x92}, 33824}, From b1d910687f266e4e4a20957d083bf13756ac88d7 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Fri, 20 Oct 2023 10:24:42 +0300 Subject: [PATCH 04/23] Update build-win-dtest.sh change to marmarad and marmara-cli --- zcutil/build-win-dtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zcutil/build-win-dtest.sh b/zcutil/build-win-dtest.sh index 00a64de5bf7..6f2f2eb072a 100755 --- a/zcutil/build-win-dtest.sh +++ b/zcutil/build-win-dtest.sh @@ -21,4 +21,4 @@ cd $WD CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -DCURVE_ALT_BN128 -fopenmp -pthread" CPPFLAGS=-DTESTMODE ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared sed -i 's/-lboost_system-mt /-lboost_system-mt-s /' configure cd src/ -CC="${CC} -g " CXX="${CXX} -g " make V=1 komodod.exe komodo-cli.exe komodo-tx.exe +CC="${CC} -g " CXX="${CXX} -g " make V=1 marmarad.exe marmara-cli.exe komodo-tx.exe From 4f50127dfd2c70b6033353623521ed28f09f3ae0 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Fri, 20 Oct 2023 10:25:24 +0300 Subject: [PATCH 05/23] Update build-win.sh change to marmarad and marmara-cli --- zcutil/build-win.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zcutil/build-win.sh b/zcutil/build-win.sh index 085aa6063ac..9a648e42c72 100755 --- a/zcutil/build-win.sh +++ b/zcutil/build-win.sh @@ -28,4 +28,4 @@ cd $WD CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -DCURVE_ALT_BN128 -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared sed -i 's/-lboost_system-mt /-lboost_system-mt-s /' configure cd src/ -CC="${CC} -g " CXX="${CXX} -g " make V=1 komodod.exe komodo-cli.exe komodo-tx.exe +CC="${CC} -g " CXX="${CXX} -g " make V=1 marmarad.exe marmara-cli.exe komodo-tx.exe From 419ded78db579e885854872795f2993df8b516d9 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 25 Jan 2024 20:00:03 +0300 Subject: [PATCH 06/23] added marmara strings: Update bitcoin-cli-res.rc --- src/bitcoin-cli-res.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc index 3e46f5a1606..fc6aee148da 100644 --- a/src/bitcoin-cli-res.rc +++ b/src/bitcoin-cli-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Komodo" - VALUE "FileDescription", "komodo-cli (JSON-RPC client for Komodo)" + VALUE "CompanyName", "marmara" + VALUE "FileDescription", "marmara-cli (JSON-RPC client for Marmara)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "komodo-cli" + VALUE "InternalName", "marmara-cli" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "komodo-cli.exe" - VALUE "ProductName", "komodo-cli" + VALUE "OriginalFilename", "marmara-cli.exe" + VALUE "ProductName", "marmara-cli" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END From 3aa1827cec30fe50397d44d41070ddaebdd891ab Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 25 Jan 2024 20:42:56 +0300 Subject: [PATCH 07/23] renamings for marmarad and marmara-cli --- .github/workflows/komodo_linux_ci.yml | 24 +++++++++++------------ .github/workflows/komodo_mac_ci.yml | 24 +++++++++++------------ .github/workflows/komodo_win_ci.yml | 28 +++++++++++++-------------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/komodo_linux_ci.yml b/.github/workflows/komodo_linux_ci.yml index 71270266527..8c192233ead 100644 --- a/.github/workflows/komodo_linux_ci.yml +++ b/.github/workflows/komodo_linux_ci.yml @@ -38,12 +38,12 @@ jobs: run: | # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!! CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build.sh -j$(nproc) - tar -czvf komodo-linux.tar.gz src/komodod src/komodo-cli - - name: Upload komodo-linux.tar.gz as artifact + tar -czvf marmara-linux.tar.gz src/marmarad src/marmara-cli + - name: Upload marmara-linux.tar.gz as artifact uses: actions/upload-artifact@v1 with: - name: komodo-linux - path: ./komodo-linux.tar.gz + name: marmara-linux + path: ./marmara-linux.tar.gz # linux-test-dice-token-reards-faucet-cc: @@ -102,16 +102,16 @@ jobs: libssl-dev -y python3 -m pip install setuptools wheel python3 -m pip install slick-bitcoinrpc pytest wget jsonschema - - name: Download komodo-linux.tar.gz + - name: Download marmara-linux.tar.gz uses: actions/download-artifact@v1 with: - name: komodo-linux + name: marmara-linux - name: Oracles Test (Linux) run: | - mv komodo-linux/komodo-linux.tar.gz . + mv marmara-linux/marmara-linux.tar.gz . mkdir -p src - tar xzvf komodo-linux.tar.gz + tar xzvf marmara-linux.tar.gz ./zcutil/fetch-params.sh cd qa/pytest_komodo ./ci_setup.sh cc_modules/test_oracles.py @@ -137,16 +137,16 @@ jobs: libssl-dev -y python3 -m pip install setuptools wheel python3 -m pip install slick-bitcoinrpc pytest wget jsonschema - - name: Download komodo-linux.tar.gz + - name: Download marmara-linux.tar.gz uses: actions/download-artifact@v1 with: - name: komodo-linux + name: marmara-linux - name: BasicRPC Test (Linux) run: | - mv komodo-linux/komodo-linux.tar.gz . + mv marmara-linux/marmara-linux.tar.gz . mkdir -p src - tar xzvf komodo-linux.tar.gz + tar xzvf marmara-linux.tar.gz ./zcutil/fetch-params.sh cd qa/pytest_komodo ./ci_setup.sh basic diff --git a/.github/workflows/komodo_mac_ci.yml b/.github/workflows/komodo_mac_ci.yml index c29e2268cc0..a9916573bc3 100644 --- a/.github/workflows/komodo_mac_ci.yml +++ b/.github/workflows/komodo_mac_ci.yml @@ -33,12 +33,12 @@ jobs: # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!! export CPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ ./zcutil/build-mac-dtest.sh -j4 - tar -czvf komodo-macos.tar.gz src/komodod src/komodo-cli - - name: Upload komodo-macos.tar.gz as artifact + tar -czvf marmara-macos.tar.gz src/marmarad src/marmara-cli + - name: Upload marmara-macos.tar.gz as artifact uses: actions/upload-artifact@v1 with: - name: komodo-macos - path: ./komodo-macos.tar.gz + name: marmara-macos + path: ./marmara-macos.tar.gz # macos-test-dice-token-reards-faucet-cc: @@ -83,16 +83,16 @@ jobs: brew install python3 curl python3 -m pip install setuptools wheel python3 -m pip install slick-bitcoinrpc pytest wget jsonschema - - name: Download komodo-macos.tar.gz + - name: Download marmara-macos.tar.gz uses: actions/download-artifact@v1 with: - name: komodo-macos + name: marmara-macos - name: Oracles Test (macos) run: | - mv komodo-macos/komodo-macos.tar.gz . + mv marmara-macos/marmara-macos.tar.gz . mkdir -p src - tar xzvf komodo-macos.tar.gz + tar xzvf marmara-macos.tar.gz ./zcutil/fetch-params.sh cd qa/pytest_komodo ./ci_setup.sh cc_modules/test_oracles.py @@ -110,16 +110,16 @@ jobs: brew install python3 curl python3 -m pip install setuptools wheel python3 -m pip install slick-bitcoinrpc pytest wget jsonschema - - name: Download komodo-macos.tar.gz + - name: Download marmara-macos.tar.gz uses: actions/download-artifact@v1 with: - name: komodo-macos + name: marmara-macos - name: BasicRPC Test (macos) run: | - mv komodo-macos/komodo-macos.tar.gz . + mv marmara-macos/marmara-macos.tar.gz . mkdir -p src - tar xzvf komodo-macos.tar.gz + tar xzvf marmara-macos.tar.gz ./zcutil/fetch-params.sh cd qa/pytest_komodo ./ci_setup.sh basic diff --git a/.github/workflows/komodo_win_ci.yml b/.github/workflows/komodo_win_ci.yml index 9a6df6f7a29..e433ab82845 100644 --- a/.github/workflows/komodo_win_ci.yml +++ b/.github/workflows/komodo_win_ci.yml @@ -65,12 +65,12 @@ jobs: # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!! export CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build-win-dtest.sh -j$(nproc) - zip --junk-paths komodod_win src/komodod.exe src/komodo-cli.exe - - name: Upload komodod.exe as artifact + zip --junk-paths marmara_win src/marmarad.exe src/marmara-cli.exe + - name: Upload marmara_win as artifact uses: actions/upload-artifact@v1 with: - name: komodod_win - path: ./komodod_win.zip + name: marmara_win + path: ./marmara_win.zip windows-test-baserpc: @@ -81,17 +81,17 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Download komodo_win.zip + - name: Download marmara_win.zip uses: actions/download-artifact@v1 with: - name: komodod_win + name: marmara_win - name: Install deps (Base) shell: cmd run: | - move komodod_win\komodod_win.zip - 7z e komodod_win.zip - move komodod.exe src\ + move marmara_win\marmara_win.zip + 7z e marmara_win.zip + move marmarad.exe src\ python.exe -m pip install --upgrade setuptools python.exe -m pip install --upgrade pip python.exe -m pip install pycurl pytest wget jsonschema @@ -144,17 +144,17 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Download komodo_win.zip + - name: Download marmara_win.zip uses: actions/download-artifact@v1 with: - name: komodod_win + name: marmara_win - name: Install deps (OraclesCC) shell: cmd run: | - move komodod_win\komodod_win.zip - 7z e komodod_win.zip - move komodod.exe src\ + move marmara_win\marmara_win.zip + 7z e marmara_win.zip + move marmarad.exe src\ python.exe -m pip install --upgrade setuptools python.exe -m pip install --upgrade pip python.exe -m pip install pycurl pytest wget jsonschema From fb394c44c8f039c22cd828e8221fce24cdefbb57 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 25 Jan 2024 21:21:07 +0300 Subject: [PATCH 08/23] changes for marmarad and marmara-cli --- makeReleaseMac.sh | 10 +++++----- src/bitcoind-res.rc | 10 +++++----- src/bitcoind.cpp | 16 ++++++++-------- src/init.cpp | 2 +- src/main.cpp | 2 +- src/util.cpp | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/makeReleaseMac.sh b/makeReleaseMac.sh index e20df75aadf..91e6b7bebd6 100755 --- a/makeReleaseMac.sh +++ b/makeReleaseMac.sh @@ -3,13 +3,13 @@ PACKAGE_DIR="$@" mkdir ${PACKAGE_DIR} -binaries=("komodo-cli" "komodod") +binaries=("marmara-cli" "marmarad") alllibs=() for binary in "${binaries[@]}"; do # do the work in the destination directory cp src/${binary} ${PACKAGE_DIR} - # find the dylibs to copy for komodod + # find the dylibs to copy for marmarad DYLIBS=`otool -L ${PACKAGE_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` echo "copying ${DYLIBS} to ${PACKAGE_DIR}" # copy the dylibs to the srcdir @@ -20,7 +20,7 @@ libraries=("libgcc_s.1.dylib" "libgomp.1.dylib" "libidn2.0.dylib" "libstdc++.6.d for binary in "${libraries[@]}"; do - # find the dylibs to copy for komodod + # find the dylibs to copy for marmarad DYLIBS=`otool -L ${PACKAGE_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` echo "copying ${DYLIBS} to ${PACKAGE_DIR}" # copy the dylibs to the srcdir @@ -33,7 +33,7 @@ for binary in "${indirectlibraries[@]}"; do # Need to undo this for the dylibs when we are done chmod 755 src/${binary} - # find the dylibs to copy for komodod + # find the dylibs to copy for marmarad DYLIBS=`otool -L ${PACKAGE_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` echo "copying indirect ${DYLIBS} to ${PACKAGE_DIR}" # copy the dylibs to the dest dir @@ -42,7 +42,7 @@ done for binary in "${binaries[@]}"; do - # modify komodod to point to dylibs + # modify marmarad to point to dylibs echo "modifying ${binary} to use local libraries" for dylib in "${alllibs[@]}" do diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc index 246ba98ac8a..72b221a879d 100644 --- a/src/bitcoind-res.rc +++ b/src/bitcoind-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Komodo" - VALUE "FileDescription", "komodod (Komodo node with a JSON-RPC server)" + VALUE "CompanyName", "marmara" + VALUE "FileDescription", "marmarad (Marmara node with a JSON-RPC server)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "komodod" + VALUE "InternalName", "marmarad" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "komodod.exe" - VALUE "ProductName", "komodod" + VALUE "OriginalFilename", "marmarad.exe" + VALUE "ProductName", "marmarad" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 4a1f0a0dda1..ba77047d90d 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -130,7 +130,7 @@ bool AppInit(int argc, char* argv[]) // Process help and version before taking care about datadir if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Komodo Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); + std::string strUsage = _("Marmara Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (mapArgs.count("-version")) { @@ -139,7 +139,7 @@ bool AppInit(int argc, char* argv[]) else { strUsage += "\n" + _("Usage:") + "\n" + - " komodod [options] " + _("Start Komodo Daemon") + "\n"; + " marmarad [options] " + _("Start Marmara Daemon") + "\n"; strUsage += "\n" + HelpMessage(HMM_BITCOIND); } @@ -172,11 +172,11 @@ bool AppInit(int argc, char* argv[]) ReadConfigFile(mapArgs, mapMultiArgs,1); } catch (const missing_zcash_conf& e) { fprintf(stderr, - (_("Before starting komodod, you need to create a configuration file:\n" + (_("Before starting marmarad, you need to create a configuration file:\n" "%s\n" "It can be completely empty! That indicates you are happy with the default\n" - "configuration of komodod. But requiring a configuration file to start ensures\n" - "that komodod won't accidentally compromise your privacy if there was a default\n" + "configuration of marmarad. But requiring a configuration file to start ensures\n" + "that marmarad won't accidentally compromise your privacy if there was a default\n" "option you needed to change.\n" "\n" "You can look at the example configuration file for suggestions of default\n" @@ -198,12 +198,12 @@ bool AppInit(int argc, char* argv[]) // Command-line RPC bool fCommandLine = false; for (int i = 1; i < argc; i++) - if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "komodo:")) + if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "marmara:")) fCommandLine = true; if (fCommandLine) { - fprintf(stderr, "Error: There is no RPC client functionality in komodod. Use the komodo-cli utility instead.\n"); + fprintf(stderr, "Error: There is no RPC client functionality in marmarad. Use the marmara-cli utility instead.\n"); exit(EXIT_FAILURE); } @@ -211,7 +211,7 @@ bool AppInit(int argc, char* argv[]) fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { - fprintf(stdout, "Komodo %s server starting\n",ASSETCHAINS_SYMBOL); + fprintf(stdout, "Marmara %s server starting\n",ASSETCHAINS_SYMBOL); // Daemonize pid_t pid = fork(); diff --git a/src/init.cpp b/src/init.cpp index 64886be3fc8..e31b0d672a1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -396,7 +396,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-par=", strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"), -(int)boost::thread::hardware_concurrency(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS)); #ifndef _WIN32 - strUsage += HelpMessageOpt("-pid=", strprintf(_("Specify pid file (default: %s)"), "komodod.pid")); + strUsage += HelpMessageOpt("-pid=", strprintf(_("Specify pid file (default: %s)"), "marmarad.pid")); #endif strUsage += HelpMessageOpt("-prune=", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. " "Warning: Reverting this setting requires re-downloading the entire blockchain. " diff --git a/src/main.cpp b/src/main.cpp index 056e63daf4c..17afc2cedf3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4689,7 +4689,7 @@ static bool ActivateBestChainStep(bool fSkipdpow, CValidationState &state, CBloc if ( !DisconnectTip(state) ) break; } - fprintf(stderr,"reached rewind.%d, best to do: ./komodo-cli -ac_name=%s stop\n",KOMODO_REWIND,ASSETCHAINS_SYMBOL); + fprintf(stderr,"reached rewind.%d, best to do: ./marmara-cli -ac_name=%s stop\n",KOMODO_REWIND,ASSETCHAINS_SYMBOL); sleep(20); fprintf(stderr,"resuming normal operations\n"); KOMODO_REWIND = 0; diff --git a/src/util.cpp b/src/util.cpp index 15eea4e7dcb..fb047be3cf8 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -744,7 +744,7 @@ void ReadConfigFile(map& mapSettingsRet, #ifndef _WIN32 boost::filesystem::path GetPidFile() { - boost::filesystem::path pathPidFile(GetArg("-pid", "komodod.pid")); + boost::filesystem::path pathPidFile(GetArg("-pid", "marmarad.pid")); if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; return pathPidFile; } From c4c1fbd75da3ad7df43ca8c8cf25c23c24222035 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Fri, 26 Jan 2024 11:49:09 +0300 Subject: [PATCH 09/23] removed Coquicash, AXO and BTCH from dPoW reflected changes from komodo base --- src/ac.json | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/ac.json b/src/ac.json index 7ffed005a95..409816ad85c 100644 --- a/src/ac.json +++ b/src/ac.json @@ -53,18 +53,6 @@ "ac_supply": "999999" } , - "COQUICASH": { - "ac_supply": "72000000", - "ac_reward": "7200000000", - "ac_staked": "50", - "ac_halving": "420000", - "ac_cc": "2", - "ac_ccenable": "227,235,236,241", - "addnode": [ - "78.47.108.168" - ] - } - , "WLC": { "ac_supply": "210000000" @@ -81,22 +69,11 @@ } , - "AXO": { - "ac_supply": "200000000", - "ac_ccactivate": "130000" - } - , - "ETOMIC": { "ac_supply": "100000000" } , - "BTCH": { - "ac_supply": "20998641" - } - , - "NINJA": { "ac_supply": "100000000" } From 8bb4b45f0de556993cf70cd03ebf77aef52f50df Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Fri, 26 Jan 2024 17:18:52 +0300 Subject: [PATCH 10/23] Update bitcoind.cpp replaced string with marmara --- src/bitcoind.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index ba77047d90d..5b639b3163d 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -181,7 +181,7 @@ bool AppInit(int argc, char* argv[]) "\n" "You can look at the example configuration file for suggestions of default\n" "options that you may want to change. It should be in one of these locations,\n" - "depending on how you installed Komodo:\n") + + "depending on how you installed Marmara:\n") + _("- Source code: %s\n" "- .deb package: %s\n")).c_str(), GetConfigFile().string().c_str(), From a4683281dbe4e83d1e51dada7f94808c4ad7d1d0 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Fri, 26 Jan 2024 19:40:58 +0300 Subject: [PATCH 11/23] renaming error message strings for marmara --- src/init.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index e31b0d672a1..811d2a352b0 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1334,7 +1334,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) // Sanity check if (!InitSanityCheck()) - return InitError(_("Initialization sanity check failed. Komodo is shutting down.")); + return InitError(_("Initialization sanity check failed. Marmara is shutting down.")); std::string strDataDir = GetDataDir().string(); #ifdef ENABLE_WALLET @@ -1350,9 +1350,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) try { static boost::interprocess::file_lock lock(pathLockFile.string().c_str()); if (!lock.try_lock()) - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Komodo is probably already running."), strDataDir)); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Marmara is probably already running."), strDataDir)); } catch(const boost::interprocess::interprocess_exception& e) { - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Komodo is probably already running.") + " %s.", strDataDir, e.what())); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Marmara is probably already running.") + " %s.", strDataDir, e.what())); } #ifndef _WIN32 @@ -1361,7 +1361,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) if (GetBoolArg("-shrinkdebugfile", !fDebug)) ShrinkDebugFile(); LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - LogPrintf("Komodo version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); + LogPrintf("Marmara version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); if (fPrintToDebugLog) OpenDebugLog(); From 7af581bb80f3cd47a0bc317485760aa4725a7ac5 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Tue, 19 Mar 2024 17:24:40 +0300 Subject: [PATCH 12/23] alter help and stop message for marmarad change --- src/rpc/server.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index a559b2bb7c6..edcf0675c72 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -271,7 +271,7 @@ UniValue stop(const UniValue& params, bool fHelp, const CPubKey& mypk) if (fHelp || params.size() > 1) throw runtime_error( "stop\n" - "\nStop Komodo server."); + "\nStop Marmara server."); #ifdef ENABLE_WALLET GenerateBitcoins(false, pwalletMain, 0); @@ -873,10 +873,8 @@ std::string HelpExampleCli(const std::string& methodname, const std::string& arg { if ( ASSETCHAINS_SYMBOL[0] == 0 ) { return "> komodo-cli " + methodname + " " + args + "\n"; - } else if ((strncmp(ASSETCHAINS_SYMBOL, "HUSH3", 5) == 0) ) { - return "> hush-cli " + methodname + " " + args + "\n"; } else { - return "> komodo-cli -ac_name=" + strprintf("%s", ASSETCHAINS_SYMBOL) + " " + methodname + " " + args + "\n"; + return "> marmara-cli " + methodname + " " + args + "\n"; } } From c1833937be9874d163173a979d8ccdfcb087a38e Mon Sep 17 00:00:00 2001 From: rumeysayilmaz Date: Wed, 20 Mar 2024 20:21:43 +0300 Subject: [PATCH 13/23] new file: doc/README.md new file: doc/getting-started-with-marmara.md new file: doc/marmara-build-from-source.md new file: doc/marmara-install-from-precompiled-binaries.md --- doc/README.md | 60 ++ doc/getting-started-with-marmara.md | 739 ++++++++++++++++++ doc/marmara-build-from-source.md | 240 ++++++ ...rmara-install-from-precompiled-binaries.md | 166 ++++ 4 files changed, 1205 insertions(+) create mode 100644 doc/README.md create mode 100644 doc/getting-started-with-marmara.md create mode 100644 doc/marmara-build-from-source.md create mode 100644 doc/marmara-install-from-precompiled-binaries.md diff --git a/doc/README.md b/doc/README.md new file mode 100644 index 00000000000..b5cb096a576 --- /dev/null +++ b/doc/README.md @@ -0,0 +1,60 @@ +![MarmaraCreditLoops Logo](https://raw.githubusercontent.com/marmarachain/marmara/master/MCL-Logo.png "Marmara Credit Loops Logo") + +## Marmara Credit Loops + +This is the official Marmara Credit Loops sourcecode repository based on https://github.com/marmarachain. + +## Resources + +- Marmara Credit Loops Website: [Marmara Website](http://marmara.io/) +- Marmara Credit Loops Blockexplorer: [Marmara Explorer](https://explorer.marmara.io/) +- Marmara Credit Loops Discord: [MCL Discord](https://discord.com/invite/DZDPAd) +- Mail: [marmarachain@gmail.com](mailto:marmarachain@gmail.com) +- Whitepaper: [Marmara Whitepaper](http://marmara.io/docs/IMSS2019_WhitePaper_English.pdf) + + +## Tech Specification +- Pre-mining: 2,000,000 MCL +- Annual Supply: ~ 15,000,000 MCL +- Block Time: 60 seconds +- Block Reward: 30 MCL +- 25% Mining, 75% Staking (Staking is only possible with activated/locked coins). +- 3x staking when Activating/locking Coins in Credit Loops + +## About this Project + +Marmara, or Marmara Credit Loops is a peer-to-peer credit creation and circulation platform using Komodo Blockchain Technologies that is based on Zcash and has been extended by its innovative consensus algorithm called dPoW which utilizes Bitcoin's hashrate to store Komodo blockchain information into the Bitcoin blockchain. + +The main purpose of Marmara is to solve non-redemption problem in peer-to-peer credit creation and circulation. It is the first system in the World to solve universal bouncing problem in post-dated cheques and promissory notes used in many countries. The system may be easily used by communities adopting similar culture. It is originally a trust based system. + +Millennium Version has 100 % collateralization. So there is no more bouncing problem in credits or cheques. This is achieved through staking coins by means of activation, i.e. timelocking. When activated in credit loops, coins give you 3x boosted staking power. +More details are available under http://marmara.io/ + +## Getting Started + +- To build Marmara from source, follow the [Marmara Credit Loops Build Instructions](https://github.com/marmarachain/marmara/doc/marmara-build-from-source.md). +- To install Marmara from pre-compiled binaries, follow the [Marmara Credit Loops Install Instructions](https://github.com/marmarachain/marmara/doc/marmara-install-from-precompied-binaries.md). +- 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/doc/getting-started-with-marmara.md) guide. + +## Marmara Evolvement +### Marmara v.1.0.1 Hardfork Change log +``` +- 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 +``` + +### Contact +- B. Gültekin Çetiner [![twitter](https://img.shields.io/twitter/follow/drcetiner?style=social)](https://twitter.com/drcetiner ) + +License +--- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/doc/getting-started-with-marmara.md b/doc/getting-started-with-marmara.md new file mode 100644 index 00000000000..780813c27f8 --- /dev/null +++ b/doc/getting-started-with-marmara.md @@ -0,0 +1,739 @@ +## How to get started with Marmara? + +The basic Komodo software package includes two applications. + +#### komodod + +The komodod software application is the Smart Chain daemon that powers all Komodo blockchains. +#### komodo-cli + +The komodo-cli software application allows a developer to execute API calls to komodod via the command line. + +## MacOS + +Find the directory where ```komodod``` and ```komodo-cli``` are located. Open the command prompt and change to that directory. + +### Using komodo-cli and getinfo + +To see general information about MCL Smart chain, execute the ```getinfo``` command below: + +``` +./komodo-cli -ac_name=MCL getinfo +``` + +When the returned properties of ```blocks``` and ```longestchain``` are equal to each other, the daemon is finished syncing with the network. + +One can interact with the MARMARA blockchain in MacOS by issuing the MARMARA commands as in [Linux OS](https://github.com/marmarachain/marmara/wiki/Getting-Started-with-Marmara#linux). + + +## Windows + +Find the directory where ```komodod.exe``` and ```komodo-cli.exe``` are located. Open the command prompt and change to that directory. + +For instance, given that the respective files are located in Desktop under MCL folder; the command should be like below: +``` +cd Desktop\MCL\ +``` + +### Using komodo-cli and getinfo + +An example is given for ```getinfo``` command below: + +``` +komodo-cli -ac_name=MCL getinfo +``` + +## Linux + +If you have downloaded and build MCL from source then you can run the commands under ```cd komodo/src``` directory. According to your configuration, ```komodod``` and ```komodo-cli``` may be under different directories. Hence, find where they are and change directory accordingly. + +Launch the Marmara Chain with the following parameters: +``` +./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 & +``` +Wait until it connects and synchronizes. You may check if the node synchronized to the chain by executing the following: +``` +./komodo-cli -ac_name=MCL getinfo +``` + +## _Indexing (Optional step for fastening up the process of downloading all the blocks)_** + +Newcomers need to wait for all the blocks to be downloaded to their machine. To fasten up this process, [bootstrap](https://eu.bootstrap.dexstats.info/MCL-bootstrap.tar.gz) may be downloaded and used. + +Stop the Marmara blockchain by executing the following command: +
+ Linux: + +``` +./komodo-cli -ac_name=MCL stop +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL stop +``` +
+ + +To install bootstrap from the command line, execute the following command: +
+ Linux: + +``` +wget https://eu.bootstrap.dexstats.info/MCL-bootstrap.tar.gz +``` +Now, in the following command, tar will extract the bootstrap contents in a specific directory as shown below: + +``` +tar -xvf MCL-bootstrap.tar.gz -C .komodo/MCL +``` +
+ +Now, relaunch the Marmara Chain by using the following command: + +
+ Linux: + +``` +./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 & +``` +
+ +
+ Windows: + +``` +komodod.exe -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 & +``` +
+ +** Using Bootstrap is not a recommended approach to download the blocks since the bootstrap file may be distorted. The recommended approach is to index the blockchain from the start.** + +## Creating A Pubkey and Launching MCL with pubkey + +To use Marmara Credit Loops, a user must have a **pubkey** and launch the chain with a **pubkey**. Otherwise, any mining or staking in the smart chain would be **in vain**. Since all mined or staked coins will also be sent to this address. + +In order to get a pubkey, launch the Marmara Chain with the normal launch parameters and execute the [getnewaddress](https://developers.komodoplatform.com/basic-docs/smart-chains/smart-chain-api/wallet.html#getnewaddress) API command: + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL getnewaddress +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL getnewaddress +``` +
+ +
+ getnewaddress command will in turn return a new address: + +``` +DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 +``` +
+ +Now, execute the [validateaddress](https://developers.komodoplatform.com/basic-docs/smart-chains/smart-chain-api/util.html#validateaddress) command. +
+ Linux: + +``` +./komodo-cli -ac_name=MCL validateaddress DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL validateaddress DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 +``` +
+ +
+ This will return a json object with many properties. In the properties one can see: + +``` +"pubkey": "DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756" +``` +
+ +This will be your MCL pubkey, make sure to note it. You must now indicate it to the daemon. In order do this, first **stop** the daemon using the following command: + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL stop +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL stop +``` +
+ +### Launching MCL with pubkey + +Relaunch your daemon using the required parameters, and make sure to include your pubkey as an additional parameter. For example: + +
+ Linux: + +``` +./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 -gen -genproclimit=1 -pubkey=DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756 & +``` +
+ +
+ Windows: + +``` +komodod.exe -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 -gen -genproclimit=1 -pubkey=DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756 & +``` +
+ + +>```-genproclimit``` sets the number of threads to be used for mining. + +>In the command above, if the parameter ```-genproclimit``` is set to 1 such as ```-gen -genproclimit=1``` launches the Marmara Chain with single (1) CPU. Note that you can set this to any number of cores such as 3. + +>In the command above, if the parameter ```-genproclimit``` is set to -1 such as ```-gen -genproclimit=-1``` launches the Marmara Chain with the whole CPU. + +>In the command above, if the parameter ```-genproclimit``` is set to 0 such as ```-gen -genproclimit=0``` launches the Marmara Chain with Staking mode on and stakes on the Activated coin. + +## dumpprivkey + +The `dumpprivkey` method reveals the private key corresponding to the indicated address. +The command for this is given below for demo purposes. + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL dumpprivkey "PWqwYaWNEVT7V9SdfFHARWnoB7vcpSfdvs" +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL dumpprivkey "PWqwYaWNEVT7V9SdfFHARWnoB7vcpSfdvs" +``` +
+ +The response of the command gives the private address as in the example below: +``` +DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y +``` + +## importprivkey + +The `importprivkey` method adds a private key (as returned by dumpprivkey) to your wallet. The command may take several arguments as described in [here](https://developers.komodoplatform.com/basic-docs/smart-chains/smart-chain-api/wallet.html#importprivkey). +The simplest form of command for this is given below for demo purposes. + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL importprivkey "DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y" +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL importprivkey "DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y" +``` +
+ +The response of the command gives the wallet address as in the demo response below: +``` +R9z796AehK5b6NCPeVkGUHSpJnawerf8oP +``` +Now, the wallet address can be validated through ```validateaddress``` to get the MCL pubkey: + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL validateaddress R9z796AehK5b6NCPeVkGUHSpJnawerf8oP +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL validateaddress R9z796AehK5b6NCPeVkGUHSpJnawerf8oP +``` +
+ +After getting the respective MCL pubkey from the response of the command above, relaunch the Marmara Chain with that pubkey as in [here](https://github.com/marmarachain/marmara/wiki/Getting-Started-with-Marmara#launching-mcl-with-pubkey) . + +## Creating a Wallet Address from One's own Words in Marmara Blockchain + +For Linux OS; as previously explained, one can make use of the command `./komodo-cli -ac_name=MCL getnewaddress` in order to get a wallet address and then use the command `./komodo-cli -ac_name=MCL validateaddress "Rwalletno"` to get the respective Privkey. + +However, the `Privkey` received in this way consists of a hard to remember combination of letters and number. Note that keeping this privkey safe and secure and reachable only by you is very important and essential way to reach your assets. Hence, one can generate a privkey from his/her own set of words and keep a record of these words to generate the respective privkey whenerever needed. + +For this purpose, create a set of 12 seed words that have **no special characters** in them. For instance: `"can create your own keywords and generate privkey from these whenever needed"`. + +Then use the following command to get the respective privkey generated: + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL convertpassphrase "can create your own keywords and generate privkey from these whenever needed" +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL convertpassphrase "can create your own keywords and generate privkey from these whenever needed" +``` +
+ +The command in turn returns the following JSON Object: +``` +{ + "agamapassphrase": "can create your own keywords and generate privkey from these whenever needed", + "address": "RCna416S62uNVAKMwRuFtmRH2X3xJuTidD", + "pubkey": "03a3c416d3bafe44448dcb3a56e5dd13db5cc3e6992051a61a2f5675b4796c0d7a", + "privkey": "9005f5b2593ab3e662e1330ceca848d62fb2021165c6484ac7037cb4efc5317e", + "wif": "UtqWJyhXjJWYigKyKCm5ML96LvSZFDfZrT2HYXAdGs8byZ3uCMzy" +} +``` +Later, one can use `importprivkey` method to add the respective private key to the wallet address: +
+ Linux: + +``` +./komodo-cli -ac_name=MCL importprivkey "UtqWJyhXjJWYigKyKCm5ML96LvSZFDfZrT2HYXAdGs8byZ3uCMzy" +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL importprivkey "UtqWJyhXjJWYigKyKCm5ML96LvSZFDfZrT2HYXAdGs8byZ3uCMzy" +``` +
+ +Now, the owner of the assets needs to keep a record of the keyword combination safely to generate the respective privkey whenever needed. +**Remember that private keys should always be kept secret and so are the keywords!** + +## Taking Backup of Wallet + +Backing up the `wallet.dat` file is very essential as it holds the assets of one. + +### Linux +On a Linux machine, the file could be found in: `~/.komodo/MCL/wallet.dat` + +One method to backup this file is to archive a copy of the file. + +```bash +#Copy the wallet.dat file +cp -av ~/.komodo/MCL/wallet.dat ~/wallet.dat + +#Rename the wallet.dat file +mv ~/wallet.dat ~/2020-08-09-wallet_backup.dat + +# Make an archieve of the wallet.dat file +tar -czvf ~/2020-08-09-wallet_backup.dat.tgz ~/2020-08-09-wallet_backup.dat + +# Move the final file to a secure location +``` + +## Checking the Staking/Mining mode of your node in Marmara Chain + +The following command helps to check the mode of the node: +
+ Linux: + +``` +./komodo-cli -ac_name=MCL getgenerate +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL getgenerate +``` +
+ +Once the command given above is executed, the following JSON object gets returned: +``` +{ + "staking": false, + "generate": true, + "numthreads": 1 +} +``` +From above, it can be seen that the node is in the **mining** node. +>```"staking": false``` means that staking is off. +> ```"generate": true``` means that mining is active. +>```"numthreads": 1``` refers to the number of cores used for mining. In this case, this parameter was set to one earlier. +> +To change mode of the node to **staking**, execute the command below: + +
+ Linux: + +``` + ./komodo-cli -ac_name=MCL setgenerate true 0 +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL setgenerate true 0 +``` +
+ +Now checking the status of the node: + +
+ Linux: + +``` + ./komodo-cli -ac_name=MCL getgenerate +``` +
+
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL getgenerate +``` +
+ +This command returns a JSON object: +``` +{ + "staking": true, + "generate": false, + "numthreads": 0 +} +``` +> Note that ```"staking": true``` _**will not be of use**_ if you have no activated coins! + +## Sending Coins to an Address +One may directly send a payment to a given address by issuing the following command. The payment is made based on the **Normal Amount** available on the respective wallet. +The amount is rounded to the nearest 0.00000001. A transaction fee is deducted for the transaction being made from one's Normal Amount. + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL sendtoaddress "MCL_address" amount +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL sendtoaddress "MCL_address" amount +``` +
+ +> **Note:** This command directly sends payment to the specified address and should be used carefully. As, the payment sent through this method cannot be redeemed later. + + +## Reaching Details about Node and Wallet in Marmara Chain +The following commands are useful for getting details about your node and wallet. +- ```getinfo``` +
+ Linux: + +``` +./komodo-cli -ac_name=MCL getinfo +``` +
+
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL getinfo +``` +
+ +
+ A typical result is given below. Note that the synced status is false: + +``` +{ + "version": 3000300, + "protocolversion": 170009, + "KMDversion": "0.5.3", + "synced": false, + "notarized": 0, + "prevMoMheight": 0, + "notarizedhash": "0000000000000000000000000000000000000000000000000000000000000000", + "notarizedtxid": "0000000000000000000000000000000000000000000000000000000000000000", + "notarizedtxid_height": "mempool", + "KMDnotarized_height": 0, + "notarized_confirms": 0, + "walletversion": 60000, + "balance": 0.00000000, + "blocks": 72200, + "longestchain": 586375, + "tiptime": 1583613252, + "difficulty": 38227.25456170298, + "keypoololdest": 1614160564, + "keypoolsize": 101, + "paytxfee": 0.00000000, + "sapling": 61, + "timeoffset": 0, + "connections": 16, + "proxy": "", + "testnet": false, + "relayfee": 0.00000100, + "errors": "", + "CCid": 2, + "name": "MCL", + "p2pport": 33824, + "rpcport": 33825, + "magic": -1687041972, + "premine": 2000000, + "reward": "3000000000", + "halving": "0", + "decay": "0", + "endsubsidy": "0", + "notarypay": "0", + "staked": 75 +} +``` +
+ +```getinfo``` command returns important details such as the version of MARMARA through ```"version"```; synchronization status of your node through ```synced``` (this parameter's value is true if the parameters "blocks" and "longestchain" are equal ); difficulty of the chain through ```"difficulty"```; number of nearest connected nodes to the chain through ```"connections"```; the pubkey with which you are connected to the chain through ```"pubkey":``` + +- ```getpeerinfo``` command returns detailed information on nearest connected nodes to the chain around your node. + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL getpeerinfo +``` +
+
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL getpeerinfo +``` +
+ +- ```marmarainfo``` + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL marmarainfo 0 0 0 0 pubkey +``` +
+
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL marmarainfo 0 0 0 0 pubkey +``` +
+ +```marmarainfo``` command returns important details such as the normal amount in the pubkey through ```"myPubkeyNormalAmount"```; the activated amount through ```"myActivatedAmount"```; the details of credit loops made through ```"Loops"```; the total amount locked in credit loops through ```"TotalLockedInLoop"```; the number of credit loops closed through ```"numclosed"```; and the details of credit loops closed through ```"closed"```. + +## Activating and Deactivating Coins + +- ```marmaralock``` is used to activate the coins. Active coins are needed for staking and if there are none then even if the staking mode is on, no blocks would be found through staking. The entire command is given below and the **amount** is to be replaced by the amount of coins such as 1000. +
+ Linux: + +``` +./komodo-cli -ac_name=MCL marmaralock amount +``` +
+
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL marmaralock amount +``` +
+ +This command in turn returns a JSON object with the result of the operation and the hex created for it. Note that the _**"hex"**_ given below is for demonstration purposes. +``` +{ + "result": "success", + "hex": "0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000" +} +``` +Now, in order to confirm this transaction, copy the hex returned through the JSON object and validate it through the ```sendrawtrasaction``` command given below: +
+ Linux: + +``` +./komodo-cli -ac_name=MCL sendrawtransaction 0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000 +``` +
+
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL sendrawtransaction 0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000 +``` +
+ +If the above command gets successfully executed in the blockchain, it gives out a transaction id in response. One may check if this transaction is verified by searching the respective id in the [Marmara Explorer site](http://explorer.marmara.io). +To see the activated coins, use ```marmarainfo``` command provided earlier and search for the value across the ```"myActivatedAmount"``` parameter. Note that the raw transactions are collected in the mempool and a few blocks may be needed to found to see the transaction recorded on the block. + + +- ```marmaraunlock``` is used deactivate the coins i.e. turn them into normal amount. Normal Amount is utilized for sending payments directly to an address through```sendtoaddress``` command explained earlier. The **amount** is to be replaced by the amount of coins to be deactivated such as 500. + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL marmaraunlock amount +``` +
+
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL marmaraunlock amount +``` +
+ +In the same way explained earlier, this transaction needs to be validated through the ```sendrawtrasaction``` command given above. For this purpose, copy the hex returned by ```marmaraunlock``` command and use it with ```sendrawtrasaction``` command. + +- ```listaddressgroupings``` is used to list the pairs of wallet addresses and respective normal amounts in them. The usage is given in the command below. +
+ Linux: + +``` +./komodo-cli -ac_name=MCL listaddressgroupings +``` +
+
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL listaddressgroupings +``` +
+ + +## Marmaraamountstat + +This command is used to get all the activated, normal and locked in loop amount of the Marmara blockchain irrespective of the owner.If the begin_height and end_height inputs are set to zero(0), it gets the entire set of data from blocks. + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL marmaraamountstat begin_height end_height +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL marmaraamountstat begin_height end_height +``` +
+ +Example for Linux OS: + +``` +./komodo-cli -ac_name=MCL marmaraamountstat 50000 60000 +``` + +
+ Sample Result: + +``` +{ + "result": "success", + "BeginHeight": 50000, + "EndHeight": 60000, + "TotalNormals": 166854.85464948, + "TotalPayToScriptHash": 0.00000000, + "TotalActivated": 582681.11953150, + "TotalLockedInLoops": 237510.00000000, + "TotalUnknownCC": 0.02820000, + "SpentNormals": 161377.88109325, + "SpentPayToScriptHash": 0.00000000, + "SpentActivated": 382128.12128773, + "SpentLockedInLoops": 143510.00000000, + "SpentUnknownCC": 0.00000000 +} +``` +
+ + +## help + +This command is used to get all the methods related to the Marmara smart chain. + +
+ Linux: + +``` +./komodo-cli -ac_name=MCL help +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL help +``` +
+One can also check out a specific method's parameters by issuing the following command with the method name mentioned: +For example: +
+ Linux: + +``` +./komodo-cli -ac_name=MCL help getinfo +``` +
+ +
+ Windows: + +``` +komodo-cli.exe -ac_name=MCL marmaraamountstat +``` +
+ +# References +--- +For more detailed information on Komodo Antara Framework and its details, please refer to its extended [developer documentation](https://developers.komodoplatform.com/). diff --git a/doc/marmara-build-from-source.md b/doc/marmara-build-from-source.md new file mode 100644 index 00000000000..d4a08265515 --- /dev/null +++ b/doc/marmara-build-from-source.md @@ -0,0 +1,240 @@ +The basic Marmara software package includes two applications. + +#### marmarad + +The marmarad software application is the Smart Chain daemon that powers Marmara blockchain. + +#### marmara-cli + +The marmara-cli software application allows a developer to execute API calls to marmarad via the command line. + +#### Both are Installed Automatically + +Both of these software applications are installed in the ```~/komodo/src/``` directory as a part of any of the following installation procedures. + +## Building Marmara Credit Loops Smart Chain From Source + +One may build Marmara Credit Loops Smart Chain from source. This is not required, however building from source is considered as the best practice in a production environment, since this allows one to instantly update to the latest patches and upgrades. + +### Linux + +#### Requirements + + Linux (easiest with a Debian-based distribution, such as Ubuntu) + For Ubuntu, we recommend using the 16.04 or 18.04 releases + + 64-bit Processor + + Minimum 2 CPUs + + Minimum 4GB of free RAM + +#### Get Started +Verify that your system is up to date. +``` +sudo apt-get update +sudo apt-get upgrade -y +``` + +#### Install the dependency packages + +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 curl bsdmainutils automake cmake clang ntp ntpdate nano -y +``` +This action takes some time, depending on your Internet connection. Let the process run in the background. + +Once completed, follow the steps below to install Marmara Credit Loops smart chain. + +#### Clone the Marmara Credit Loops Repository +``` +cd ~ +git clone https://github.com/marmarachain/marmara --branch master --single-branch +``` +>Skip the following steps and jump to **__Fetch the Zcash Parameters__** step if the system you are using has 8 GB or more RAM. + +#### Changing swap size to 4 GB +Swap is a space on a disk which is used when the amount of physical RAM memory is full. +If the system has 4 GB of RAM, to avoid cases of running out of RAM, swap space needs to be configured. + +>Check if OS already has swap enabled using ``` sudo swapon --show ```. +If swapfile exists and is not configured as at least 4 GB then turn off the swap before configuring it by ```sudo swapoff /swapfile ``` + +Execute the following commands to allocate 4 GB of RAM for the swap space. +``` +sudo fallocate -l 4G /swapfile +sudo chmod 600 /swapfile +sudo mkswap /swapfile +sudo swapon /swapfile +``` +#### Fetch the Zcash Parameters +``` +cd marmara +./zcutil/fetch-params.sh +./zcutil/build.sh -j$(nproc) +``` +**The following steps are optional to follow.** + +##### Setting up Swappiness +Swappiness is the kernel parameter that defines how much (and how often) Linux kernel copies RAM contents to swap. +The following sets up the parameter's value as “10”. Note that the higher the value of the swappiness parameter, the more aggressively Linux's kernel will swap. +``` +sudo sysctl vm.swappiness=10 +``` +>This setting will persist until the next reboot. We can set this value automatically at restart by adding the line to our /etc/sysctl.conf file: +>```sudo nano /etc/sysctl.conf``` vm.swappiness=10 + +#### Enabling UFW +This step is not required for installing MCL but can be used for server security purposes. + +- Check the status of UFW by +``` +sudo ufw status +``` +- UFW package can be installed by executing the following command +``` +sudo apt install ufw +``` +- Activate UFW and allow connections by executing the following commands +``` +echo y | sudo ufw enable +sudo ufw allow ssh +sudo ufw allow "OpenSSH" +sudo ufw allow 33824 +sudo ufw allow out 33824 +``` + +### macOS + +#### Requirements + +- OSX (version > 10.11) +- Minimum 4GB of free RAM (8GB+ recommended) + + +#### Ensure Command Line Tools are Installed + +Issue the following command in a terminal. +``` +xcode-select –-install +``` +#### Ensure brew is Installed + +We use the software brew to install dependencies. If you have the latest version of brew installed already, you may skip this step. +``` +usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew install/master/install)" +``` + +#### Use brew to Install Dependencies + +Execute each command separately +``` +brew update +brew upgrade +brew tap discoteq/discoteq; brew install flock +brew install autoconf autogen automake +brew install gcc@8 +brew install binutils +brew install protobuf +brew install coreutils +brew install wget +``` + +#### Clone the Marmara Credit Loops Repository + +``` +cd ~ +git clone https://github.com/marmarachain/marmara --branch master --single-branch +``` + +#### Fetch the Zcash Parameters +``` +cd marmara +./zcutil/fetch-params.sh +./zcutil/build-mac.sh -j8 +``` + +Having completed these, launch the Marmara Chain by following the instructions in [here](https://github.com/marmarachain/marmara/doc/getting-started-with-marmara. + +### Windows + +The Windows software cannot be directly compiled on a Windows machine. + +Rather, the software must be compiled on a Linux machine (Ubuntu recommended), and the respective output .exe must then be carried to the Windows machine. + +#### Requirements +- Linux machine or Virtual Machine-based installation of Ubuntu Linux +- Linux Requirements in [here](#### Requirements). + +#### Install the dependency packages + +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 +``` +Note: For Ubuntu 20.04, please change the python-zmq library to python3-zmq below. +#### Install Rust + +``` +curl https://sh.rustup.rs -sSf | sh +source $HOME/.cargo/env +rustup target add x86_64-pc-windows-gnu +``` + +#### Configure the compiler to use POSIX thread model + +Execute the following command: +``` +sudo update-alternatives --config x86_64-w64-mingw32-gcc +``` + +After having issued the above command, select the POSIX option as indicated below: + +``` +Selection Path Priority Status +------------------------------------------------------------ + 0 /usr/bin/x86_64-w64-mingw32-gcc-win32 60 auto mode + 1 /usr/bin/x86_64-w64-mingw32-gcc-posix 30 manual mode +* 2 /usr/bin/x86_64-w64-mingw32-gcc-win32 60 manual mode + +Press to keep the current choice[*], or type selection number: 1 +``` + +Issue the following command: + +``` +sudo update-alternatives --config x86_64-w64-mingw32-g++ +``` + +Having executing the above command, select the POSIX option as below: +``` +There are 2 choices for the alternative x86_64-w64-mingw32-g++ (providing /usr/bin/x86_64-w64-mingw32-g++). + + Selection Path Priority Status +------------------------------------------------------------ + 0 /usr/bin/x86_64-w64-mingw32-g++-win32 60 auto mode + 1 /usr/bin/x86_64-w64-mingw32-g++-posix 30 manual mode +* 2 /usr/bin/x86_64-w64-mingw32-g++-win32 60 manual mode + +Press to keep the current choice[*], or type selection number: 1 +``` + +#### Clone the Marmara Repository + +``` +git clone https://github.com/marmarachain/marmara --branch master --single-branch +cd marmara +``` + +#### Fetch the Zcash Parameters + +``` +./zcutil/fetch-params.sh +./zcutil/build-win.sh -j$(nproc) +``` + +Once this step is completed, you will find ```marmarad.exe``` & ```marmara-cli.exe``` files inside the src directory. + +Copy and move these files to the Windows machine. Continue from [here](https://github.com/marmarachain/marmara/doc/marmara-install-from-precompiled-binaries.md) \ No newline at end of file diff --git a/doc/marmara-install-from-precompiled-binaries.md b/doc/marmara-install-from-precompiled-binaries.md new file mode 100644 index 00000000000..fb601fe9fb3 --- /dev/null +++ b/doc/marmara-install-from-precompiled-binaries.md @@ -0,0 +1,166 @@ +## Installing Marmara Credit Loops from Pre-compiled Binaries + +One can download and unzip our pre-compiled binaries. This is the simplest method and hence requires no compiling procedure. + +## Linux + +Verify that your system is up to date. + +``` +sudo apt-get update +sudo apt-get upgrade -y +``` + +#### Install the dependency packages + +``` +sudo apt-get install libgomp1 +``` +#### Downloading Assets from Releases +Go to [Releases](https://github.com/marmarachain/marmara/releases) and download Marmara linux binaries .zip from Assets and follow the instructions given below. + +> Make sure to follow the following instructions on the downloaded directory or any other directory where you moved or copied. + +```sh +sudo apt install unzip +unzip MCL-linux.zip +sudo chmod +x marmarad marmara-cli fetch-params.sh +./fetch-params.sh +``` +#### Start and Run the Marmara Chain + +To start the chain, open the command prompt and execute the following sets of commands: +``` +./marmarad -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 +``` +To stop the chain: +``` +./marmara-cli stop +``` + +#### Backup Your Wallet + +Backing up the `wallet.dat` file is very essential as it holds the assets of one. +On a Linux machine, the file could be found in: `~/.komodo/MCL/wallet.dat` + +One method to backup this file is to archive a copy of the file. + +```bash +#Copy the wallet.dat file +cp -av ~/.komodo/MCL/wallet.dat ~/wallet.dat + +#Rename the wallet.dat file +mv ~/wallet.dat ~/2020-08-09-wallet_backup.dat + +# Make an archieve of the wallet.dat file +tar -czvf ~/2020-08-09-wallet_backup.dat.tgz ~/2020-08-09-wallet_backup.dat + +# Move the final file to a secure location +``` + +### Enabling UFW +This step is not required for installing MCL but can be used for server security purposes. + +- Check the status of UFW by +``` +sudo ufw status +``` +- UFW package can be installed by executing the following command +``` +sudo apt install ufw +``` +- Activate UFW and allow connections by executing the following commands +``` +echo y | sudo ufw enable +sudo ufw allow ssh +sudo ufw allow "OpenSSH" +sudo ufw allow 33824 +sudo ufw allow out 33824 +``` + +## MacOS + +Issue the following command in a terminal to install the command line tools: + +``` +xcode-select –-install +``` + +Download the .zip file from Releases page under Assets [here](https://github.com/marmarachain/marmara/releases/) to your macOS machine and extract the files. Change directory to the location of komodod & komodo-cli on the terminal. + +Run the following command: + +```sh +./fetch-params.sh +``` + +#### Start and Run the Marmara Chain + +To start the chain, open the command prompt and execute the following sets of commands: +``` +./marmarad -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 +``` +To stop the chain: +``` +./marmara-cli stop +``` + +#### Backup Your Wallet + +Backing up your wallet.dat file is **very critical**. One method to backup this file is to archive a copy of the file. + +On MacOS, the wallet.dat file is located here: ```~/Library/Application\ Support/Komodo/wallet.dat``` + + +## Windows + +#### Downloading Files from Releases + +Download the .zip file from Releases page under Assets [here](https://github.com/marmarachain/marmara/releases/) to your Windows computer and extract&place the files (komodod.exe & komodo-cli.exe) in a new folder on the Desktop called ```MCL``` or any other location you prefer (remember the location and use that). + +For this guide, we are using ```MCL``` directory on Desktop. + +#### Create the Directory for the Zcash Parameters +Open the command line prompt and execute the following command: + +``` +mkdir “%HOMEPATH%\AppData\Roaming\ZcashParams” +``` + +Download following files and move them into the newly created directory i.e. MCL. + +- [sprout-proving.key](https://komodoplatform.com/downloads/sprout-proving.key) + +- [sprout-verifying.key](https://z.cash/downloads/sprout-verifying.key) + +- [sapling-spend.params](https://z.cash/downloads/sapling-spend.params) + +- [sapling-output.params](https://z.cash/downloads/sapling-output.params) + +- [sprout-groth16.params](https://z.cash/downloads/sprout-groth16.params) + + +#### Start and Run the Marmara Chain + +To start the chain, open the command prompt and execute the following sets of commands: +``` +cd Desktop\MCL\ +marmarad.exe -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 +``` +To stop the chain: +``` +cd Desktop\MCL\ +marmara-cli.exe stop +``` + +#### Backup Wallet + +Backing up the **wallet.dat** file is **very critical**. One method to backup this file is to create a copy and archive it. + +On Windows machine, the file is located below: +``` +%HOMEPATH%\AppData\Roaming\Komodo\MCL\wallet.dat +``` + +## Making Marmara Credit Loops +Start the chain as with pubkey as instructed in the usage guideline [here](https://github.com/marmarachain/marmara/doc/getting-Started-with-marmara.md) From e07d358c5911b38a2afe2012769ec93154cd1936 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:07:04 +0300 Subject: [PATCH 14/23] Update getting-started-with-marmara.md updates for marmarad and marmara-cli --- doc/getting-started-with-marmara.md | 138 ++++++++++++++-------------- 1 file changed, 70 insertions(+), 68 deletions(-) diff --git a/doc/getting-started-with-marmara.md b/doc/getting-started-with-marmara.md index 780813c27f8..c5dbc0bd7c8 100644 --- a/doc/getting-started-with-marmara.md +++ b/doc/getting-started-with-marmara.md @@ -1,59 +1,60 @@ ## How to get started with Marmara? -The basic Komodo software package includes two applications. +The basic Marmara software package includes two applications. -#### komodod +#### marmarad -The komodod software application is the Smart Chain daemon that powers all Komodo blockchains. -#### komodo-cli +The marmarad software application is the Smart Chain daemon that powers the Marmara blockchain. -The komodo-cli software application allows a developer to execute API calls to komodod via the command line. +#### marmara-cli + +The marmara-cli software application allows a developer to execute API calls to marmarad via the command line. ## MacOS -Find the directory where ```komodod``` and ```komodo-cli``` are located. Open the command prompt and change to that directory. +Find the directory where ```marmarad``` and ```marmara-cli``` are located. Open the command prompt and change to that directory. -### Using komodo-cli and getinfo +### Using marmara-cli and getinfo To see general information about MCL Smart chain, execute the ```getinfo``` command below: ``` -./komodo-cli -ac_name=MCL getinfo +./marmara-cli getinfo ``` When the returned properties of ```blocks``` and ```longestchain``` are equal to each other, the daemon is finished syncing with the network. -One can interact with the MARMARA blockchain in MacOS by issuing the MARMARA commands as in [Linux OS](https://github.com/marmarachain/marmara/wiki/Getting-Started-with-Marmara#linux). +One can interact with the MARMARA blockchain in MacOS by issuing the MARMARA commands as in [Linux OS](https://github.com/marmarachain/marmara/doc/getting-started-with-marmara#linux). ## Windows -Find the directory where ```komodod.exe``` and ```komodo-cli.exe``` are located. Open the command prompt and change to that directory. +Find the directory where ```marmarad.exe``` and ```marmara-cli.exe``` are located. Open the command prompt and change to that directory. For instance, given that the respective files are located in Desktop under MCL folder; the command should be like below: ``` cd Desktop\MCL\ ``` -### Using komodo-cli and getinfo +### Using marmara-cli and getinfo An example is given for ```getinfo``` command below: ``` -komodo-cli -ac_name=MCL getinfo +marmara-cli getinfo ``` ## Linux -If you have downloaded and build MCL from source then you can run the commands under ```cd komodo/src``` directory. According to your configuration, ```komodod``` and ```komodo-cli``` may be under different directories. Hence, find where they are and change directory accordingly. +If you have downloaded and build MCL from source then you can run the commands under ```cd komodo/src``` directory. According to your configuration, ```marmarad``` and ```marmara-cli``` may be under different directories. Hence, find where they are and change directory accordingly. Launch the Marmara Chain with the following parameters: ``` -./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 & +./marmarad -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 & ``` Wait until it connects and synchronizes. You may check if the node synchronized to the chain by executing the following: ``` -./komodo-cli -ac_name=MCL getinfo +./marmara-cli getinfo ``` ## _Indexing (Optional step for fastening up the process of downloading all the blocks)_** @@ -65,7 +66,7 @@ Stop the Marmara blockchain by executing the following command: Linux: ``` -./komodo-cli -ac_name=MCL stop +./marmara-cli stop ``` @@ -73,7 +74,7 @@ Stop the Marmara blockchain by executing the following command: Windows: ``` -komodo-cli.exe -ac_name=MCL stop +marmara-cli.exe stop ``` @@ -98,7 +99,7 @@ Now, relaunch the Marmara Chain by using the following command: Linux: ``` -./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 & +./marmarad -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 & ``` @@ -106,7 +107,7 @@ Now, relaunch the Marmara Chain by using the following command: Windows: ``` -komodod.exe -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 & +marmarad.exe -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 & ``` @@ -122,7 +123,7 @@ In order to get a pubkey, launch the Marmara Chain with the normal launch parame Linux: ``` -./komodo-cli -ac_name=MCL getnewaddress +./marmara-cli getnewaddress ``` @@ -130,7 +131,7 @@ In order to get a pubkey, launch the Marmara Chain with the normal launch parame Windows: ``` -komodo-cli.exe -ac_name=MCL getnewaddress +marmara-cli.exe getnewaddress ``` @@ -147,7 +148,7 @@ Now, execute the [validateaddress](https://developers.komodoplatform.com/basic-d Linux: ``` -./komodo-cli -ac_name=MCL validateaddress DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 +./marmara-cli validateaddress DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 ``` @@ -155,7 +156,7 @@ Now, execute the [validateaddress](https://developers.komodoplatform.com/basic-d Windows: ``` -komodo-cli.exe -ac_name=MCL validateaddress DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 +marmara-cli.exe validateaddress DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 ``` @@ -173,7 +174,7 @@ This will be your MCL pubkey, make sure to note it. You must now indicate it to Linux: ``` -./komodo-cli -ac_name=MCL stop +./marmara-cli stop ``` @@ -181,7 +182,7 @@ This will be your MCL pubkey, make sure to note it. You must now indicate it to Windows: ``` -komodo-cli.exe -ac_name=MCL stop +marmara-cli.exe stop ``` @@ -193,7 +194,7 @@ Relaunch your daemon using the required parameters, and make sure to include you Linux: ``` -./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 -gen -genproclimit=1 -pubkey=DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756 & +./marmarad -pubkey=DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756 & ``` @@ -201,7 +202,7 @@ Relaunch your daemon using the required parameters, and make sure to include you Windows: ``` -komodod.exe -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 -gen -genproclimit=1 -pubkey=DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756 & +marmarad.exe -pubkey=DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756 & ``` @@ -223,7 +224,7 @@ The command for this is given below for demo purposes. Linux: ``` -./komodo-cli -ac_name=MCL dumpprivkey "PWqwYaWNEVT7V9SdfFHARWnoB7vcpSfdvs" +./marmara-cli dumpprivkey "PWqwYaWNEVT7V9SdfFHARWnoB7vcpSfdvs" ``` @@ -231,7 +232,7 @@ The command for this is given below for demo purposes. Windows: ``` -komodo-cli.exe -ac_name=MCL dumpprivkey "PWqwYaWNEVT7V9SdfFHARWnoB7vcpSfdvs" +marmara-cli.exe dumpprivkey "PWqwYaWNEVT7V9SdfFHARWnoB7vcpSfdvs" ``` @@ -249,7 +250,7 @@ The simplest form of command for this is given below for demo purposes. Linux: ``` -./komodo-cli -ac_name=MCL importprivkey "DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y" +./marmara-cli importprivkey "DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y" ``` @@ -257,7 +258,7 @@ The simplest form of command for this is given below for demo purposes. Windows: ``` -komodo-cli.exe -ac_name=MCL importprivkey "DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y" +marmara-cli.exe importprivkey "DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y" ``` @@ -271,7 +272,7 @@ Now, the wallet address can be validated through ```validateaddress``` to get th Linux: ``` -./komodo-cli -ac_name=MCL validateaddress R9z796AehK5b6NCPeVkGUHSpJnawerf8oP +./marmara-cli validateaddress R9z796AehK5b6NCPeVkGUHSpJnawerf8oP ``` @@ -279,15 +280,15 @@ Now, the wallet address can be validated through ```validateaddress``` to get th Windows: ``` -komodo-cli.exe -ac_name=MCL validateaddress R9z796AehK5b6NCPeVkGUHSpJnawerf8oP +marmara-cli.exe validateaddress R9z796AehK5b6NCPeVkGUHSpJnawerf8oP ``` -After getting the respective MCL pubkey from the response of the command above, relaunch the Marmara Chain with that pubkey as in [here](https://github.com/marmarachain/marmara/wiki/Getting-Started-with-Marmara#launching-mcl-with-pubkey) . +After getting the respective MCL pubkey from the response of the command above, relaunch the Marmara Chain with that pubkey as in [here](https://github.com/marmarachain/marmara/doc/getting-started-with-marmara#launching-mcl-with-pubkey) . ## Creating a Wallet Address from One's own Words in Marmara Blockchain -For Linux OS; as previously explained, one can make use of the command `./komodo-cli -ac_name=MCL getnewaddress` in order to get a wallet address and then use the command `./komodo-cli -ac_name=MCL validateaddress "Rwalletno"` to get the respective Privkey. +For Linux OS; as previously explained, one can make use of the command `./marmara-cli getnewaddress` in order to get a wallet address and then use the command `./marmara-cli -validateaddress "Rwalletno"` to get the respective Privkey. However, the `Privkey` received in this way consists of a hard to remember combination of letters and number. Note that keeping this privkey safe and secure and reachable only by you is very important and essential way to reach your assets. Hence, one can generate a privkey from his/her own set of words and keep a record of these words to generate the respective privkey whenerever needed. @@ -299,7 +300,7 @@ Then use the following command to get the respective privkey generated: Linux: ``` -./komodo-cli -ac_name=MCL convertpassphrase "can create your own keywords and generate privkey from these whenever needed" +./marmara-cli convertpassphrase "can create your own keywords and generate privkey from these whenever needed" ``` @@ -307,7 +308,7 @@ Then use the following command to get the respective privkey generated: Windows: ``` -komodo-cli.exe -ac_name=MCL convertpassphrase "can create your own keywords and generate privkey from these whenever needed" +marmara-cli.exe convertpassphrase "can create your own keywords and generate privkey from these whenever needed" ``` @@ -326,7 +327,7 @@ Later, one can use `importprivkey` method to add the respective private key to t Linux: ``` -./komodo-cli -ac_name=MCL importprivkey "UtqWJyhXjJWYigKyKCm5ML96LvSZFDfZrT2HYXAdGs8byZ3uCMzy" +./marmara-cli importprivkey "UtqWJyhXjJWYigKyKCm5ML96LvSZFDfZrT2HYXAdGs8byZ3uCMzy" ``` @@ -334,7 +335,7 @@ Later, one can use `importprivkey` method to add the respective private key to t Windows: ``` -komodo-cli.exe -ac_name=MCL importprivkey "UtqWJyhXjJWYigKyKCm5ML96LvSZFDfZrT2HYXAdGs8byZ3uCMzy" +marmara-cli.exe importprivkey "UtqWJyhXjJWYigKyKCm5ML96LvSZFDfZrT2HYXAdGs8byZ3uCMzy" ``` @@ -370,7 +371,7 @@ The following command helps to check the mode of the node: Linux: ``` -./komodo-cli -ac_name=MCL getgenerate +./marmara-cli getgenerate ``` @@ -378,7 +379,7 @@ The following command helps to check the mode of the node: Windows: ``` -komodo-cli.exe -ac_name=MCL getgenerate +marmara-cli.exe getgenerate ``` @@ -401,7 +402,7 @@ To change mode of the node to **staking**, execute the command below: Linux: ``` - ./komodo-cli -ac_name=MCL setgenerate true 0 + ./marmara-cli setgenerate true 0 ``` @@ -409,7 +410,7 @@ To change mode of the node to **staking**, execute the command below: Windows: ``` -komodo-cli.exe -ac_name=MCL setgenerate true 0 +marmara-cli.exe setgenerate true 0 ``` @@ -419,14 +420,14 @@ Now checking the status of the node: Linux: ``` - ./komodo-cli -ac_name=MCL getgenerate + ./marmara-cli getgenerate ```
Windows: ``` -komodo-cli.exe -ac_name=MCL getgenerate +marmara-cli.exe getgenerate ```
@@ -448,7 +449,7 @@ The amount is rounded to the nearest 0.00000001. A transaction fee is deducted f Linux: ``` -./komodo-cli -ac_name=MCL sendtoaddress "MCL_address" amount +./marmara-cli sendtoaddress "MCL_address" amount ``` @@ -456,7 +457,7 @@ The amount is rounded to the nearest 0.00000001. A transaction fee is deducted f Windows: ``` -komodo-cli.exe -ac_name=MCL sendtoaddress "MCL_address" amount +marmara-cli.exe sendtoaddress "MCL_address" amount ``` @@ -470,14 +471,14 @@ The following commands are useful for getting details about your node and wallet Linux: ``` -./komodo-cli -ac_name=MCL getinfo +./marmara-cli getinfo ```
Windows: ``` -komodo-cli.exe -ac_name=MCL getinfo +marmara-cli.exe getinfo ```
@@ -537,14 +538,14 @@ komodo-cli.exe -ac_name=MCL getinfo Linux: ``` -./komodo-cli -ac_name=MCL getpeerinfo +./marmara-cli getpeerinfo ```
Windows: ``` -komodo-cli.exe -ac_name=MCL getpeerinfo +marmara-cli.exe getpeerinfo ```
@@ -554,14 +555,14 @@ komodo-cli.exe -ac_name=MCL getpeerinfo Linux: ``` -./komodo-cli -ac_name=MCL marmarainfo 0 0 0 0 pubkey +./marmara-cli marmarainfo 0 0 0 0 pubkey ```
Windows: ``` -komodo-cli.exe -ac_name=MCL marmarainfo 0 0 0 0 pubkey +marmara-cli.exe marmarainfo 0 0 0 0 pubkey ```
@@ -574,14 +575,14 @@ komodo-cli.exe -ac_name=MCL marmarainfo 0 0 0 0 pubkey Linux: ``` -./komodo-cli -ac_name=MCL marmaralock amount +./marmara-cli marmaralock amount ```
Windows: ``` -komodo-cli.exe -ac_name=MCL marmaralock amount +marmara-cli.exe marmaralock amount ```
@@ -597,18 +598,19 @@ Now, in order to confirm this transaction, copy the hex returned through the JSO Linux: ``` -./komodo-cli -ac_name=MCL sendrawtransaction 0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000 +./marmara-cli sendrawtransaction 0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000 ```
Windows: ``` -komodo-cli.exe -ac_name=MCL sendrawtransaction 0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000 +marmara-cli.exe sendrawtransaction 0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000 ```
If the above command gets successfully executed in the blockchain, it gives out a transaction id in response. One may check if this transaction is verified by searching the respective id in the [Marmara Explorer site](http://explorer.marmara.io). + To see the activated coins, use ```marmarainfo``` command provided earlier and search for the value across the ```"myActivatedAmount"``` parameter. Note that the raw transactions are collected in the mempool and a few blocks may be needed to found to see the transaction recorded on the block. @@ -618,14 +620,14 @@ To see the activated coins, use ```marmarainfo``` command provided earlier and s Linux: ``` -./komodo-cli -ac_name=MCL marmaraunlock amount +./marmara-cli marmaraunlock amount ```
Windows: ``` -komodo-cli.exe -ac_name=MCL marmaraunlock amount +marmara-cli.exe marmaraunlock amount ```
@@ -636,14 +638,14 @@ In the same way explained earlier, this transaction needs to be validated throug Linux: ``` -./komodo-cli -ac_name=MCL listaddressgroupings +./marmara-cli listaddressgroupings ```
Windows: ``` -komodo-cli.exe -ac_name=MCL listaddressgroupings +marmara-cli.exe listaddressgroupings ```
@@ -656,7 +658,7 @@ This command is used to get all the activated, normal and locked in loop amount Linux: ``` -./komodo-cli -ac_name=MCL marmaraamountstat begin_height end_height +./marmara-cli marmaraamountstat begin_height end_height ``` @@ -664,14 +666,14 @@ This command is used to get all the activated, normal and locked in loop amount Windows: ``` -komodo-cli.exe -ac_name=MCL marmaraamountstat begin_height end_height +marmara-cli.exe marmaraamountstat begin_height end_height ``` Example for Linux OS: ``` -./komodo-cli -ac_name=MCL marmaraamountstat 50000 60000 +./marmara-cli marmaraamountstat 50000 60000 ```
@@ -705,7 +707,7 @@ This command is used to get all the methods related to the Marmara smart chain. Linux: ``` -./komodo-cli -ac_name=MCL help +./marmara-cli help ```
@@ -713,7 +715,7 @@ This command is used to get all the methods related to the Marmara smart chain. Windows: ``` -komodo-cli.exe -ac_name=MCL help +marmara-cli.exe help ``` One can also check out a specific method's parameters by issuing the following command with the method name mentioned: @@ -722,7 +724,7 @@ For example: Linux: ``` -./komodo-cli -ac_name=MCL help getinfo +./marmara-cli help getinfo ``` @@ -730,7 +732,7 @@ For example: Windows: ``` -komodo-cli.exe -ac_name=MCL marmaraamountstat +marmara-cli.exe marmaraamountstat ``` From cf0f4ae22028b34d5f83e80fec7c3af0052de531 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:12:10 +0300 Subject: [PATCH 15/23] Update marmara-build-from-source.md --- doc/marmara-build-from-source.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/marmara-build-from-source.md b/doc/marmara-build-from-source.md index d4a08265515..52400b019f3 100644 --- a/doc/marmara-build-from-source.md +++ b/doc/marmara-build-from-source.md @@ -155,7 +155,7 @@ cd marmara ./zcutil/build-mac.sh -j8 ``` -Having completed these, launch the Marmara Chain by following the instructions in [here](https://github.com/marmarachain/marmara/doc/getting-started-with-marmara. +Having completed these, launch the Marmara Chain by following the instructions in [here](https://github.com/marmarachain/marmara/doc/getting-started-with-marmara.md). ### Windows @@ -237,4 +237,4 @@ cd marmara Once this step is completed, you will find ```marmarad.exe``` & ```marmara-cli.exe``` files inside the src directory. -Copy and move these files to the Windows machine. Continue from [here](https://github.com/marmarachain/marmara/doc/marmara-install-from-precompiled-binaries.md) \ No newline at end of file +Copy and move these files to the Windows machine. Continue from [here](https://github.com/marmarachain/marmara/doc/marmara-install-from-precompiled-binaries.md) From 34c10a32cc743994a3dddce7ffa88c1d9427d0dd Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:15:03 +0300 Subject: [PATCH 16/23] Update README.md update links --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index b5cb096a576..778735801f0 100644 --- a/doc/README.md +++ b/doc/README.md @@ -34,7 +34,7 @@ More details are available under http://marmara.io/ - To build Marmara from source, follow the [Marmara Credit Loops Build Instructions](https://github.com/marmarachain/marmara/doc/marmara-build-from-source.md). - To install Marmara from pre-compiled binaries, follow the [Marmara Credit Loops Install Instructions](https://github.com/marmarachain/marmara/doc/marmara-install-from-precompied-binaries.md). -- 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/doc/getting-started-with-marmara.md) guide. +- To get started with Marmara Credit Loops, follow the [Making Marmara Credit Loops](https://github.com/marmarachain/marmara/doc/getting-started-with-marmara.md) guide. ## Marmara Evolvement ### Marmara v.1.0.1 Hardfork Change log From 89b1d80707c00c34b9b3fa6988ad64e8131e6913 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:28:57 +0300 Subject: [PATCH 17/23] [REF] moved Turkish instructions and guidelines to wiki page --- "TR/MCL_Kullan\304\261m_Klavuzu.md" | 428 ------------------ TR/MCL_Kurulum_Klavuzu.md | 169 ------- "TR/Marmara_Kredi_D\303\266ng\303\274leri.md" | 36 -- 3 files changed, 633 deletions(-) delete mode 100644 "TR/MCL_Kullan\304\261m_Klavuzu.md" delete mode 100644 TR/MCL_Kurulum_Klavuzu.md delete mode 100644 "TR/Marmara_Kredi_D\303\266ng\303\274leri.md" diff --git "a/TR/MCL_Kullan\304\261m_Klavuzu.md" "b/TR/MCL_Kullan\304\261m_Klavuzu.md" deleted file mode 100644 index 1834b09bc26..00000000000 --- "a/TR/MCL_Kullan\304\261m_Klavuzu.md" +++ /dev/null @@ -1,428 +0,0 @@ -![MarmaraCreditLoops Logo](https://raw.githubusercontent.com/marmarachain/marmara/master/MCL-Logo.png "Marmara Credit Loops Logo") - -# Marmara v.1.0.1 Kullanım Kılavuzu - -## Linux İşletim Sistemi -## Başlangıç - -Marmara Kredi Döngüleri yazılımı kaynağından indirilip yüklendiyse bu durumda komutlar ```cd komodo/src``` klasöründen çalıştırılmalıdır. Kurulum konfigürasyonuna göre ```komodod``` ve ```komodo-cli``` klasörleri farklı dizilimde yer alabilir, bu sebeple bu klasörler bulunup dizin buna göre değiştirilmelidir. - -Marmara zincirini asağıdaki parametrelerle başlatınız: - -``` -./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 & -``` -Bağlanıp senkronize olana kadar bekleyiniz. Aşağıdaki komutu kullanarak düğümünüzün zincire bağlanıp bağlanmadığını kontrol edebilirsiniz: - -``` -./komodo-cli -ac_name=MCL getinfo -``` - -**_İndeksleme: Blokları Çekme_** - -Yeni başlayanlar için bütün blokların çekilmesi düğüme çekilmesi ve zincir ile senkronize olma işlemi çok uzun vakit alabilir. Bu durumda, bu süreci hızlandırmak için [bootstrap](https://eu.bootstrap.dexstats.info/MCL-bootstrap.tar.gz) indirilip bu kullanılabilir. - -Bunun için öncelikle aşağıdaki komut ile Marmara Zinciri durdurulur: -``` -./komodo-cli -ac_name=MCL stop -``` -Komut satırından bootstrap yazılımını indirmek için aşağıdaki komut kullanılabilir: -``` -wget https://eu.bootstrap.dexstats.info/MCL-bootstrap.tar.gz -``` -Aşağıdaki komut ile bootstrap içerikleri aşağıda verilen dosya dizimi içine çıkarılır: - -``` -tar -xvf MCL-bootstrap.tar.gz -C .komodo/MCL -``` -Aşağıdaki komut ile Marmara Zinciri tekrardan başlatılır: -``` -./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 & -``` - -## Pubkey Oluşturma ve Marmara Zincirini Pubkey ile Başlatma - -Marmara Kredi DÖngülerini kullanabilmek için kullanıcının bir **pubkey'e** sahip olması ve zinciri bu **pubkey** ile başlatması beklenmektedir. -Madencilik ile veya staking ile kazanılan koinlerin bir hesaba gitmesi için pubkey almak bir şarttır, zincir pubkey ile başlatılmadığı takdirde yapılan **madencilik veya staking** eylemleri boşa gidecektir. - -Pubkey oluşturmak için Marmara Zinciri önceden yukarıda verilen komut ile başlatılır ve aşağıdaki [getnewaddress](https://developers.komodoplatform.com/basic-docs/smart-chains/smart-chain-api/wallet.html#getnewaddress) API komutu ile yeni adres oluşturulur: -``` -./komodo-cli -ac_name=MCL getnewaddress -``` -Bu komut aşağıdaki örnekte olduğu gibi bir adres döndürmektedir: -``` -DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 -``` -Sonrasında aşağıdaki [validateaddress](https://developers.komodoplatform.com/basic-docs/smart-chains/smart-chain-api/util.html#validateaddress) komutu çalıştırılır: -``` -./komodo-cli -ac_name=MCL validateaddress DO_NOT_USE_THIS_ADDRESSgg5jonaes1J5L786 -``` -Yukarıdaki komut sonucunda birden fazla nesnenin barındırıldığı JSON nesne döndürecek olup, pubkey bunlardan birisidir: -``` -"pubkey": "DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756" -``` - -Komut sonucunda döndürülen kullanıcının MCL pubkey'idir ve sonrasında zincire bu pubkey ile bağlanmak üzere kullanıcı tarafından bu pubkey not edilmelidir. - -Bunun için öncelikle zincir aşağıdaki komut ile durdurulur: -``` -./komodo-cli -ac_name=MCL stop -``` -Sonrasında başlatma parametrelerinin sonuna aşağıdaki örnekte gösterildiği üzere kullanıcının MCL pubkey'i eklenerek Marmara blokzinciri tekrardan başlatılır: -``` -./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 -gen -genproclimit=1 -pubkey=DO_NOT_USE_THIS_ADDRESS019n79b0921a1be6d3ca6f9e8a050mar17eb845fe46b9d756 & -``` -> Yukarıdaki komut içerisinde yer alan ```-genproclimit``` madencilikte kullanılacak olan thread sayısını belirlemektedir. - ->Eğer ```-genproclimit``` 1'e eşitlendiyse; ```-gen -genproclimit=1```, Marmara blokzinciri tek bir işlemci ile başlatılır. Makinanın çekirdek sayısına bağlı olarak ```-genproclimit``` parametresine 1'den farklı işlemci sayısı da atanabilir. - ->Eğer ```-genproclimit``` -1'e eşitlendiyse; ```-gen -genproclimit=-1```, Marmara blokzinciri bütün işlemci gücünü kullanacak şekilde başlatılır. - ->Eğer ```-genproclimit``` 0'a eşitlendiyse; ```-gen -genproclimit=0```, Marmara blokzinciri staking modu ile başlatılmış olup aktif olan koinler üzerinden staking yapılmaya başlanır. - -## dumpprivkey - -`dumpprivkey` metodu verilen adresin private anahtarını göstermeye yarayan bir komuttur. - -Örnek olması amacıyla bu metodun kullanımı aşağıdaki komutta gösterilemektedir. - -``` -./komodo-cli -ac_name=MCL dumpprivkey "PWqwYaWNEVT7V9SdfFHARWnoB7vcpSfdvs" -``` -Komut örnekle aşağıdaki örnek private adresi döndürmektedir: -``` -DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y -``` - -## importprivkey - -`importprivkey` metodu `dumpprivkey` metodu tarafından döndürülen private adresin cüzdan adresine eklenmesini sağlamaktadır. Bu komut [burada](https://developers.komodoplatform.com/basic-docs/smart-chains/smart-chain-api/wallet.html#importprivkey) gösterildiği üzere birden fazla argümanla çalıştırılabilir. - -Komutun en basit hali aşağıda örnekle verilmektedir: -``` -./komodo-cli -ac_name=MCL importprivkey "DONOTUSETHISxxxxxxxxxxxxxxxxx7KkCmRnnSg7iXvRUqhYoxC9Y" -``` -Bahsi geçen komut örnek olarak aşağıdaki cüzdan adresini döndürmektedir: -``` -R9z796AehK5b6NCPeVkGUHSpJnawerf8oP -``` -Yukarıda döndürülen cüzdan adresini aşağıda verilen ```validateaddress``` ile doğrulayarak MCL pubkey adresine erişim sağlanabilir: -``` -./komodo-cli -ac_name=MCL validateaddress R9z796AehK5b6NCPeVkGUHSpJnawerf8oP -``` -Bu yöntem ile alınan MCL pubkey adresi ile Marmara blokzinciri başlatılabilir. - -## Marmara Chain üzerinde Kendi Anahtar Kelimelerinizle Cüzdan Oluşturma -Marmara zincirinde `./komodo-cli -ac_name=MCL getnewaddress` dedikten sonra cüzdan numarasını `./komodo-cli -ac_name=MCL validateaddress "RcuzdanNo"` ifadesiyle çağırdığınızda bunun sonucunda bir Privkey verilecektir. - -Verilen `Privkey` karmaşık olduğundan kullanıcı tarafından unutulma riski taşır. Buna karşın, kendi verdiğiniz anahtar kelimelerden unutmayacağınız bir Privkey üretmek mümkündür. - -Bunun için öncelikle kendinize bir anahtar kelime seti oluşturun. Anahtar kelime seti içinde **özel karakter kullanmayınız**. Örnekle şöyle olsun: `"kendi sectiginiz kelimelerden olusan bir anahtar cumle yapabilirsiniz ve kendi privkeyinizi uretebilirsiniz"`. - -Aşağıdaki komutu kullanabilirsiniz: -``` -./komodo-cli -ac_name=MCL convertpassphrase "kendi sectiginiz kelimelerden olusan bir anahtar cumle yapabilirsiniz ve kendi privkeyinizi uretebilirsiniz" -``` -Komut tarafından aşağıdaki sonuç dondürülür: -``` -{ - "agamapassphrase": "kendi sectiginiz kelimelerden olusan bir anahtar cumle yapabilirsiniz ve kendi privkeyinizi uretebilirsiniz", - "address": "RB8v8b9yt9U6YSuznLieSU8ULCnT77YM8f", - "pubkey": "02b8aa5cb5ff919b773656b0701f8448bb226b62e966c8439dd90183c8c3efdc24", - "privkey": "d83991e517c0d73846171c205ece9d66e548c1faa21ed8efbb9b6ffe4595446a", - "wif": "UwFrdzVQ7iaLpzsyb2JWmPTV2JZAapkXFyDWtMEB8a6fv1nnoFmk" -} -``` -Daha sonrasında `importprivkey` metodu kullanılarak yukarıda döndürülen private adresin cüzdan adresine eklenmesi sağlanmalıdır: - -``` -./komodo-cli -ac_name=MCL importprivkey "UwFrdzVQ7iaLpzsyb2JWmPTV2JZAapkXFyDWtMEB8a6fv1nnoFmk" -``` - -Bu durumda privkey'i hatırlamak yerine artık kendi anahtar kelimelerinizi kullanarak istenilen zaman privkeyi üretebilirsiniz. -**Burada dikkat edilmesi gereken nokta privkey adresinin her zaman için saklı tutulması gerektiği olup aynı şekilde anahtar kelimeler de kimse ile paylaşılmamalıdır!** - -## Marmara Blokzincirini Madencilik veya Staking Modunda Çalıştırma - -Aşağıdaki komut ile makinenizda kurulu olan Marmara zincirinin çalışma modu kontrol edilebilmektedir: - -``` -./komodo-cli -ac_name=MCL getgenerate -``` -Yukarıdaki komut çalıştırıldığında, aşağıdaki örnekteki gibi JSON tipinde nesne döndürülür: -``` -{ - "staking": false, - "generate": true, - "numthreads": 1 -} -``` -Yukarıdaki çıktıdan görüldüğü üzere, ilgili nod madencilik modunda çalışmaktadır. ->```"staking": false``` staking modunun kapalı olduğunu belirtir. -> ```"generate": false``` madencilik modunun açık olduğunu belirtir. ->```"numthreads": 1``` madencilik sırasında kullanılan thread'lerin sayısını vermektedir. (Önceden -gen -genproclimit=1 komutu ile 1 olarak belirlendiği için) -> -İlgili nodun modunu **staking** olarak aktif etmek için aşağıdaki komut kullanılmaktadır: -``` - ./komodo-cli -ac_name=MCL setgenerate true 0 -``` -Nodun çalışma modunu tekrardan kontrol etmek için aşağıdaki komut komut satırına yazıldığında: -``` - ./komodo-cli -ac_name=MCL getgenerate -``` -**Staking** modunun aktif olduğu aşağıdaki döndürülen sonuç ile gözlemlenir: -``` -{ - "staking": true, - "generate": false, - "numthreads": 0 -} -``` -> Dikkat edilmesi gerek nokta koinlerinizi aktif hale getirmediyseniz; ```"staking": true``` ile _**staking modu aktif olsa dahi staking yapılamaz!**_ - -## Adrese Koin Gönderme İşlemi -Aşağıdaki komut ile **normal koinlerinizden (NormalCoin)** dilediğiniz bir adrese direk olarak ödeme yapabilirsiniz. Ödeme miktarı en yakın 0.00000001 sayısına yuvarlanmaktadır. Buna ek olarak bu yöntem ile gönderim yapıldığında hesabınızdan gönderim ücreti kesimi yapılır. - -``` -./komodo-cli -ac_name=MCL sendtoaddress "MCL_address" amount -``` -> **Önemli Not:** Bu komut kullanıcı tarafından belirtilen adrese direk olarak ödeme yapılmasını sağlamakta olup, bu ödeme sonrasında geri çekilemez. - - -## Marmara Zinciri ve Cüzdan Bilgilerine Erişim için Önemli Komutlar -Aşağıda yer alan komutlar zincire bağlanan cüzdanınınız ve zincirle ilgili önemli ayrıntılara erişim için kullanılmaktadır. - -- ```getinfo``` -``` -./komodo-cli -ac_name=MCL getinfo -``` - -```getinfo``` komutu Marmara Zinciri ile ilgili önemli bilgileri göstermektedir. Döndürülen parametrelerden ```"version"``` MARMARA'nın versiyonunu, ```synced``` zincire bağlanan makinenin senkronizasyon durumunu (Senkronizasyonun sağlandığı bilgisi "blocks" ve "longestchain" parametrelerinin değerlerinin eşit olmasından anlaşılmaktadır), ```"difficulty"``` ile zincirin zorluk değeri, ```"connections"``` parametresi ile zincire bağlı olan makinenize en yakın zincirdeki diğer nodların sayısını, ```"pubkey":``` ile zincire bağlı olan pubkey gösterilmektedir. - -- ```getpeerinfo``` -``` -./komodo-cli -ac_name=MCL getpeerinfo -``` -```getpeerinfo``` komutu, Marmara Zincirine bağlı olan makinenize en yakın zincire bağlı nodların detay bilgilerini gösterir. -- ```marmarainfo``` -``` -./komodo-cli -ac_name=MCL marmarainfo 0 0 0 0 PubkeyAdresiniz -``` -```marmarainfo``` komutu ayrıntılı cüzdan incelemede kullanılmakta olup, ```"myPubkeyNormalAmount"``` parametresi cüzdanınızda bulunan normal MARMARA miktarını; ```"myActivatedAmount"``` parametresi aktif MARMARA koin miktarını; ```"Loops"``` parametresi gerçekleştirilen kredi döngülerini; ```"TotalLockedInLoop"``` parametresi kredi döngülerinde kilitlenen toplam MARMARA koin miktarını; ```"numclosed"``` parametresi toplamda kapatılan kredi döngüsü sayısını; ve ```"closed"``` parametresi kapatılan kredi döngülerinin detaylarını vermektedir. - -## Koinleri Aktifleştirme(Kilitleme) veya Kilit Açma İşlemleri - -- ```marmaralock``` komutu ile normal koinler aktif/kilitli hale getirilir. Kilitleme/AKtifleştirme işlemi staking veya kredi döngüsü yapabilmek için gerekli bir işlem olup, cüzdanınızda kilitli koin olmadığı takdirde staking modu açık olsa dahi herhangi bir kazanç elde edilemez. Staking modunda blok bulabilmek için kilitli hesabınızda bir miktar koin olması gerekir. İlgili kilitleme komutu aşağıda verilmiş olup, burada yer alan **miktar** alanına kilitlenecek koin yazılmalıdır. -``` -./komodo-cli -ac_name=MCL marmaralock miktar -``` -Bu komut işlemin sonucunu gösteren bir JSON nesnesi döndürmekte olup, işlemin sonucunda bir hex kodu oluşturulmaktadır. Bu hex kodu, _**"hex"**_, aşağıda gösterim amaçlı olarak verilmiştir. -``` -{ - "result": "success", - "hex": "0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000" -} -``` -Bu işlemi blokzincirine kaydetmek amacıyla, ilgili hex kodu kopyalanıp ```sendrawtrasaction``` komutu ile işlem tamamlanır: -``` -./komodo-cli -ac_name=MCL sendrawtranscation 0400008085202f89020039b219200ae4b5c83d77bffce7a8af054d6fb..........e9181f6aac3e1beb1e260e9a1f49ed24e6ac00000000edeb04000000000000000000000000 -``` -Yukarıdaki işlem blokzincirinde kaydedilirse bu durumda sonuç olarak bir işlem numarası döndürülür. İşlemin başarılı ile gerçekleşip gerçekleşmediğini teyit etmenin diğer yolu da döndürülen bu işlem numarasını [Marmara Explorer sitesinde](http://explorer.marmara.io) aramak olacaktır. -Aktif/Kilitli koinleri görmek için ```marmarainfo``` komutu kullanılabilir. Komut sonucunda döndürülen sonuçta ```"myActivatedAmount"``` parametresinin karşısında kilitlenen koinlerinizi görebilirsiniz. Aktif koinlerinizi hemen göremeyebilirsiniz, bir kaç blok geçtikten sonra görülebilecektir. - - -- ```marmaraunlock``` komutu kilitlenen koinlerin kilidini açmak için kullanılan bir komuttur. Bu işlemin sonucunda aktif olan koinler normal koine dönüşürler. Normal koinler ```sendtoaddress``` komutu ile direk hesaba yapılan ödemelerde kullanılmaktadır. Aşağıdaki komutta yer alan **miktar** kısmına kilidi kaldırılacak koin miktarı yazılır. -``` -./komodo-cli -ac_name=MCL marmaraunlock miktar -``` -Yukarıda daha önce de anlatıldığı üzere bu işlemin blokzincirine kayı edilmesi için ```sendrawtrasaction``` komutu kullanılması gerekmektedir. Bunun için ```marmaraunlock``` komutu sonucunda döndürülen hex kodunu ```sendrawtrasaction``` komutu ile birlikte kullanınız. - -- ```listaddressgroupings``` komutu cüzdan adresleri ile birlikte bu cüzdanda yer alan normal koin miktarlarını göstermektedir. Komutun kullanımı aşağıda verilmektedir: -``` -./komodo-cli -ac_name=MCL listaddressgroupings -``` - -## Marmara Kredi Döngüleri - -Mevcutta Marmara Kredi Döngüleri %100 karşılıklılığa dayanan Versiyon 1 üzerine çalışmaktadır. Kredi Döngülerinde kilitlenen koinler blokzinciri ödülleri çıkarılmasında 3 kata kadar staking şansı vermektedir. Krediyi ilk ortaya çıkaran keşideci ve sonrasında krediyi döndüren diğer cirantalar %100 teminatı sağlamanın karşılığında blokzincirinde staking'de 3 kat daha fazla şansla ödüllendirilmektedir. Kredi döngüsüne yeni katılan her ciranta ile Döngünün her anında %100 karşılık payı keşideci ve cirantalar arasında risk azaltacak şekilde paylaşılmaktadır. - -Kredi döngüleri sadece aktif/kilitli koinler üzerinden oluşturulabilir. - -**Keşideci:** Krediyi ilk çıkaran ve kredi döngüsünü başlatan kişi. - -**Hamil:** Kredi Döngüsündeki son düğüm. Keşideci başta olmak üzere diğer tüm düğümler kredi vadesi dolduğunda hamil olan düğümün borcunu ödemekle mükelleftir. Hamil dışında hepsi döngüde alışveriş sırasında mal ve hizmet almışlardır. Ancak hamil mal ve hizmet sağladığı halde elinde sadece kredi mevcuttur. İşte diğer tüm düğümler bu mal ve hizmetin karşılığı olan parayı hamil olan düğüme öderler. - -**Ciranta:** Kredi Döngüsündeki ilk düğüm olan Keşideci ile son düğüm olan hamil arasında kalan tüm düğümler Ciranta yaptıkları işlem ise cirolama olarak adlandırılır. Cirantalar mal ve hizmet karşılığında krediyi bir sonraki düğüme aktarırlar. - -**Vade:** Mevcut bloktan başlayarak kredinin vadesinin kaç blok sonra bittiğini göstermektedir. Vade blokların çıkışına göre hesaplanır. Marmara zincirinde bir günde çıkan blok sayısı 1440'tır (Bir Saatte 60 blok çarpı 1 günde 24 saat sonucu). 100 günlük bir kredi için, Vade 1440x100 = 144,000 blok şeklinde hesaplanır. - -**Mahsuplaşma (Settlement):** Bir kredinin vadesi dolduğunda, ödeme döngüde son düğüm olan hamile aktarılır. Vade tamamlanma durumunda mahsuplaşma otomatik veya manuel olarak yapılır. - -**Aracı (Escrow):** Versiyon 2'de yer alacak olan güvene dayalı taraflardır. Eğer EscrowOn parametresi false ise bu durumda 100% karşılılık kullanılmakta olup settlement parametresi automatic değerini alır. Bunun sebebi Versiyon 1'in %100 teminatlandırılmış karşılığa dayalı, güven ihtiyacı gerektirmeyen bir blokzincir çözümü olmasıdır. - -**Avalist:** Aval veren kişiye avalist denir. Avalistler keşidecileri veya cirantaları MCL ile destekleyen ek teminat sağlayan taraflar olup destek karşılığında 3 katına kadar ödül kazanabilirler. Karşılıksızlık durumunda avalistlerin fonları kullanıma açılacaktır. Avalistler sadece Versiyon 2'de mevcutturlar, bu sebeple versiyon 1'de avalist parametresi her zaman 0'a eşittir. - -**Blokaj Miktarı(BlockageAmount):** Bu terim Versiyon 2'ye ait bir parametredir. Ciranta keşideciden karşılıksızlığa karşı teminat sağlaması için bir miktar koymasını isteyebilir. Bu durumda, Keşideci ortaya koyduğu teminata karşılık 3 kat kadar staking ile kazanma şansı elde eder. - -**Zaman Aşımı (Dispute Expiry):** Versiyon 2'de kredi döngülerinde olası bir karşılıksızlık problemini çözmede verilen süreye denir. Bu tarihe kadar mashuplaşmanın (settlement) yapılmış olması gerekir. Bu tarihten sonra hamil hak iddia edemez. An issuer may have this time as blocks when creating a credit under protocol 2 without or insufficient collateralization. Before this period expires, an escrow should do all actions according to aggrement with the issuer to solve non-redemption. Otherwise, the escrow is penalized in the system. - -### Kredi Döngüsü Oluşturmak için Önemli Komutlar -Marmara Kredi Döngüsünü gerçekleştirebilmek oldukça basittir. Sadece 4 komutu bilmeniz yeterlidir. Ancak kredi döngüsü var edebilmek veya bir sonraki düğüme aktarabilmek için yeterli aktif/kilitli koininiz olması gerekir. Bunun için kilitleme komutlarını kullanabilirsiniz. - -Kredi döngüsü başlatma ve aktarma işlemlerini gerçekleştirmek için eşler (p2p) karşılıklı birbirinin public key adresini bilmek zorundadırlar. - -- ```marmararecieve``` - -Kredi talebinde bulunma komutu. Ciranta ve hamil durumda olanlar kullanırlar. - - -**Birinci Senaryo:** İki düğüm ilk defa bir Marmara Kredi döngüsü başlatacaklardır. Bu döngü mal veya hizmet karşılığında başlatılacak olabilir. Bu durumda, Hamil (mal veya hizmeti satan, alacaklı kişi), Keşideciye (mal veya hizmeti satın alacak kişiye) kredi talebinde bulunur. Bu talep aşağıdaki komutun, komut satırına yazılması ile gerçekleşir: -``` -./komodo-cli -ac_name=MCL marmarareceive senderpk amount currency matures '{"avalcount":"n"}' -``` ->```senderpk``` Keşidecinin (mal veya hizmeti satın alacak kişinin) pubkey adresidir. -> ->```amount``` ödeme miktarını belirtir. Bu miktar Keşidecinin aktif hesabında yer alan miktardır. Eğer aktif hesapta belirtilen miktarda koin yoksa bu durumda ```marmaralock``` komutu ile Keşideci tarafından normal hesabından aktifleştirilmesi gerekmektedir. -> ->```currency``` ödeme birimi olan MARMARA'dır. -> ->```matures``` mevcut bloktan başlayarak kredinin vadesinin kaç blok sonra bittiğini göstermektedir. Bir saatte çıkan blok sayısı 60 olup, 24 saatlik zaman diliminde çıkan toplam blok sayısı 1440'tır. Kredi bitiş süresi buna göre hesaplanıp bu parametreye karşılık olarak girilmelidir. -> ->```'{"avalcount":"n"}'``` avalistlerin sayısıdır. Marmara Kredi Döngülerinin birinci protokülü bazında avalist sayısı sıfıra eşittir. Örnekle, bu parametre için sıfır değeri verilmelidir. '{"avalcount":"0"}' - -Yukarıda verilen komut sonuç olarak bir hex kodu oluşturup döndürür. BU hex kodunun Hamil tarafından blokzincirine kaydedilmesi gerekir, bunun için ```sendrawtransaction``` komutu kullanılır: -``` -./komodo-cli -ac_name=MCL sendrawtransaction HEXKODU - -``` -Bu komutun çalıştırılmasının ardından, ```txid``` şeklinde bir işlem numarası oluşturulur. Kredi döngüsünün tamamlanması için bu işlem numarası, ```txid```, ile Hamilin pubkey adresi,```receiverpk```, Keşideciye iletilmelidir. Bu iletişime alternatif olarak ```marmarareceivelist``` komutu da kullanılabilir. Bu komut ile Keşideci kendisine Hamil tarafından gelen isteklerin listesini görüntüleyebilir. Bu komutun kullanımı aşağıda verilmiştir. - -```marmarareceivelist``` komutu Keşideci tarafından aşağıdaki şekilde kullanılır: -``` -./komodo-cli -ac_name=MCL marmarareceivelist pubkey - -``` -> Burada yer alan ```pubkey``` Keşidecinin Marmara zincirine bağlı olan pubkey adresini ifade eder. ->Bu komut ilgili pubkey tarafından oluşturulan işlem numaralarının listesini döndürür. - -- ```marmaraissue``` - -```marmaraissue``` Sadece ilk düğüm noktası tarafından krediyi ilk var etmek yani kredi döngüsünü başlatmakta kullanılacak komuttur. Bu komutla kredi var edilir ve döngüdeki 2. Düğüme yani ilk hamile aktarılır. Kredi döngüsüne ait koşullar Keşideci ile Hamil arasında belirlenmektedir. - -Kredi döngüsünün koşullarını içeren komut aşağıda yer almaktadır: - -``` -./komodo-cli -ac_name=MCL marmaraissue receiverpk '{"avalcount":"n", "autosettlement":"true"|"false", "autoinsurance":"true"|"false", "disputeexpires":"offset", "EscrowOn":"true"|"false", "BlockageAmount":"amount" }' requesttxid -``` ->```receiverpk``` krediyi alacak olan Hamilin pubkey adresidir. -> ->```"avalcount":"n"``` avalistlerin sayısıdır. Marmara Kredi Döngüleri Protokol 1 kapsamında bu parametre için sıfır değeri verilmelidir. -> ->``` "autosettlement":"true"|"false"``` Versiyon 1'de %100 karşılıklı olması nedeniyle parametrenin değeri "autosettlement":"true" şeklindedir. -> ->```"autoinsurance":"true"|"false"``` Versiyon 1'de %100 karşılıklı olması nedeniyle parametrenin değeri "autosettlement":"true" şeklindedir. -> ->```"disputeexpires":"offset"``` Versiyon 1'de %100 karşılıklı olması nedeniyle parametrenin değeri 0'a eşitlenir. -> ->```"EscrowOn":"true"|"false"``` Versiyon 1'de %100 karşılıklı olması nedeniyle parametrenin değeri "EscrowOn":"false" şeklindedir. -> ->```"BlockageAmount":"amount" }``` Versiyon 1'de %100 karşılıklı olması nedeniyle parametrenin değeri 0'a eşitlenir. -> ->```requesttxid``` hamil tarafından oluşturulup keşideciye iletilen işlem numarasıdır (txid). - -Keşideci tarafından kredi döngüsünün tamamlanabilmesi için ```marmaraissue``` yapılmalıdır. Bu komutun tipik bir örneği aşağıda veilmiştir: -``` -./komodo-cli -ac_name=MCL marmaraissue receiverpk '{"avalcount":"0", "autosettlement":"true", "autoinsurance":"true", "disputeexpires":"0", "EscrowOn":"false", "BlockageAmount":"0" }' requesttxid -``` -```marmaraissue``` komutu karşılığında bir hex kodu döndürür ve sonrasında Keşideci sendrawtransaction komutunu kullanarak bu işlemin blokzincirinde aşağıdaki şekilde işletilmesini sağlamalıdır: -``` -./komodo-cli -ac_name=MCL sendrawtransaction HEXCODE - -``` -Böylelikle keşideci ile hamil arasında ilk döngü oluşturulmuş olur. Döngüde kilitlenen krediler mal veya hizmet alım sirkülasyonunda kullanılabilirler. Hamil ve keşideci bu şekilde döngünün vade süresi dolana kadar 3 kat staking yapma şansını yakalabilirler. -- ```marmaracreditloop``` - -Hamil ile keşideci arasında gerçekleştirilen kredi döngüsünü gösterebilmek için ```marmaracreditloop``` komutu kullanılabilir. Komutun kullanımı aşağıda verilmektedir: -``` -./komodo-cli -ac_name=MCL marmaracreditloop txid -``` -> ```txid``` Marmara Kredi Döngüsüne ait olan baton transfer id'sini verir. - -- ```marmaratransfer``` - -**İkinci Senaryo:** Bir önceki senaryoda yer alan Hamil döngüde kilitlediği koinleri mal ve hizmet alarak değerlendirmek istemektedir. Bu durumda, Hamil Ciranta rolüne geçmektedir ve kredi döngüsünde son düğüme her zaman Hamil denilmektedir. Diğer bir deyişle bütün cirantalar önceki durumda hamil rolünü alırlar. -Burada dikkate alınması gereken nokta cirantalar krediyi Hamile transfer ettikleri noktada 3 kat staking gücünü kaybetmeleri olacaktır. - -Ciranta krediyi bir sonraki düğüme aktarmak için ```marmarareceive``` komutunu kullanır. Ciranta bu durumda artık hamil değildir. - -``` -./komodo-cli -ac_name=MCL marmarareceive senderpk batontxid '{"avalcount":"n"}' -``` ->```senderpk``` cirantanın pubkey adresidir. ->```batontxid``` bir önceki kredi döngüsünde çıkan baton işlem numarasıdır. ->```'{"avalcount":"n"}'``` avalistlerin sayısını belirtir. Protokol 1 için '{"avalcount":"0"}' şeklinde verilmelidir. - -Bu marmarareceive komutu bir hex kodu üretir ve HEX KODU ```sendrawtransaction``` altında blokzincire ilgili işlemi kaydetmek için aşağıdaki şekilde gönderilir: -``` -./komodo-cli -ac_name=MCL sendrawtransaction HEXKODU - -``` -Bu komutun işlenmesinin ardından bir baton işlem numarası,```txid```, otomatik olarak oluşturulur. İşbu kredi döngüsünü tamamlamak için baton numarasının, ```txid```, ve yeni hamilin pubkey adresinin, ```receiverpk```, cirantaya iletilmesine ihtiyaç vardır. Fakat buna alternatif olarak ```marmarareceivelist``` komutu ciranta tarafından kullanılarak kendisine gelen istekler görüntülenebilir. - -Sonrasında, ciranta aşağıda yer alan ```marmaratransfer``` komutunu kullanarak kredinin yeni hamile geçmesini sağlayabilir: -``` -./komodo-cli -ac_name=MCL marmaratransfer receiverpk '{"avalcount":"n"}' requesttxid -``` ->```receiverpk``` yeni hamilin pubkey adresidir. -> ->```"avalcount":"n"``` avalistlerin sayısını belirtir. Protokol 1 için '{"avalcount":"0"}' şeklinde verilmelidir. -> ->```requesttxid``` yeni hamil tarafından oluşturulan baton işlem numarasıdır. - -İlgili işlemin blokzincirine kaydedilmesi için ciranta ```sendrawtransaction``` komutu ile yukarıdaki ```marmaratransfer``` komutunun döndürdüğü HEX KODUNU onaylar. - ->**ÖNEMLİ NOT:** ```sendrawtransaction``` komutu ```marmarareceive```, ```marmaraissue```, ```marmaratransfer``` ve ```marmaralock``` komutlarının kullanımınından hemen sonra mutlaka kullanılmalıdır. Bunun amacı bu komutların sonuçlarının blokzincirinde işletilmesini sağlamaktır. Kullanımına yönelik örnekler Senaryo 1 ve Senaryo 2'de verilmektedir. - -**Bu şekilde, belirlenen _vaad süresi_ boyunca kredi döngüleri bininci düğüme kadar mal ve hizmet karşılığında ekonomide sirküle edilebilir.** - - -## Cüzdanın Yedeğinin Alınması - -Varlıkların tutulduğu cüzdanın (`wallet.dat` dosyasının) yedeğinin alınması yüksek önem arz etmektedir. - -Linux makinasında ilgili dosya `~/.komodo/MCL/wallet.dat` uzantısında yer alabilir. - -Yedek alma yöntemlerinden biri bu dosyanın bir kopyasının arşivini almaktır. - -Bunun için aşağıdaki - -```bash -#wallet.dat dosyasının kopyası alınır -cp -av ~/.komodo/MCL/wallet.dat ~/wallet.dat - -#wallet.dat dosyası yeniden adlandırılır -mv ~/wallet.dat ~/2020-08-09-wallet_backup.dat - -# wallet.dat dosyasının arşivi alınır -tar -czvf ~/2020-08-09-wallet_backup.dat.tgz ~/2020-08-09-wallet_backup.dat - -# İlgili dosya güvenilir bir alana taşınır -``` - -Kaynakça ---- -Komodo Antara Çerçevesi ve detayları üzerine linkte yer alan [geliştirici dokümantasyonundan](https://developers.komodoplatform.com/) faydalanabilirsiniz. - -Marmara Kredi Döngülerinin çalışma prensibi üzerine linkte verilen [makaleden](https://medium.com/@drcetiner/marmara-kredi-d%C3%B6ng%C3%BCleri-nas%C4%B1l-%C3%A7al%C4%B1%C5%9F%C4%B1r-201144573e7c) faydalanabilirsiniz. - -Önemli Not ---- -İşbu dokümanda yer alan tüm komutların kullanımı kişinin kendi sorumluluğundadır. Bu uyarıyı dikkate alarak emin olmadığınız komutları **kullanmayınız!** - -Lisans ---- -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/TR/MCL_Kurulum_Klavuzu.md b/TR/MCL_Kurulum_Klavuzu.md deleted file mode 100644 index c3bef330d0f..00000000000 --- a/TR/MCL_Kurulum_Klavuzu.md +++ /dev/null @@ -1,169 +0,0 @@ -![MarmaraCreditLoops Logo](https://raw.githubusercontent.com/marmarachain/marmara/master/MCL-Logo.png "Marmara Credit Loops Logo") - -# Marmara v.1.0.1 Kurulum - -Marmara Kredi Döngüleri Zeki kontrak blokzincirini kurmanın iki yolu bulunmaktadır. -## Önderlenmiş Marmara Kredi Döngüleri Blokzincirinin Kurulumu - -Marmara Kredi Döngüleri blokzincirinin önceden derlenmiş halini indirip, zip halinde olan dosyayı açıp kurulumu hızlıca tamamlayabilirisiniz. - -Bunun için burada yer alan [linkten](https://github.com/marmarachain/marmara/releases) ilgili dosyalara erişim sağlayabilirsiniz. - -### Linux İşletim Sistemi - -Sistemin güncel olduğundan emin olunur: -``` -sudo apt-get update -sudo apt-get upgrade -y -``` -Bağımlılık paketlerini asağıdaki komut ile indirin: -``` -sudo apt-get install libgomp1 -``` -Burada verilen [linkten](https://github.com/marmarachain/marmara/releases) Marmara Linux binary dosyasını indirin. Dosyayı dilediğiniz bir alana taşıdıktan sonra aşağıda verilen komutları ilgili dizin yolunda termina üzerinden gerçekleştirin: -``` -sudo apt install unzip -unzip MCL-linux.zip -sudo chmod +x komodod komodo-cli fetch-params.sh -./fetch-params.sh -``` -Terminalden komodod ve komodo-cli dosyalarının bulunduğu dizine gidip Marmara Zincirini başlatın: -``` -./komodod -ac_name=MCL -ac_supply=2000000 -ac_cc=2 -addnode=5.189.149.242 -addnode=161.97.146.150 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000 -``` -Zinciri durdurmak için ilgili dizinde aşağıdaki komutu terminale yazınız: -``` -./komodo-cli -ac_name=MCL stop -``` - -### Windows - -[Releases](https://github.com/marmarachain/marmara/releases) sayfasında Assets altında yer alan MCL zip dosyasını Windows bilgisayarınıza indirip, zip dosyayı çıkarıp, içinde yer alan komodod.exe ve komodo-cli.exe ve diğer **bütün** dosyaları masaüstünde veya dilediğiniz yerde ```MCL``` isminde klasör oluşturup içine taşıyınız. - -Burada yer alan kurulum yönergelerinde masaüstünde oluşturulan MCL dizini kullanılmaktadır. - -Öncelikle ZcashParams dosyalarını indirmek için ```fetch-params.bat``` isimli dosyaya çift tıklayarak çalıştırınız. - -Bu işlem başarı ile tamamlanırsa, ```MCL_start.bat``` dosyasına çift tıklayarak zinciri başlatınız. - -Eğer ```fetch-params.bat``` dosyasını çalıştırma işlemi başarılı değilse, bu durumda aşağıda yer alan adımları takip ediniz: - -İlk adım olarak komut terminal ekranı açıp ```ZcashParams``` klasörünü aşağıdaki komut ile oluşturunuz: -``` -mkdir “%HOMEPATH%\AppData\Roaming\ZcashParams” -``` -Aşağıda yer alan dosyaları ilgili linklerden inidirip, ```MCL``` isminde önceden masaüstünde oluşturduğunuz klasöre taşıyınız. - -- [sprout-proving.key](https://z.cash/downloads/sprout-proving.key) - -- [sprout-verifying.key](https://z.cash/downloads/sprout-verifying.key) - -- [sapling-spend.params](https://z.cash/downloads/sapling-spend.params) - -- [sapling-output.params](https://z.cash/downloads/sapling-output.params) - -- [sprout-groth16.params](https://z.cash/downloads/sprout-groth16.params) - -```MCL_start```.bat dosyasına çift tıklayarak zinciri başlatınız. - -## Marmara Kredi Döngüleri Blokzincirinin Kaynak Kodundan Kurulumu - -Marmara Kredi Döngüleri blokzinciri kaynak kodundan kurulabilir. Bu zorunlu bir işlem değildir (önceden derlenmiş hali de kullanılabilir), ancak kaynaktan derleme yöntemi kişinin en son yapılan yazılım yamalarına ve yükseltmelerine anında güncelleme yapmasına izin vermesi nedeniyle en iyi bir uygulama olarak kabul edilmektedir. -### Linux İşletim Sistemi - -#### Kurulum için Gereksinimler - - Linux (Ubuntu gibi Debian tabanlı dağıtımlar) - Ubuntu için 16.04 veya 18.04 sürümünün kullanımı önerilir - - 64-bit İşlemci - - En az 2 CPU - - Minimum 4GB Boş RAM (Önerilen 8 GB RAM'dir) - -#### Başlangıç -Sistemin güncel olduğundan emin olunur: -``` -sudo apt-get update -sudo apt-get upgrade -y -``` - -#### Bağımlılık Paketlerinin İndirilmesi - -``` -sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libgtest-dev libqt4-dev libqrencode-dev libsodium-dev libdb++-dev ntp ntpdate software-properties-common curl clang libcurl4-gnutls-dev cmake clang -y -``` -Bu işlem, İnternet bağlantınıza bağlı olarak biraz zaman alabilir. İşlemin arka planda çalışmasına izin veriniz. - -Tamamlandığında, Marmara Kredi Döngüleri blokzinirini kurmak için aşağıdaki adımları izleyiniz. - -#### Marmara Kredi Döngüleri Reposunun Klonlanması -``` -cd ~ -git clone https://github.com/marmarachain/marmara komodo --branch master --single-branch -``` ->8 GB RAM veya üstüne sahipseniz aşağıdaki adımları atlayarak **__Zcash Parametrelerinin Çekilmesi__** adımına geçiniz. - -#### Swap(Takas) Alanının 4 GB şeklinde ayarlanması -Swap (Takas) Alanı, işletim sistemi tarafından sabit diskinizde ayrılmış olan bir bölümdür. -İşlenecek veriler ön belleğe (RAM) sığmadığı zaman bu bölüm “RAM” gibi kullanılır ve böylelikle veri akışının ve proseslerinin devam etmesi sağlanır. -Eğer kullanılan sistemde 4 GB'lik RAM mevcutsa, RAM boyutunun tamamen dolup, cevap verememesi durumuna karşılık bu alanın ayarlanması tavsiye edilir. - -> Swap alanının olup olmadığını ``` sudo swapon --show ``` komutu ile kontrol edebilirsiniz. -Sistemde swapfile mevcut olup en az 4 GB olacak şekilde ayarlanmadıysa bu durumda öncelik olarak ```sudo swapoff /swapfile ``` komutuyla swap'ı kapatınız. - -Swap alanını 4 GB şeklinde ayarlamak için aşağıdaki komutları komut satırına ekleyiniz: -``` -sudo fallocate -l 4G /swapfile -sudo chmod 600 /swapfile -sudo mkswap /swapfile -sudo swapon /swapfile -``` -#### Zcash Parametrelerinin Çekilmesi -``` -cd komodo -./zcutil/fetch-params.sh -./zcutil/build.sh -j$(nproc) -``` -**Aşağıdaki adımlar kurulum için zorunlu olmayıp kullanıcının seçimine bırakılmıştır.** - -##### Swappiness Ayarının Yapılması -Swappiness, Linux çekirdeğinin RAM içeriğini takas için ne kadar (ve ne sıklıkla) kopyaladığını tanımlayan çekirdek parametresidir. swappiness 0 ile 100 arasında bir değere sahip olabilir. -Aşağıda verilen komut, bu parametrenin değerini "10" şeklinde ayarlar. Swappiness parametresinin değeri ne kadar yüksekse, çekirdeğe işlemleri fiziksel bellekten agresif bir şekilde takas etmesini ve önbellek takas ettirmesini bildirecektir. -``` -sudo sysctl vm.swappiness=10 -``` ->Bu ayar, bir sonraki yeniden başlatmaya kadar geçerli olacaktır. Yeniden başlatma durumunda geçerli olmasını sağlamak amacıyla aşağıdaki komutu /etc/sysctl.conf dosyasına ekleyerek yeniden başlatımda otomatik olarak geçerli olmasını sağlayabiliriz: ->```sudo nano /etc/sysctl.conf``` vm.swappiness=10 - -#### UFW Ayarının Yapılması -Bu adım MCL kurulumu için zorunlu olmayıp makinanın veya sunucunun güvenliği sağlamak amacıyla kullanılabilir. - -- UFW nin statüsü aşağıdaki komut ile kontrol edilir: -``` -sudo ufw status -``` -- Eğer UFW paketi yüklü değilse aşağıdaki komut kullanılarak indirilir: -``` -sudo apt install ufw -``` -- Bağlantıların yapılmasını sağlayacak şekilde aşağıdaki komutlarla UFW etkinleştirilir: -``` -echo y | sudo ufw enable -sudo ufw allow ssh -sudo ufw allow "OpenSSH" -sudo ufw allow 33824 -``` -# Önemli Bilgilendirme -İşbu yazılım **Komodo** üzerine, *Komodo* yazılımı da **zcash** üzerine geliştirilmiş olup sürekli olarak yoğun geliştirme çalışmaları altındadır. -**Marmara Kredi Döngüleri eksperimental olup sürekli geliştirme fazındadır.** Kendi sorumluluğunuzda kullanınız. - -MCL ve Komodo Platform geliştiricileri hiçbir zaman ve hiç bir koşulda işbu yazılımın kullanımından kaynaklanan herhangi bir olası zarardan sorumlu değildir. - -# Lisans -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git "a/TR/Marmara_Kredi_D\303\266ng\303\274leri.md" "b/TR/Marmara_Kredi_D\303\266ng\303\274leri.md" deleted file mode 100644 index 4dcc304d67d..00000000000 --- "a/TR/Marmara_Kredi_D\303\266ng\303\274leri.md" +++ /dev/null @@ -1,36 +0,0 @@ -![MarmaraCreditLoops Logo](https://raw.githubusercontent.com/marmarachain/marmara/master/MCL-Logo.png "Marmara Credit Loops Logo") - -## Marmara Kredi Döngüleri -https://github.com/marmarachain reposu Marmara Kredi Döngülerine ait resmi kaynak kodlarının yer aldığı alandır. - -## Proje Hakkında -Marmara Kredi Döngüleri veya MarmaraChain (Marmara Credit Loops) güvene dayalı/tam güvenli sistemleri ile ülkemizde ve dünyada analog olarak kullanılmakta olan vadeli çeklerin ilk dijital şeklidir. Marmara Kredi Döngüleri (MCL) Komodo Blokzinciri teknolojisinin sağladığı bir çok özelliği bünyesinde barındırır. Kredi Döngüleri Komodo’nun zeki sözleşme (smart sözleşme) yöntemleri ile kodlanmıştır. - -Marmara Chain, sistemsel yapısı ve blokzinciri ile uyumlu halde sorunsuz çalışma şekli ve dünyada gerçek anlamda elektronik örneği olmaması yanında Blokzinciri ile bu şekilde çalışan hiç bir örneği yoktur. - -Dışarıdan herhangi bir müdahale veya herhangi bir etkileşim ile değiştirilme, oynanma, çıkarma veya ekleme yapılamamaktadır. - -## Kaynaklar - -- Marmara Kredi Döngüleri Websitesi: [Marmara Websitesi](http://marmara.io/) -- Marmara Kredi Döngüleri blokzinciri explorer sayfası: [Marmara Explorer](http://explorer.marmara.io/) -- Marmara Kredi Döngüleri Discord sayfası: [MCL Discord](https://discord.com/invite/DZDPAd) -- E-posta Adresi: [marmarachain@gmail.com](mailto:marmarachain@gmail.com) -- Teknik Whitepaper: [Marmara Whitepaper](http://marmara.io/IMSS2019_WhitePaper_English.pdf) - - -## Teknik Özellikler -- Pre-mining: 2,000,000 MCL -- Yıllık Arz: ~ 15,000,000 MCL -- Blok çıkma Süresi: 60 saniye -- Blok başına Ödül: 30 MCL -- %25 Madencilik, %75 Staking (Staking ancak kilitli/aktif koinler ile yapılabilmekte). -- Kredi döngülerinde aktif/kilitli koinlerle 3 katı kadar staking şansı - -## Başlangıç - -- Marmara Kredi DÖngüleri Blokzincirini indirmek için [Marmara Kredi Döngüleri Kurulum Kılavuzu](https://github.com/marmarachain/marmara/blob/master/TR/MCL_Kurulum_Klavuzu.md) sayfasını takip ediniz. -- Marmara Kredi Döngülerini kulllanabilmek için [Marmara Kredi Döngüleri Kullanım Kılavuzu](https://github.com/marmarachain/marmara/blob/master/TR/MCL_Kullan%C4%B1m_Klavuzu.md) sayfasını takip ediniz. - -### İletişim -- B. Gültekin Çetiner [![twitter](https://img.shields.io/twitter/follow/drcetiner?style=social)](https://twitter.com/drcetiner ) From f22000e2442f48a4d37e349d9280a3451bb44e25 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 21 Mar 2024 18:08:28 +0300 Subject: [PATCH 18/23] Update and rename komodo_mac_ci.yml to marmara_mac_ci.yml --- .../{komodo_mac_ci.yml => marmara_mac_ci.yml} | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) rename .github/workflows/{komodo_mac_ci.yml => marmara_mac_ci.yml} (89%) diff --git a/.github/workflows/komodo_mac_ci.yml b/.github/workflows/marmara_mac_ci.yml similarity index 89% rename from .github/workflows/komodo_mac_ci.yml rename to .github/workflows/marmara_mac_ci.yml index a9916573bc3..17e3426f040 100644 --- a/.github/workflows/komodo_mac_ci.yml +++ b/.github/workflows/marmara_mac_ci.yml @@ -1,4 +1,4 @@ -name: Komodo MacOS CI +name: Marmara MacOS CI on: pull_request: @@ -15,6 +15,19 @@ jobs: steps: - uses: actions/checkout@v2 + # Workaround for https://github.com/actions/setup-python/issues/577 + - name: Clean up binaries and links (macOS) + run: | + rm -f /usr/local/bin/2to3-3.* + rm -f /usr/local/bin/idle3.* + rm -f /usr/local/bin/pydoc3.* + rm -f /usr/local/bin/python3.* + rm -f /usr/local/bin/2to3 + rm -f /usr/local/bin/idle3 + rm -f /usr/local/bin/pydoc3 + rm -f /usr/local/bin/python3 + rm -f /usr/local/bin/python3-config + - name: Install deps (macOS) run: | brew update @@ -28,12 +41,14 @@ jobs: brew install wget brew install python3 brew install gmp + - name: Build (macOS) run: | # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!! export CPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ ./zcutil/build-mac-dtest.sh -j4 tar -czvf marmara-macos.tar.gz src/marmarad src/marmara-cli + - name: Upload marmara-macos.tar.gz as artifact uses: actions/upload-artifact@v1 with: @@ -70,6 +85,7 @@ jobs: # ./ci_setup.sh "cc_modules/test_dice.py cc_modules/test_faucet.py cc_modules/test_token.py cc_modules/test_rewards.py" macos-test-oracles: + if: ${{ false }} name: Test (macos/OraclesCC) runs-on: macos-latest @@ -96,8 +112,10 @@ jobs: ./zcutil/fetch-params.sh cd qa/pytest_komodo ./ci_setup.sh cc_modules/test_oracles.py + macos-test-baserpc: - + if: ${{ false }} + name: Test (macos/BasicRPC) runs-on: macos-latest needs: macos-build @@ -125,7 +143,8 @@ jobs: ./ci_setup.sh basic # macos-test-channels: - + # if: ${{ false }} + # name: Test (macos/ChannelsCC) # runs-on: macos-latest # needs: macos-build @@ -153,6 +172,7 @@ jobs: # ./ci_setup.sh cc_modules/test_channels.py # macos-test-heir: + # if: ${{ false }} # name: Test (macos/HeirCC) # runs-on: macos-latest From ba372aeb727af052b04856aa9a57d085a721ae11 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 21 Mar 2024 18:14:57 +0300 Subject: [PATCH 19/23] Update and rename komodo_win_ci.yml to marmara_win_ci.yml --- .../{komodo_win_ci.yml => marmara_win_ci.yml} | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) rename .github/workflows/{komodo_win_ci.yml => marmara_win_ci.yml} (92%) diff --git a/.github/workflows/komodo_win_ci.yml b/.github/workflows/marmara_win_ci.yml similarity index 92% rename from .github/workflows/komodo_win_ci.yml rename to .github/workflows/marmara_win_ci.yml index e433ab82845..7594eea3983 100644 --- a/.github/workflows/komodo_win_ci.yml +++ b/.github/workflows/marmara_win_ci.yml @@ -1,4 +1,4 @@ -name: Komodo Win CI +name: Marmara Win CI on: pull_request: @@ -65,15 +65,16 @@ jobs: # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!! export CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build-win-dtest.sh -j$(nproc) - zip --junk-paths marmara_win src/marmarad.exe src/marmara-cli.exe - - name: Upload marmara_win as artifact + zip --junk-paths marmarad_win src/marmarad.exe src/marmara-cli.exe + - name: Upload marmarad_win as artifact uses: actions/upload-artifact@v1 with: - name: marmara_win - path: ./marmara_win.zip + name: marmarad_win + path: ./marmarad_win.zip windows-test-baserpc: - + if: ${{ false }} + name: Test (Win/BasicRPC) needs: windows-build runs-on: windows-latest @@ -81,16 +82,16 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Download marmara_win.zip + - name: Download marmarad_win.zip uses: actions/download-artifact@v1 with: - name: marmara_win + name: marmarad_win - name: Install deps (Base) shell: cmd run: | - move marmara_win\marmara_win.zip - 7z e marmara_win.zip + move marmarad_win\marmarad_win.zip + 7z e marmarad_win.zip move marmarad.exe src\ python.exe -m pip install --upgrade setuptools python.exe -m pip install --upgrade pip @@ -103,7 +104,7 @@ jobs: cd qa\pytest_komodo start_ci.bat basic # windows-test-dice-faucet-tok-rewCC: - + # if: ${{ false }} # name: Test (Win/Dice Faucet Token Rewards) # runs-on: windows-latest # needs: windows-build @@ -136,7 +137,8 @@ jobs: # cd qa\pytest_komodo # start_ci.bat cc_modules\test_dice.py cc_modules\test_faucet.py cc_modules\test_token.py cc_modules\test_rewards.py windows-test-oracles-cc: - + if: ${{ false }} + name: Test (Win/OraclesCC) runs-on: windows-latest needs: windows-build @@ -144,16 +146,16 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Download marmara_win.zip + - name: Download marmarad_win.zip uses: actions/download-artifact@v1 with: - name: marmara_win + name: marmarad_win - name: Install deps (OraclesCC) shell: cmd run: | - move marmara_win\marmara_win.zip - 7z e marmara_win.zip + move marmarad_win\marmarad_win.zip + 7z e marmarad_win.zip move marmarad.exe src\ python.exe -m pip install --upgrade setuptools python.exe -m pip install --upgrade pip @@ -166,7 +168,7 @@ jobs: cd qa\pytest_komodo start_ci.bat cc_modules\test_oracles.py # windows-test-heir-cc: - + # if: ${{ false }} # name: Test (Win/HeirCC) # runs-on: windows-latest # needs: windows-build @@ -199,6 +201,7 @@ jobs: # cd qa\pytest_komodo # start_ci.bat cc_modules\test_heir.py #windows-test-channels-cc: + # if: ${{ false }} # name: Test (Win/ChannelsCC) # runs-on: windows-latest From e5e1fc7abf11a702f488185c8192032615f88ed4 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 21 Mar 2024 18:20:23 +0300 Subject: [PATCH 20/23] Update and rename komodo_linux_ci.yml to marmara_linux_ci.yml --- ...modo_linux_ci.yml => marmara_linux_ci.yml} | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) rename .github/workflows/{komodo_linux_ci.yml => marmara_linux_ci.yml} (95%) diff --git a/.github/workflows/komodo_linux_ci.yml b/.github/workflows/marmara_linux_ci.yml similarity index 95% rename from .github/workflows/komodo_linux_ci.yml rename to .github/workflows/marmara_linux_ci.yml index 8c192233ead..d9127cad7fa 100644 --- a/.github/workflows/komodo_linux_ci.yml +++ b/.github/workflows/marmara_linux_ci.yml @@ -1,4 +1,4 @@ -name: Komodo Linux CI +name: Marmara Linux CI on: pull_request: @@ -46,7 +46,7 @@ jobs: path: ./marmara-linux.tar.gz # linux-test-dice-token-reards-faucet-cc: - + # if: ${{ false }} # name: Test (Linux/Dice, Token, Faucet, Rewards) # runs-on: ubuntu-18.04 # needs: linux-build @@ -81,7 +81,8 @@ jobs: # cd qa/pytest_komodo # ./ci_setup.sh "cc_modules/test_dice.py cc_modules/test_faucet.py cc_modules/test_token.py cc_modules/test_rewards.py" linux-test-oracles: - + if: ${{ false }} + name: Test (Linux/OraclesCC) runs-on: ubuntu-20.04 needs: linux-build @@ -116,7 +117,8 @@ jobs: cd qa/pytest_komodo ./ci_setup.sh cc_modules/test_oracles.py linux-test-baserpc: - + if: ${{ false }} + name: Test (Linux/BasicRPC) runs-on: ubuntu-20.04 needs: linux-build @@ -150,14 +152,15 @@ jobs: ./zcutil/fetch-params.sh cd qa/pytest_komodo ./ci_setup.sh basic - linux-test-channels: + # linux-test-channels: + # if: ${{ false }} - name: Test (Linux/ChannelsCC) - runs-on: ubuntu-20.04 - needs: linux-build + # name: Test (Linux/ChannelsCC) + # runs-on: ubuntu-20.04 + # needs: linux-build - steps: - - uses: actions/checkout@v2 + # steps: + # - uses: actions/checkout@v2 # - name: Install deps (ChannelsCC) # run: | @@ -186,7 +189,7 @@ jobs: # cd qa/pytest_komodo # ./ci_setup.sh cc_modules/test_channels.py # linux-test-heir: - + # if: ${{ false }} # name: Test (Linux/HeirCC) # runs-on: ubuntu-18.04 # needs: linux-build From cf66f761583f888cd0bef5fc5c5ab2c62f6f19c2 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 21 Mar 2024 18:22:10 +0300 Subject: [PATCH 21/23] Update ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index d73d84b6735..92922c14fdd 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,8 +1,8 @@ -This issue tracker is only for technical issues related to komodod +This issue tracker is only for technical issues related to marmarad -General Komodo questions and/or support requests and are best directed to [Discord](https://komodoplatform.com/discord) +General Marmara questions and/or support requests and are best directed to [Discord](https://marmara.io/discord) ### Describe the issue Please provide a general summary of the issue you're experiencing @@ -19,8 +19,8 @@ Tell us what should happen ### Actual behaviour + errors Tell us what happens instead including any noticable error output (any messages displayed on-screen when e.g. a crash occurred) -### The version of Komodo you were using: -Run `komodod --version` to find out +### The version of Marmara you were using: +Run `marmarad --version` to find out ### Machine specs: - OS name + version: From 72a5f181a8afa6e4c4219f81a0ef5c6911acf6c1 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:21:46 +0300 Subject: [PATCH 22/23] bump version to 1.2.0 and copyright year to 2024 --- configure.ac | 6 +++--- src/clientversion.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index e8160f36aea..c4464963686 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,13 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) -define(_CLIENT_VERSION_MINOR, 1) -define(_CLIENT_VERSION_REVISION, 9) +define(_CLIENT_VERSION_MINOR, 2) +define(_CLIENT_VERSION_REVISION, 0) 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))) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2023) +define(_COPYRIGHT_YEAR, 2024) AC_INIT([Verus-CLI],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/VerusCoin/VerusCoin/issues],[verus-cli]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) diff --git a/src/clientversion.h b/src/clientversion.h index c08bdebd4f1..66bfbde05d4 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -31,8 +31,8 @@ //! 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 1 -#define CLIENT_VERSION_REVISION 9 +#define CLIENT_VERSION_MINOR 2 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build @@ -42,7 +42,7 @@ * Copyright year (2009-this) * Todo: update this when changing our copyright comments in the source */ -#define COPYRIGHT_YEAR 2019 +#define COPYRIGHT_YEAR 2024 #endif //HAVE_CONFIG_H From c0e05252166190325fa819f55f53c75f9fbd9a25 Mon Sep 17 00:00:00 2001 From: Rumeysa Yilmaz <44261315+rumeysayilmaz@users.noreply.github.com> Date: Thu, 4 Apr 2024 13:56:40 +0300 Subject: [PATCH 23/23] set assetchain params explicitly to respective values (disallows setting them from command line) --- src/komodo_utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index a154da51623..c6a4938cda9 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1754,7 +1754,7 @@ void komodo_args(char *argv0) fprintf(stderr, "Cannot be STAKED and KMD notary at the same time!\n"); StartShutdown(); } - name = GetArg("-ac_name","MCL"); + name = "MCL"; if ( argv0 != 0 ) { len = (int32_t)strlen(argv0); @@ -1888,7 +1888,7 @@ void komodo_args(char *argv0) ASSETCHAINS_TXPOW = GetArg("-ac_txpow",0) & 3; ASSETCHAINS_FOUNDERS = GetArg("-ac_founders",0);// & 1; ASSETCHAINS_FOUNDERS_REWARD = GetArg("-ac_founders_reward",0); - ASSETCHAINS_SUPPLY = GetArg("-ac_supply",2000000); + ASSETCHAINS_SUPPLY = 2000000; if ( ASSETCHAINS_SUPPLY > (uint64_t)90*1000*1000000 ) { fprintf(stderr,"-ac_supply must be less than 90 billion\n");